切换分支备份

api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderEntity.java

@@ -45,13 +45,11 @@ public class StockOrderEntity {
     private Date updateTime;
     //委托验收已完成
     private boolean entrustEnd;
-
-
     private String billTypeName;
     private String subInvName;
     private String invName;
-
     private String dept;
     private String deptName;
+    private String remark;
 
 }

api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderPrintEntity.java

@@ -50,8 +50,8 @@ public class StockOrderPrintEntity extends StockOrderDetailEntity {
     private String measname;        //计量单位
     private String udiCode;         //条码
     private String serialNo;        //序列号
-
     private String nameCode;
-
     private String deptName;
+
+    private String orderRemark;
 }

api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml

@@ -284,7 +284,8 @@
 
     <select id="listOrderPrint" parameterType="com.glxp.sale.admin.req.inout.StockOrderFilterRequest"
             resultType="com.glxp.sale.admin.entity.inout.StockOrderPrintEntity">
-        SELECT stock_order.*, stock_order_detail.productId, stock_order_detail.productName,
+        SELECT stock_order.*, stock_order.remark orderRemark,stock_order_detail.productId,
+        stock_order_detail.productName,
         stock_order_detail.spec, stock_order_detail.batchNo, stock_order_detail.productDate,
         stock_order_detail.expireDate, stock_order_detail.count, stock_order_detail.sweepCount,
         stock_order_detail.ylqxzcrbarmc,stock_order_detail.manufactory, stock_order_detail.zczbhhzbapzbh,