【领料出库】领料模式和生产订单code

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

@@ -253,8 +253,8 @@ public class ChanjetController {
     @Scheduled(cron = "0 0 3 * * ?")
     public void synchronizeData() throws ChanjetApiException{
         //查询库存-现存量
-        chanjetSchedule.queryStock();
+//        chanjetSchedule.queryStock();
-//        chanjetSchedule.queryProcessBom();
+        chanjetSchedule.queryProcessBom(new Long(97));
         //创建入库
         chanjetSchedule.createStorageInOrder();
     }

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

@@ -221,10 +221,6 @@ public class ProjectOrderRespVO {
     @Schema(description = "剩余天数")
     private Integer restDays;
 
-    @Schema(description = "领料模式")
-    private Integer materialMode;
 
-    @Schema(description = "生产订单Id")
-    private Long projectOrderId;
 
 }

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

@@ -142,10 +142,6 @@ public class ProjectOrderSaveReqVO {
     @Schema(description = "快照原始单据日期")
     private LocalDateTime snapshotOrderTime;
 
-    @Schema(description = "领料模式")
-    private Integer materialMode;
 
-    @Schema(description = "生产订单Id")
-    private Long projectOrderId;
 
 }

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

@@ -80,7 +80,11 @@ public class StoragePageReqVO extends PageParam {
     @Schema(description = "物料名称")
     private String matName;
 
+    @Schema(description = "领料模式")
+    private Integer materialMode;
 
+    @Schema(description = "生产订单Code")
+    private String projectOrderCode;
 
 
 }

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

@@ -97,4 +97,10 @@ public class StorageRespVO {
     @Schema(description = "产品名称")
     private String projectSubName;
 
+    @Schema(description = "领料模式")
+    private Integer materialMode;
+
+    @Schema(description = "生产订单Code")
+    private String projectOrderCode;
+
 }

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

@@ -64,6 +64,12 @@ public class StorageSaveReqVO {
     @NotBlank(message = "操作类型不能为空")
     private String active;
 
+    @Schema(description = "领料模式")
+    private Integer materialMode;
+
+    @Schema(description = "生产订单Code")
+    private String projectOrderCode;
+
     private String creator;
     private String updater;
 

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

@@ -468,5 +468,5 @@ CREATE TABLE `tplus_lastest_bom` (
 ) ENGINE=InnoDB COMMENT='用友Tplus最新BOM表';
 
 
-alter table wms_storage add column `project_order_id` bigint(20) default null comment '生产订单id';
+alter table wms_storage add column `project_order_code` varchar(64) default null comment '生产订单id';
 alter table wms_storage add column `material_mode` int(2) default null comment '领料模式';