Merge branch 'dev' of http://222.71.165.188:3000/yunxi/mes-majoys into dev

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/dto/QuerySaleOrderListResDTO.java

@@ -56,4 +56,13 @@ public class QuerySaleOrderListResDTO {
     @Schema(description = "物料类型")
     private String materialType;
 
+    @Schema(description = "客户分订单号")
+    private String pubuserdefnvc2;
+
+    @Schema(description = "订单序号")
+    private String priuserdefnvc2;
+
+    @Schema(description = "颜色")
+    private String freeItem0;
+
 }

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/vo/QuerySaleOrderListReqVO.java

@@ -21,10 +21,24 @@ public class QuerySaleOrderListReqVO extends AbstractChanjetContent {
 
     // "SaleOrder.Department.Name", 提出部门
     //"SaleOrder.Clerk.Name" 业务员
-    private List<String> selectFields = Arrays.asList("SaleOrder.ID", "SaleOrder.Code","SaleOrder.idsettlecustomer","SaleOrder.SaleOrderDetails.Inventory.ID",
-            "SaleOrder.SaleOrderDetails.Unit.Code","SaleOrder.SaleOrderDetails.Quantity","SaleOrder.SaleOrderDetails.Warehouse.ID","SaleOrder.VoucherDate","SaleOrder.SaleOrderDetails.Inventory.InventoryClass.Name",
-            "SaleOrder.SaleOrderDetails.Inventory.Code","SaleOrder.SaleOrderDetails.Inventory.Name","SaleOrder.SaleOrderDetails.Inventory.Specification",
-            "SaleOrder.SaleOrderDetails.Inventory.InventoryClass.Code","SaleOrder.SaleOrderDetails.Inventory.UnitByStock.Name");
+    private List<String> selectFields = Arrays.asList(
+            "SaleOrder.ID", //0 订单id
+            "SaleOrder.Code",//1 订单编码
+            "SaleOrder.idsettlecustomer",//2 结算客户
+            "SaleOrder.SaleOrderDetails.Inventory.ID",//3 产品id
+            "SaleOrder.SaleOrderDetails.Unit.Code",//4 产品单位
+            "SaleOrder.SaleOrderDetails.Quantity",//5 产品数量
+            "SaleOrder.SaleOrderDetails.Warehouse.ID",//6 仓库id
+            "SaleOrder.VoucherDate",//7 单据日期
+            "SaleOrder.SaleOrderDetails.Inventory.InventoryClass.Name",//8 产品分类名称
+            "SaleOrder.SaleOrderDetails.Inventory.Code",//9 产品编码
+            "SaleOrder.SaleOrderDetails.Inventory.Name",//10 产品名称
+            "SaleOrder.SaleOrderDetails.Inventory.Specification",//11 规格
+            "SaleOrder.SaleOrderDetails.Inventory.InventoryClass.Code",//12 产品分类
+            "SaleOrder.SaleOrderDetails.Inventory.UnitByStock.Name",//13 产品分类
+            "SaleOrder.SaleOrderDetails.pubuserdefnvc2",//14 客户分订单号
+            "SaleOrder.SaleOrderDetails.priuserdefnvc2",//15 订单序号
+            "SaleOrder.SaleOrderDetails.freeItem0");//16 颜色
     private Map<String, List<ParamDicDTO>> paramDic = new HashMap<String, List<ParamDicDTO>>(2){{
         put("SaleOrder.VoucherState.Code", new ArrayList<ParamDicDTO>(){{
             add(new ParamDicDTO("01"));

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/manager/ChanjetManager.java

@@ -850,6 +850,9 @@ public class ChanjetManager {
                         resDTO.setMaterialName(values.get(10));//物料名称
                         resDTO.setMaterialSpec(values.get(11));//物料规格
                         resDTO.setMaterialType(values.get(12));//物料分类
+                        resDTO.setPubuserdefnvc2(values.get(14));//客户分订单号
+                        resDTO.setPriuserdefnvc2(values.get(15));//订单序号
+                        resDTO.setFreeItem0(values.get(16));//颜色
 
                         resulDataList.add(resDTO);
                     }

sql/v1.0.0/2.business/1.structure.sql

@@ -674,3 +674,7 @@ alter table wms_storage_check_mat Modify COLUMN pn_id bigint(20) default null CO
 alter table project_sale_order ADD COLUMN ts varchar(32) default null COMMENT '用友时间戳';
 ALTER TABLE pro_task_report ADD COLUMN `has_synch_storage` TINYINT(1) DEFAULT null COMMENT '入库同步标识';
 
+alter table project_sale_order_sub ADD COLUMN customer_sub_code varchar(64) default null COMMENT '客户分订单号';
+alter table project_sale_order_sub ADD COLUMN serial_number varchar(64) default null COMMENT '订单序列号';
+alter table project_sale_order_sub ADD COLUMN color varchar(64) default null COMMENT '颜色';
+