From a62b10dc9d050af1798b9c975a600e9c99e77158 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 7 Dec 2020 09:38:19 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java | 4 ++-- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java index bf2c50b..dff1e11 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java @@ -41,12 +41,12 @@ public class SwebProcurementPlanOrder extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String orderNo; - @Column(name = "VENDOR_NO") + @Column(name = "VENDOR_CODE") @ApiParam(value = "供应商代码") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasVendor", searchColumnName = "vendorNo,vendorName", listColumnName = "vendorNo,vendorName", explicitColumnName = "vendorNo") - private String vendorNo; + private String vendorCode; @Column(name = "VENDOR_NAME") @ApiParam(value = "供应商名称") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index e99fb40..f10ed68 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -176,7 +176,7 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(swebProcurementPlanOrder.getOrganizeCode(), "organizeCode", packBean); DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getPartNo(), "partNo", packBean); DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getPartName(), "partName", packBean); - DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorNo(), "vendorNo", packBean); + DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorCode(), "vendorNo", packBean); DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorName(), "vendorName", packBean); DdlPreparedPack.getStringRightLikerPack(swebProcurementPlanOrder.getOrderNo(), "orderNo", packBean); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); From f744b94e87cec428c4cf5bf3a490d0b6b022a865 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E6=A2=81=E4=B8=8D=E8=83=96?= <1773091595@qq.com> Date: Mon, 7 Dec 2020 10:11:57 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=8C=97=E4=BA=AC=E9=A2=86=E6=96=99?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/bean/WmsDocMovementDetails.java | 15 +++++++++++ .../i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 29 ++++++++++++++++++++++ .../java/cn/estsh/i3plus/pojo/wms/bean/WmsFix.java | 4 +-- 3 files changed, 46 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index cb532b0..37065db 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -474,6 +474,8 @@ public class WmsDocMovementDetails extends BaseBean { String prodCfgTypeName; + + public WmsDocMovementDetails (String custNo,String planDate,String planTime,String orderNo,String projectNo,String partNo,Integer itemStatus) { this.custNo = custNo; this.orderNo = orderNo; @@ -715,4 +717,17 @@ public WmsDocMovementDetails (String partNo,String orderNo) { this.custNo = custNo; } + public WmsDocMovementDetails(String orderNo,String custPartNo,String srcZoneNo, String destZoneNo,String destLocateNo,Double qty,Double pickQty, String createDatetime,Integer orderStatus,String createUser) { + this.orderNo = orderNo; + this.custPartNo = custPartNo; + this.srcZoneNo = srcZoneNo; + this.destZoneNo = destZoneNo; + this.destLocateNo = destLocateNo; + this.qty = qty; + this.pickQty = pickQty; + this.createDatetime = createDatetime; + this.orderStatus = orderStatus; + this.createUser = createUser; + + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index 787c2a1..214993b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -358,6 +358,23 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam("查询状态集合") public List orderStatusList; + @Transient + @ApiParam("一个应拣数里面的料子") + public Double snp; + + @Transient + @ApiParam("实拣数") + public int pickQty; + + + @Transient + @ApiParam("拣货状态") + public Integer pickOrderStatus; + + @Transient + @ApiParam("完成时间") + public String complateDatetime; + public int getOrderStatusVal() { return this.orderStatus == null ? 0 : this.orderStatus; } @@ -401,4 +418,16 @@ public class WmsDocMovementMaster extends BaseBean { this.custOwner = custOwner; this.custTel = custTel; } + + public WmsDocMovementMaster(String orderNo,String createDatetime,Double qty,Double snp,Integer orderStatus,String organizeCode,String createUser,String planDate,String planTime) { + this.orderNo = orderNo; + this.createDatetime = createDatetime; + this.qty = qty; + this.snp = snp; + this.orderStatus = orderStatus; + this.organizeCode = organizeCode; + this.createUser = createUser; + this.assignPlanDate = planDate; + this.assignPlanTime = planTime; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFix.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFix.java index c8fa3f5..bb4ab7b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFix.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFix.java @@ -33,8 +33,8 @@ public class WmsFix extends BaseBean{ @ApiParam("设备编号") public String fixId; - @Column(name = "FIX_MAC") - @ApiParam("设备mac地址") + @Column(name = "FIX_MAC") @ApiParam("设备mac地址") + public String fixMac; @Column(name = "FIX_NAME") From 5c1164a9381e51714f6ed8293876de5dad223d7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Mon, 7 Dec 2020 11:00:04 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=A2=A8=E8=A5=BF=E5=93=A5WMS=E6=8A=A5?= =?UTF-8?q?=E5=B7=A5=E4=B8=9A=E5=8A=A1=E6=96=B0=E5=A2=9E=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=EF=BC=9A=E9=80=9A=E7=94=A8=E8=84=9A=E6=9C=AC=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3+=E7=94=9F=E4=BA=A7=E7=89=88=E6=9C=ACDAO?= =?UTF-8?q?=E5=B1=82+=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92=E4=B8=BB?= =?UTF-8?q?=E8=A1=A8=E8=AE=A1=E5=88=92=E7=8A=B6=E6=80=81FINISH(25,=20"FINI?= =?UTF-8?q?SH",=20"=E5=B7=B2=E5=AE=8C=E6=88=90")?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 1 + .../wms/repository/WmsProductVersionRepository.java | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsProductVersionRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 14d440e..e844a72 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -5096,6 +5096,7 @@ public class WmsEnumUtil { public enum WORK_ORDER_PLAN_STATUS { CREATE(10, "CREATE", "创建"), PLANNED(20, "PLANNED", "处理中"), + FINISH(25, "FINISH", "已完成"), CLOSE(30, "CLOSE", "已关闭"); private int value; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsProductVersionRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsProductVersionRepository.java new file mode 100644 index 0000000..dc6b275 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsProductVersionRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.MesPpMaster; +import cn.estsh.i3plus.pojo.wms.bean.WmsProductVersion; +import org.springframework.stereotype.Repository; + +/** + * @Description 生产版本DAO层 + * @Reference + * @Author dragon + * @CreateDate 2020/12/4 18:49 + * @Modify + */ +@Repository +public interface WmsProductVersionRepository extends BaseRepository { +} From da293141cd31b8dac511201d23a0c63fab1a1ba8 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Mon, 7 Dec 2020 15:08:31 +0800 Subject: [PATCH 4/6] =?UTF-8?q?oee=20bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 363e667..fbe4029 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -5619,6 +5619,7 @@ public class MesEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum VALUE_TYPE { + MANUAL_ASSIGNMENT("10", "手工赋值"), SPEL_EXPRESSION("20", "spel表达式"), FUNCTION_ASSIGNMENT("30", "函数赋值"), diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java index bd5d000..9d9e191 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java @@ -144,4 +144,8 @@ public class MesOee extends BaseBean implements Serializable { @Transient @ApiParam("手工录入集合") private List attributes; + + @Transient + @ApiParam("自定义数据-非手工录入") + private String busiDataNoManual; } From f9ce9641de63984b19b64f6459b62254ef7d1f21 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 7 Dec 2020 17:37:53 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=B4=A2=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java | 1 + 2 files changed, 2 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java index ad0869f..f35d6ef 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java @@ -29,6 +29,7 @@ import java.io.Serializable; @Index(columnList = "WORK_ORDER_NO"), @Index(columnList = "WORK_CENTER_CODE"), @Index(columnList = "WORK_CELL_CODE"), + @Index(columnList = "CREATE_DATE_TIME"), @Index(columnList = "IS_SEALED") }, uniqueConstraints = { @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO"}) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java index b71d6ac..c8226c2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java @@ -29,6 +29,7 @@ import java.math.BigDecimal; @Index(columnList = "SERIAL_NUMBER"), @Index(columnList = "PRODUCT_SN"), @Index(columnList = "CREATE_DATE_TIME"), + @Index(columnList = "MODIFY_DATE_TIME"), @Index(columnList = "PART_NO"), @Index(columnList = "WORK_ORDER_NO") }, uniqueConstraints = { From d2fd06cb2bb965986f509d5ada1cad8ae97fb4c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Mon, 7 Dec 2020 18:18:57 +0800 Subject: [PATCH 6/6] =?UTF-8?q?fix(core):=E5=8D=95=E5=8F=B7=E7=94=9F?= =?UTF-8?q?=E6=88=90=E8=A7=84=E5=88=99=E6=B2=A1=E6=9C=89=E6=B8=85=E9=99=A4?= =?UTF-8?q?=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java index ed8ce43..1634410 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java @@ -63,13 +63,13 @@ public class SysOrderNoRule extends BaseBean { private Long serialNoLength; @Column(name = "IS_CYCLE") - @ApiParam(value = "达到最大值后是否循环",example = "1") + @ApiParam(value = "是否按日期循环", example = "1") @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class) private Integer isCycle; @Column(name = "IS_FIXED_LENGTH") @ColumnDefault("2") - @ApiParam(value = "是否固定序号长度长度",example = "1") + @ApiParam(value = "是否固定序号长度",example = "1") @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class) private Integer isFixedLength;