diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/projectorder/vo/ProjectOrderRespVO.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/projectorder/vo/ProjectOrderRespVO.java index 75647bd5..2b624584 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/projectorder/vo/ProjectOrderRespVO.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/projectorder/vo/ProjectOrderRespVO.java @@ -221,4 +221,10 @@ public class ProjectOrderRespVO { @Schema(description = "剩余天数") private Integer restDays; + @Schema(description = "领料模式") + private Integer materialMode; + + @Schema(description = "生产订单Id") + private Long projectOrderId; + } diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/projectorder/vo/ProjectOrderSaveReqVO.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/projectorder/vo/ProjectOrderSaveReqVO.java index f02b221f..d99661ed 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/projectorder/vo/ProjectOrderSaveReqVO.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/projectorder/vo/ProjectOrderSaveReqVO.java @@ -142,4 +142,10 @@ public class ProjectOrderSaveReqVO { @Schema(description = "快照原始单据日期") private LocalDateTime snapshotOrderTime; + @Schema(description = "领料模式") + private Integer materialMode; + + @Schema(description = "生产订单Id") + private Long projectOrderId; + } diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/projectorder/ProjectOrderDO.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/projectorder/ProjectOrderDO.java index b0ca1b2a..6cfb2c19 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/projectorder/ProjectOrderDO.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/projectorder/ProjectOrderDO.java @@ -197,6 +197,10 @@ public class ProjectOrderDO extends BaseDO { * 单据日期 */ private LocalDateTime orderTime; + + private Long projectOderId; + + private Integer materialMode; /** * 快照原始单据日期 */ diff --git a/sql/v1.0.0/2.business/1.structure.sql b/sql/v1.0.0/2.business/1.structure.sql index c8cadae0..13ebd600 100644 --- a/sql/v1.0.0/2.business/1.structure.sql +++ b/sql/v1.0.0/2.business/1.structure.sql @@ -465,4 +465,8 @@ CREATE TABLE `tplus_lastest_bom` ( `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', `tenant_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '租户编号', PRIMARY KEY (`id`) -) ENGINE=InnoDB COMMENT='用友Tplus最新BOM表'; \ No newline at end of file +) 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 `material_mode` int(2) default null comment '领料模式'; \ No newline at end of file