【需求】增加产品仓库同步

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

@@ -31,4 +31,7 @@ public class QuerySaleOrderListResDTO {
     @Schema(description = "数量")
     private Integer amount;
 
+    @Schema(description = "仓库id")
+    private Long warehouseId;
+
 }

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

@@ -20,7 +20,7 @@ public class QuerySaleOrderListReqVO extends AbstractChanjetContent {
     private int pageIndex = 0;
     // "SaleOrder.Department.Name", 提出部门
     //"SaleOrder.Clerk.Name" 业务员
-    private List<String> selectFields = Arrays.asList("SaleOrder.ID", "SaleOrder.Code","SaleOrder.Customer.ID","SaleOrder.SaleOrderDetails.Inventory.ID","SaleOrder.SaleOrderDetails.Unit.Code","SaleOrder.SaleOrderDetails.Quantity");
+    private List<String> selectFields = Arrays.asList("SaleOrder.ID", "SaleOrder.Code","SaleOrder.Customer.ID","SaleOrder.SaleOrderDetails.Inventory.ID","SaleOrder.SaleOrderDetails.Unit.Code","SaleOrder.SaleOrderDetails.Quantity","SaleOrder.SaleOrderDetails.Warehouse.ID");
     private Map<String, Object> paramDic = new HashMap<String, Object>(2){{
         put("SaleOrder.Voucherstate.Code", new HashMap<String,String>(2){{
             put("text", "01");

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

@@ -15,6 +15,9 @@ public class ProjectOrderSubPageReqVO extends PageParam {
     @Schema(description = "项目编号")
     private String projectCode;
 
+    @Schema(description = "仓库id")
+    private Long warehouseId;
+
     @Schema(description = "项目名称", example = "赵六")
     private String projectName;
 

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

@@ -15,6 +15,9 @@ public class ProjectOrderSubRespVO {
     @Schema(description = "项目订单子项id")
     private Long projectSubId;
 
+    @Schema(description = "仓库id")
+    private Long warehouseId;
+
     @Schema(description = "项目编号")
     private String projectCode;
 

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/projectorder/ProjectOrderSubDO.java

@@ -53,6 +53,10 @@ public class ProjectOrderSubDO extends BaseDO {
      * 材质
      */
     private Long compositionId;
+    /**
+     * 仓库id
+     */
+    private Long warehouseId;
     /**
      * 备注
      */

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

@@ -682,9 +682,9 @@ public class ChanjetManager {
                     resDTO.setMaterialId(ChanjetSpi.getIdPrefix()+Long.parseLong(values.get(3)));
                     resDTO.setUnit(values.get(4));
                     resDTO.setAmount(new BigDecimal(values.get(5)).intValue());
+                    resDTO.setWarehouseId(StringUtils.isEmpty(values.get(6)) ?  null : ChanjetSpi.getIdPrefix()+Long.parseLong(values.get(6)));
                     resulDataList.add(resDTO);
                 });
-
                 hasMore = dataLists.size() == paramVO.getPageSize();
 
             }else{

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

@@ -167,4 +167,5 @@ ALTER TABLE sc_equipment ADD COLUMN `updater` varchar(64) DEFAULT '' COMMENT '
 ALTER TABLE sc_equipment ADD COLUMN `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间';
 
 ALTER TABLE wms_wh MODIFY COLUMN `wh_status` TINYINT (1) NOT NULL DEFAULT '1' COMMENT '状态,1 表示正常，2 表示禁用';
+ALTER TABLE project_sale_order_sub ADD COLUMN `warehouse_id` BIGINT ( 20 ) COMMENT '仓库id' AFTER `material_id`;