From 6e2cf7095181c9a9d6e79ea14d833baff56953e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Wed, 17 Jul 2019 10:03:55 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=BA=93=E4=BD=8D=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 59 ++++++++++++++++++++++ 1 file changed, 59 insertions(+) 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 633422a..797e08e 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 @@ -2962,4 +2962,63 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 库位校验源库位目标库位参数 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SRC_DEST_LOCATE { + SRC(10, "SRC", "源库位"), + DEST(20, "DEST", "目标库位"); + + private int value; + private String code; + private String description; + + SRC_DEST_LOCATE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public static SRC_DEST_LOCATE codeOf(int value) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value==(value)) { + return values()[i]; + } + } + return null; + } + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } } \ No newline at end of file From 2240819defb48dedaa0fd491bfff11955b4bebfb Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 17 Jul 2019 14:50:14 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=8F=91=E6=B3=A1=E6=89=93=E7=AE=B1?= =?UTF-8?q?=E5=8C=85=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 1 + 1 file changed, 1 insertion(+) 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 633422a..8722cfe 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 @@ -304,6 +304,7 @@ public class WmsEnumUtil { /** * 产品入库，发运状态 * WMS_产品报工明细信息 ：单据状态 + * WMS_发泡打箱包装 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PRODUCT_INSTOCK_STATUS { From 40e20f7054453531a5f8442d0c2d6c79a2546010 Mon Sep 17 00:00:00 2001 From: jenkins Date: Wed, 17 Jul 2019 18:41:26 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=BC=96=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index 693435d..ebf60a2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -130,10 +130,14 @@ public class WmsMoveMaster extends BaseBean { @ApiParam("交易类型名称") private String transTypeName; + @Column(name="FIX_ID") + @ApiParam(value = "设备编号") + public String fixId; + public WmsMoveMaster(){}; public WmsMoveMaster(Long id,String orderNo,String organizeCode,String partNo,String partNameRdd,String transTypeCode,String transTypeName,Integer itemStatus, - String unit,String srcWhNo,String srcZoneNo,String destWhNo,String destZoneNo,Double transQty, Double rejectQty) { + String unit,String srcWhNo,String srcZoneNo,String destWhNo,String destZoneNo,Double transQty, Double rejectQty,String fixId) { this.id = id; this.orderNo = orderNo; this.organizeCode = organizeCode; @@ -149,7 +153,7 @@ public class WmsMoveMaster extends BaseBean { this.destZoneNo = destZoneNo; this.transQty = transQty; this.rejectQty = rejectQty; - + this.fixId = fixId; } From 86d3f8de480d3f023ee584918fd2bba30eff361e Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 17 Jul 2019 19:16:43 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=BC=80=E5=8F=91=20=E5=8F=91=E6=B3=A1?= =?UTF-8?q?=E6=89=93=E7=AE=B1=E5=8C=85=E8=A3=85job?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsPackSn.java | 76 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 5 +- .../pojo/wms/repository/WmsPackSnRepository.java | 16 +++++ 3 files changed, 96 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackSn.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPackSnRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackSn.java new file mode 100644 index 0000000..362093a --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackSn.java @@ -0,0 +1,76 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : WMS_包装箱条码表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2019-07-17 11:32 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_PACK_SN") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="包装箱条码表",description = "包装箱条码表") +public class WmsPackSn extends BaseBean { + + @Column(name = "ORDER_NO") + @ApiParam(value = "订单号") + private String orderNo; + + @Column(name = "PART_NO") + @ApiParam(value = "物料编码") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam(value = "物料名称") + private String partNameAdd; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty; + + @Column(name = "SID") + @ApiParam("SID") + private Double sId; + + @Column(name = "COMMIT_DATE") + @ApiParam(value = "提交日期") + private String commitDate; + + @Column(name = "COMMIT_TIME") + @ApiParam(value = "提交时间") + private String commitTime; + + @Column(name = "SN") + @ApiParam(value = "条码") + private String sn; + + /** + * 状态:10=新建,20=已处理,30=处理出错 PRODUCT_INSTOCK_STATUS + */ + @Column(name = "ORDER_STATUS") + @ApiParam(value = "状态") + private Integer orderStatus; + + /** + * 数据来源:ZMMES=知明MES,TBMES=MES接口 SRC_STATUS + */ + @Column(name = "SRC") + @ApiParam(value = "单据来源") + private String src; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index 2e6e363..20e8a9e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -230,8 +230,11 @@ public class WmsStockSn extends BaseBean { @ApiParam(value = "ERP库存地") public String erpZoneNo; - public WmsStockSn(){} + @Transient + @ApiParam(value = "目标数量") + public Double destQty; + public WmsStockSn(){} public WmsStockSn(String partNo){ this.partNo = partNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPackSnRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPackSnRepository.java new file mode 100644 index 0000000..87d61ea --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPackSnRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsPackSn; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2019-07-17 13:36 + * @Modify: + **/ +@Repository +public interface WmsPackSnRepository extends BaseRepository { +}