From 85681c4465f56756fea9a961545064311b491201 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Thu, 20 Jun 2019 21:35:21 +0800 Subject: [PATCH 01/21] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapBase.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapMiscr.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapRdn.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapBase.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapBase.java index 98b5663..db12d66 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapBase.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapBase.java @@ -55,7 +55,7 @@ public class SapBase { private String staflg = "Y"; @ApiParam(value = "顺序号", example = "-1") - private Integer seq = new Random().nextInt(); + private Integer seq = 1; @ApiParam(value = "GUID", example = "-1") private String guid = UUID.randomUUID().toString(); diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapMiscr.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapMiscr.java index 1f319e8..8d4fe96 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapMiscr.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapMiscr.java @@ -22,7 +22,7 @@ public class SapMiscr extends SapBase{ @ApiParam(value = "行号",example = "1") @AnnoOutputColumn - private Double zeile; + private Integer zeile; @ApiParam(value = "工厂",example = "1") @AnnoOutputColumn diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapRdn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapRdn.java index cc3a4e4..a6f4258 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapRdn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapRdn.java @@ -16,7 +16,7 @@ import lombok.Data; @Api(value="销售退货",description = "销售退货") public class SapRdn extends SapBase{ - @ApiParam(value = "销售交货单",example = "1") + @ApiParam(value = "退货交货单",example = "1") @AnnoOutputColumn private String vbeln; From f7f0ebadaf5582c4f2ba30c1127d4966bd5368ac Mon Sep 17 00:00:00 2001 From: shiyanghuan <714967695@qq.com> Date: Fri, 21 Jun 2019 15:16:14 +0800 Subject: [PATCH 02/21] Merge branch 'dev' of http://git.estsh.com/i3-WMS/i3plus-wms into dev # Conflicts: # modules/i3plus-wms-apiservice/src/main/java/cn/estsh/i3plus/wms/apiservice/controller/base/WmsUnitController.java --- .../pojo/wms/repository/WmsVendorPartRepository.java | 2 ++ .../cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 16 ++++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsVendorPartRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsVendorPartRepository.java index be3972b..f8d418a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsVendorPartRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsVendorPartRepository.java @@ -2,6 +2,8 @@ package cn.estsh.i3plus.pojo.wms.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.wms.bean.WmsVendorPart; +import org.springframework.stereotype.Repository; +@Repository public interface WmsVendorPartRepository extends BaseRepository{ } 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 2413009..49caa41 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 @@ -1941,4 +1941,20 @@ public class WmsHqlPack { return packBean; } + /** + * 单位定义 + * + * @param wmsUnit + * @return + */ + public static DdlPackBean packHqlWmsUnit(WmsUnit wmsUnit) { + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(wmsUnit.getUnitCode(), "unitCode", result); + DdlPreparedPack.getStringEqualPack(wmsUnit.getUnitName(), "unitName", result); + DdlPreparedPack.getNumEqualPack(wmsUnit.getUnitPrecision(), "unitPrecision", result); + getStringBuilderPack(wmsUnit, result); + + return result; + } } From 0182dd3cc3e7ab4cebecb87bc01d4940a0a56162 Mon Sep 17 00:00:00 2001 From: "sky.meng" Date: Fri, 21 Jun 2019 16:40:32 +0800 Subject: [PATCH 03/21] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=BA=BF(=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E4=B8=AD=E5=BF=83)=20=E5=AD=98=E5=82=A8=E5=8C=BA?= =?UTF-8?q?=E5=85=B3=E7=B3=BB=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD=E5=AE=8C?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenterZone.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenterZone.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenterZone.java index a5b785e..87ad548 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenterZone.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenterZone.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : 工作中心线边库区关系 @@ -35,4 +36,12 @@ public class WmsWorkCenterZone extends BaseBean { @Column(name = "ZONE_NO") @ApiParam(value = "线边库区") private String zoneNo; + + @Transient + @ApiParam("工作中心名称") + private String workCenterName; + + @Transient + @ApiParam("线边库区名称") + private String zoneName; } From 6259bd56bc31f39b7235d15ce106a9e20a7e5566 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Fri, 21 Jun 2019 17:04:04 +0800 Subject: [PATCH 04/21] =?UTF-8?q?=E9=80=9A=E7=94=A8EXCEl=E5=AF=BC=E5=87=BA?= =?UTF-8?q?MODEL?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sqlpack/AndonHqlPack.java | 6 +++--- .../i3plus/pojo/base/enumutil/AndonEnumUtil.java | 3 ++- .../i3plus/pojo/model/common/ExportDataModel.java | 19 +++++++++++++++++++ 3 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ExportDataModel.java diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java index 4ec6675..6b6f7c2 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java @@ -127,8 +127,8 @@ public class AndonHqlPack { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAcCode(),"acCode", result); -// DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAcName(),"acName", result); -// DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAlarmCode(), "alarmCode", result); + DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAcName(),"acName", result); + DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAlarmCode(), "alarmCode", result); getStringBuilderPack(andonAlarmCause, result); return result; @@ -394,7 +394,7 @@ public class AndonHqlPack { public static DdlPackBean packAndonAlarmDetailType(AndonAlarmDetailType andonAlarmDetailType) { DdlPackBean result = new DdlPackBean(); -// DdlPreparedPack.getStringEqualPack(andonAlarmDetailType.getAlarmCode(), "alarmCode", result); + DdlPreparedPack.getStringEqualPack(andonAlarmDetailType.getAlarmCode(), "alarmCode", result); DdlPreparedPack.getStringEqualPack(andonAlarmDetailType.getAlarmDetailCode(), "alarmDetailCode", result); getStringBuilderPack(andonAlarmDetailType, result); diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java index 8f94ef7..60eec44 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -246,7 +246,8 @@ public class AndonEnumUtil { QUALITY("QUALITY_ALARM","质量"), EQUIP("EQUMENT_ALARM","设备"), PROCESS("ROUTING_ALARM","工艺"), - CHECK("OTHER_ALARM","其他"); + CHECK("OTHER_ALARM","其他"), + FIX_ERROR("FIX_ERROR", "设备故障"); private String value; private String description; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ExportDataModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ExportDataModel.java new file mode 100644 index 0000000..9344e2d --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ExportDataModel.java @@ -0,0 +1,19 @@ +package cn.estsh.i3plus.pojo.model.common; + +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-06-20 18:50 + * @Modify: + **/ +@Data +public class ExportDataModel { + + private String className; + + private String exportData; + +} From 8a420ff9c983eed8ee084cf8179ea04a29621e5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Fri, 21 Jun 2019 17:08:35 +0800 Subject: [PATCH 05/21] =?UTF-8?q?=E5=BA=93=E5=AD=98=E8=BD=AC=E5=82=A8?= =?UTF-8?q?=E6=8C=87=E4=BB=A4=20=20=20=E4=BE=9B=E5=BA=94=E5=95=86=E9=80=80?= =?UTF-8?q?=E8=B4=A7=E6=8C=87=E4=BB=A4=E5=AE=9E=E4=BD=93=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/SapReto.java | 67 ++++++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapReto.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapReto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapReto.java new file mode 100644 index 0000000..4cd4408 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapReto.java @@ -0,0 +1,67 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : amy + * @CreateDate : 2019-06-21 13:56 + * @Modify: + **/ +@Data +@Api(value="供应商退货",description = "供应商退货") +public class SapReto extends SapBase{ + + @ApiParam(value = "业务类型",example = "1") + @AnnoOutputColumn + private String zaction; + + @ApiParam(value = "编号",example = "1") + @AnnoOutputColumn + private String zinstno; + + @ApiParam(value = "行号",example = "1") + @AnnoOutputColumn + private String zeile; + + @ApiParam(value = "供应商",example = "1") + @AnnoOutputColumn + private String lifnr; + + @ApiParam(value = "工厂",example = "1") + @AnnoOutputColumn + private String umwrk; + + @ApiParam(value = "物料编码",example = "1") + @AnnoOutputColumn + private String matnr; + + @ApiParam(value = "库存地点",example = "1") + @AnnoOutputColumn + private String lgort; + + @ApiParam(value = "退货数量",example = "1") + @AnnoOutputColumn + private String erfmg; + + @ApiParam(value = "计量单位",example = "1") + @AnnoOutputColumn + private String erfme; + + @ApiParam(value = "退货原因",example = "1") + @AnnoOutputColumn + private String bktxt; + + @ApiParam(value = "SMRR号（或DMR号）",example = "1") + @AnnoOutputColumn + private String zqmd; + + @ApiParam(value = "状态",example = "1") + @AnnoOutputColumn + private String zzlzt; + +} From 4a5f799291e67886f3c4f91c9f4c65f0c9f8afb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Fri, 21 Jun 2019 17:10:27 +0800 Subject: [PATCH 06/21] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/SapMovo.java | 79 ++++++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapMovo.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapMovo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapMovo.java new file mode 100644 index 0000000..56f38e1 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapMovo.java @@ -0,0 +1,79 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : amy + * @CreateDate : 2019-06-21 13:13 + * @Modify: + **/ +@Data +@Api(value="库存转储",description = "库存转储") +public class SapMovo extends SapBase{ + + @ApiParam(value = "编号",example = "1") + @AnnoOutputColumn + private String refid; + + @ApiParam(value = "业务类型",example = "1") + @AnnoOutputColumn + private String action; + + @ApiParam(value = "行号",example = "1") + @AnnoOutputColumn + private Integer zeile; + + @ApiParam(value = "工厂",example = "1") + @AnnoOutputColumn + private String werks; + + @ApiParam(value = "发出库存地点",example = "1") + @AnnoOutputColumn + private String lgort; + + @ApiParam(value = "接收库存地点",example = "1") + @AnnoOutputColumn + private String umlgo; + + @ApiParam(value = "物料编码",example = "1") + @AnnoOutputColumn + private String matnr; + + @ApiParam(value = "旧物料编码（针对物料号切换）",example = "1") + @AnnoOutputColumn + private String ummat; + + @ApiParam(value = "数量",example = "1") + @AnnoOutputColumn + private String erfmg; + + @ApiParam(value = "计量单位",example = "1") + @AnnoOutputColumn + private String erfme; + + @ApiParam(value = "库存状态",example = "1") + @AnnoOutputColumn + private String zstat; + + @ApiParam(value = "特殊库存标识",example = "1") + @AnnoOutputColumn + private String sobkz; + + @ApiParam(value = "特殊库存描述",example = "1") + @AnnoOutputColumn + private String htext; + + @ApiParam(value = "状态",example = "1") + @AnnoOutputColumn + private String zzlzt; + + @ApiParam(value = "不合格单据号",example = "1") + @AnnoOutputColumn + private String sgtxt; + +} From 8e8cafc6d88d452d1944c9e5364b16a263c86990 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 21 Jun 2019 18:08:29 +0800 Subject: [PATCH 07/21] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=A7=92=E8=89=B2=E5=90=8D=E7=A7=B0=20?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=9D=A1=E7=A0=81=E6=95=B0=E9=87=8F=E5=B0=81?= =?UTF-8?q?=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/wms/bean/WmsDataAuth.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 6 +++++- .../java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java | 3 +++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataAuth.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataAuth.java index 1d5d945..1198e5b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataAuth.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataAuth.java @@ -56,4 +56,8 @@ public class WmsDataAuth extends BaseBean { @ApiParam(value = "查询操作", example = "0") private Integer queryOp; + @Column(name = "ROLE_NAME_RDD") + @ApiParam(value = "角色名称") + private String roleNameRdd; + } 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 faccba1..b869f80 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 @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import org.springframework.format.annotation.DateTimeFormat; import javax.persistence.*; +import java.math.BigDecimal; import java.util.Date; /** @@ -110,6 +111,7 @@ public class WmsStockSn extends BaseBean { @ColumnDefault("0") @ApiParam(value = "数量", example = "0") private Double qty; + /** * 质量状态:10=合格,20=不合格,30=隔离 */ @@ -206,7 +208,9 @@ public class WmsStockSn extends BaseBean { this.partNo = partNo; } - public Double getQty() {return qty == null ? 0L : this.qty.doubleValue(); } + public Double getQty() { + return qty == null ? 0L : qty.doubleValue(); + } public Double getInputNCQty(){return inputNCQty == null ? 0L : this.inputNCQty.doubleValue();} } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java index cb2c596..8442671 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java @@ -66,4 +66,7 @@ public class WmsDataAuthModel extends BaseBean { example = "0" ) private Integer queryOp; + + @ApiParam("角色名称") + private String roleNameRdd; } From f6bf244b12612e7b740031671a346bbc6c98b221 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Fri, 21 Jun 2019 18:19:25 +0800 Subject: [PATCH 08/21] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=AE=A1=E5=AE=B6?= =?UTF-8?q?=E6=94=BEMOVENO=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 39 ++++++++++++---------- 1 file changed, 21 insertions(+), 18 deletions(-) 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 8da92fb..853cc70 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 @@ -492,9 +492,9 @@ public class WmsEnumUtil { OUTSOURCING_BACK(140, "OUTSOURCING_BACK", "委外退回"), NC_WAREHOSING_OUT(150, "NC_WAREHOSING_OUT", "NC出库"), SUPPLIER_RETURN_SMRR(190, "SUPPLIER_RETURN_SMRR", "供应商退货(SMRR)"), - NC_DISMANTLING_PICKING(160,"NC_DISMANTLING_PICKING","NC拆解领料"), - NC_DISMANTLING_RETREAT(170,"NC_DISMANTLING_RETREAT","NC拆解退料"), - LINE_EDGE_SCRAPPING_OUT(180,"LINE_EDGE_SCRAPPING_OUT","线边报废出库"); + NC_DISMANTLING_PICKING(160, "NC_DISMANTLING_PICKING", "NC拆解领料"), + NC_DISMANTLING_RETREAT(170, "NC_DISMANTLING_RETREAT", "NC拆解退料"), + LINE_EDGE_SCRAPPING_OUT(180, "LINE_EDGE_SCRAPPING_OUT", "线边报废出库"); private int value; @@ -851,7 +851,7 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum STOCK_SN_QC_STATUS { - NORMAL(10, "EMPTY", "合格"), ABNORMAL(20, "ABNORMAL", "不合格"), ISOLATED(30, "ISOLATED", "隔离"), FRAZE(40,"ISOLATED", "报废"); + NORMAL(10, "EMPTY", "合格"), ABNORMAL(20, "ABNORMAL", "不合格"), ISOLATED(30, "ISOLATED", "隔离"), FRAZE(40, "ISOLATED", "报废"); private int value; private String code; @@ -896,10 +896,13 @@ public class WmsEnumUtil { } public static STOCK_SN_QC_STATUS codeOf(Integer value) { - int tmp = 1; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == value) { - return values()[i]; + if (value == null) { + return null; + } else { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } } } return null; @@ -919,7 +922,7 @@ public class WmsEnumUtil { private int value; private String description; - CS_ORDER_TYPE(int value,String description) { + CS_ORDER_TYPE(int value, String description) { this.value = value; this.description = description; } @@ -948,12 +951,12 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum CS_ORDER_STATUS { - CREATE(10,"CREATE", "创建"), - STARTING_INVENTORY(20,"STARTING_INVENTORY", "开启盘点"), - IN_INVENTORY(30,"IN_INVENTORY", "盘点中"), - INVENTORY_FINISH(40,"INVENTORY_FINISH", "盘点完成"), - THAWING(50,"THAWING", "已解冻"), - CLOSED(60, "CLOSED","已关闭"); + CREATE(10, "CREATE", "创建"), + STARTING_INVENTORY(20, "STARTING_INVENTORY", "开启盘点"), + IN_INVENTORY(30, "IN_INVENTORY", "盘点中"), + INVENTORY_FINISH(40, "INVENTORY_FINISH", "盘点完成"), + THAWING(50, "THAWING", "已解冻"), + CLOSED(60, "CLOSED", "已关闭"); private int value; private String code; @@ -1725,7 +1728,7 @@ public class WmsEnumUtil { ZONE(20, "ZONE", "存储区对象"), LOCATE(30, "LOCATE", "库位对象"), MATERIAL(40, "MATERIAL", "物料对象"), - TRANS_TYPE(50,"TRANS_TYPE","交易代码对象"); + TRANS_TYPE(50, "TRANS_TYPE", "交易代码对象"); private String code; private String description; @@ -2476,12 +2479,12 @@ public class WmsEnumUtil { } } - /** + /** * 物料类型（用于物料） */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WMS_PART_TYPE { - RAW_MATERIAL(1,"原材料"), PARTIALLY_PREPARED_PRODUCTS(2,"半成品"), FINISHED_PRODUCT(3,"成品"); + RAW_MATERIAL(1, "原材料"), PARTIALLY_PREPARED_PRODUCTS(2, "半成品"), FINISHED_PRODUCT(3, "成品"); private int value; private String description; From add3f05985440386d81213e81dc959878b7489e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 21 Jun 2019 20:41:57 +0800 Subject: [PATCH 09/21] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90hql?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) 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 49caa41..8304255 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 @@ -1447,12 +1447,11 @@ public class WmsHqlPack { */ public static DdlPackBean packHqlWmsTaskDetail(Map> groupDataAuth, String refSrc, String organizeCode) { DdlPackBean result = new DdlPackBean(); - int i = 1; Set>> entries = groupDataAuth.entrySet(); //拼sql entries.stream().filter(o -> !Strings.isNullOrEmpty(o.getKey())); - for (Map.Entry> map : entries) { + /*for (Map.Entry> map : entries) { String key = map.getKey(); List valueList = map.getValue(); @@ -1463,19 +1462,19 @@ public class WmsHqlPack { List mapList = JSONObject.parseArray(data, Map.class); if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.WAREHOUSE.getValue() + "", key)) { DdlPreparedPack.getInPackList(cyclicTraversal(mapList,"WH_CODE"), "destWhNo", result); - //packMutilConditionHql(mapList, "WH_CODE", "destWhNo", result); - }/* else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.LOCATE.getValue() + "", key)) { + packMutilConditionHql(mapList, "WH_CODE", "destWhNo", result); + } else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.LOCATE.getValue() + "", key)) { DdlPreparedPack.getInPackList(cyclicTraversal(mapList,"LOCATE_NO"), "destLocateNo", result); - //packMutilConditionHql(mapList, "LOCATE_NO", "destLocateNo", result); - }*/ else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.ZONE.getValue() + "", key)) { + packMutilConditionHql(mapList, "LOCATE_NO", "destLocateNo", result); + } else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.ZONE.getValue() + "", key)) { DdlPreparedPack.getInPackList(cyclicTraversal(mapList,"ZONE_CODE"), "destZoneNo", result); - //packMutilConditionHql(mapList, "ZONE_CODE", "destZoneNo", result); - } /*else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.MATERIAL.getValue() + "", key)) { + packMutilConditionHql(mapList, "ZONE_CODE", "destZoneNo", result); + } else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.MATERIAL.getValue() + "", key)) { DdlPreparedPack.getInPackList(cyclicTraversal(mapList,"PART_NO"), "partNo", result); - //packMutilConditionHql(mapList, "PART_NO", "partNo", result); - }*/ + packMutilConditionHql(mapList, "PART_NO", "partNo", result); + } } - } + }*/ //转换封装后的hql /*String packedHql = result.getPackedHql(); From bcd3e43867bbb15f5d53d05e75d7aa0e864e77bb Mon Sep 17 00:00:00 2001 From: shiyanghuan <714967695@qq.com> Date: Fri, 21 Jun 2019 21:14:19 +0800 Subject: [PATCH 10/21] =?UTF-8?q?=E5=BA=93=E5=AD=98=E4=BA=A4=E6=98=93?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E4=BB=A5=E5=8F=8A=E4=BE=9B=E5=BA=94=E5=95=86=E7=89=A9?= =?UTF-8?q?=E6=96=99bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsTransQuan.java | 17 +++++++-- .../wms/repository/WmsTransQuanRepository.java | 2 + .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 43 ++++++++++++++++++++++ 3 files changed, 58 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java index a173734..aa23e71 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java @@ -9,10 +9,7 @@ import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; +import javax.persistence.*; /** * @Description : 库存交易条码信息 （移库类的交易需要记录2笔交易数据，正负各一笔） @@ -144,4 +141,16 @@ public class WmsTransQuan extends BaseBean { @ColumnDefault("0") @ApiParam(value = "报废数量", example = "0") private Double scrapQty; + + @Transient + @ApiParam("交易类型") + private String transTypeName; + + @Transient + @ApiParam("仓库名称") + private String warehouseName; + + @Transient + @ApiParam("存储区名称") + private String zoneName; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransQuanRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransQuanRepository.java index 41992cd..f626008 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransQuanRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransQuanRepository.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.wms.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.wms.bean.WmsTransQuan; +import org.springframework.stereotype.Repository; /** * @Description : 库存业务dao层 @@ -10,5 +11,6 @@ import cn.estsh.i3plus.pojo.wms.bean.WmsTransQuan; * @CreateDate : 2018-11-17 15:57 * @Modify: **/ +@Repository public interface WmsTransQuanRepository extends BaseRepository { } 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 49caa41..a407dfb 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 @@ -1957,4 +1957,47 @@ public class WmsHqlPack { return result; } + + //库层交易报表packHqlWmsTransQuan + + + public static DdlPackBean packHqlWmsTransQuan(WmsTransQuan wmsTransQuan) { + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(wmsTransQuan.getTransNo(), "transNo", result); + DdlPreparedPack.getStringEqualPack(wmsTransQuan.getWhNo(), "whNo", result); + DdlPreparedPack.getStringEqualPack(wmsTransQuan.getZoneNo(), "zoneNo", result); + DdlPreparedPack.getStringEqualPack(wmsTransQuan.getLocateNo(), "locateNo", result); + DdlPreparedPack.getStringEqualPack(wmsTransQuan.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsTransQuan.getPartNameRdd(), "partNameRdd", result); + DdlPreparedPack.getStringEqualPack(wmsTransQuan.getUnit(), "unit", result); + DdlPreparedPack.getNumEqualPack(wmsTransQuan.getTransStatus(), "transStatus", result); + DdlPreparedPack.getStringEqualPack(wmsTransQuan.getRefSrc(), "refSrc", result); + DdlPreparedPack.getStringEqualPack(wmsTransQuan.getRefType(), "refType", result); + DdlPreparedPack.getNumEqualPack(wmsTransQuan.getBusiType(), "busiType", result); + DdlPreparedPack.getStringEqualPack(wmsTransQuan.getTransCode(), "transCode", result); + DdlPreparedPack.getStringEqualPack(wmsTransQuan.getMoveNo(), "moveNo", result); + DdlPreparedPack.getStringEqualPack(wmsTransQuan.getVendorNo(), "vendorNo", result); + DdlPreparedPack.getStringEqualPack(wmsTransQuan.getCustNo(), "custNo", result); + DdlPreparedPack.getStringEqualPack(wmsTransQuan.getErrorMessage(), "errorMessage", result); +// DdlPreparedPack.getStringEqualPack(wmsTransQuan.getQty().toString(), "qty", result); +// DdlPreparedPack.getStringEqualPack(wmsTransQuan.getFailQty().toString(), "failQty", result); +// DdlPreparedPack.getStringEqualPack(wmsTransQuan.getHoldQty().toString(), "holdQty", result); +// DdlPreparedPack.getStringEqualPack(wmsTransQuan.getQcQty().toString(), "qcQty", result); +// DdlPreparedPack.getStringEqualPack(wmsTransQuan.getRinQty().toString(), "rinQty", result); +// DdlPreparedPack.getStringEqualPack(wmsTransQuan.getFreezeQty().toString(), "freezeQty", result); +// DdlPreparedPack.getStringEqualPack(wmsTransQuan.getConsignQty().toString(), "consignQty", result); +// DdlPreparedPack.getStringEqualPack(wmsTransQuan.getLockQty().toString(), "lockQty", result); +// DdlPreparedPack.getStringEqualPack(wmsTransQuan.getTransNo(), "scrapQty", result); +// DdlPreparedPack.getStringEqualPack(wmsTransQuan.getScrapQty().toString(), "transTypeName", result); +// DdlPreparedPack.getStringEqualPack(wmsTransQuan.getWarehouseName(), "warehouseName", result); +// DdlPreparedPack.getStringEqualPack(wmsTransQuan.getZoneName(), "zoneName", result); +// + + getStringBuilderPack(wmsTransQuan, result); + + return result; + } + + } From 8c4646bc4172a3755543752884e92e4500279cf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Fri, 21 Jun 2019 21:18:01 +0800 Subject: [PATCH 11/21] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapAsn.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapBase.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapMiscr.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapAsn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapAsn.java index e02ee39..0f5cb72 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapAsn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapAsn.java @@ -26,7 +26,7 @@ public class SapAsn extends SapBase { @ApiParam(value = "ASN item") @AnnoOutputColumn - private Double zrnum; + private Integer zrnum; @ApiParam(value = "物料编码") @AnnoOutputColumn diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapBase.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapBase.java index db12d66..0bdd192 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapBase.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapBase.java @@ -23,7 +23,7 @@ public class SapBase { private String actusr = "导入"; @ApiParam(value = "SID", example = "-1") - private String sid = new Random().nextInt() + ""; + private String sid = ( Math.abs(new Random().nextInt())+ ""); @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiParam(value = "接收数据日期", example = "-1") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapMiscr.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapMiscr.java index 8d4fe96..e0819a3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapMiscr.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapMiscr.java @@ -64,8 +64,8 @@ public class SapMiscr extends SapBase{ @AnnoOutputColumn(hidden = true) private String sgtxt; - public Double getZeileVal() { - return zeile== null ? 0D : this.zeile.doubleValue(); + public Integer getZeileVal() { + return zeile== null ? 0 : this.zeile.intValue(); } public Double getErfmgVal() { From 60d151eb351e68e9709c1ec19e9f909e30b2a522 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E5=AD=A6=E6=9D=B0?= Date: Sat, 22 Jun 2019 00:15:51 +0800 Subject: [PATCH 12/21] =?UTF-8?q?1.=20=E5=AE=8C=E6=88=90=20WMS=20-->=20SAP?= =?UTF-8?q?=20=E6=8E=A5=E5=8F=A3=E7=A8=8B=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/dbinterface/WmsInterfaceDataMapper.java | 7 ++ .../pojo/wms/dbinterface/WmsInterfaceEnumUtil.java | 74 ++++++++++++++++++++++ 2 files changed, 81 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java index 7f56b8d..f526946 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java @@ -96,4 +96,11 @@ public class WmsInterfaceDataMapper extends BaseBean { */ @Column(name = "GROUP_NAME") public String groupName; + + /** + * 业务的路由规则 + * 一表对多表时需要配置路由规则 + */ + @Column(name = "BUSI_ROUTE") + public String busiRoute; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java new file mode 100644 index 0000000..43fe989 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java @@ -0,0 +1,74 @@ +package cn.estsh.i3plus.pojo.wms.dbinterface; + +import com.fasterxml.jackson.annotation.JsonFormat; + +public class WmsInterfaceEnumUtil { + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum DIRECTION_TYPE { + SAP2WMS(10, "SAP2WMS", "SAP --> WMS"), + WMS2SAP(20, "WMS2SAP", "WMS --> SAP"), + MES2WMS(30, "MES2WMS", "MES --> WMS"), + WMS2MES(40, "WMS2MES", "WMS --> MES"); + + private int value; + private String name; + private String description; + + DIRECTION_TYPE() { + } + + DIRECTION_TYPE(int value, String name, String description) { + this.value = value; + this.name = name; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getName() { + return name; + } + + 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].getName(); + } + } + return tmp; + } + + public static int nameOf(String val) { + int tmp = -1; + for (int i = 0; i < values().length; i++) { + if (values()[i].name.equals(val)) { + tmp = values()[i].value; + } + } + return tmp; + } + + /** + * -1 不在范围内 + * @param desc + * @return + */ + 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; + } + } +} From 9d2146b23d35cc8aabe675ac262b5a2f13bd3fad Mon Sep 17 00:00:00 2001 From: "sky.meng" Date: Sat, 22 Jun 2019 09:19:00 +0800 Subject: [PATCH 13/21] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E9=9B=B6=E4=BB=B6?= =?UTF-8?q?=E5=8F=B7=E5=8A=9F=E8=83=BD=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/wms/bean/WmsCustomerPart.java | 8 ++++++++ .../pojo/wms/repository/WmsCustomerPartRepository.java | 17 +++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCustomerPartRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustomerPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustomerPart.java index e1e8e27..61a3346 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustomerPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustomerPart.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : 客户零件关系表 @@ -40,4 +41,11 @@ public class WmsCustomerPart extends BaseBean { @ApiParam(value = "客户零件号") private String customerPartNo; + @Transient + @ApiParam(value = "客户全称") + private String custDesc; + + @Transient + @ApiParam(value ="物料名称") + private String partName; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCustomerPartRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCustomerPartRepository.java new file mode 100644 index 0000000..f8763b1 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCustomerPartRepository.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.WmsCustomerPart; +import org.springframework.stereotype.Repository; + +/** + * @Description : 对象持久层仓用方法控制(客户零件号关系) + * @Reference : + * @Author : sky.meng + * @CreateDate : 2019-06-21 20:22 + * @Modify: + **/ +@Repository +public interface WmsCustomerPartRepository extends BaseRepository { + +} From b815564e6effe15670abb90db85613736bcdab88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Sat, 22 Jun 2019 13:50:43 +0800 Subject: [PATCH 14/21] =?UTF-8?q?=E7=BA=BF=E8=BE=B9=E9=85=8D=E6=96=99?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=96=B0=E5=A2=9E=E4=BB=BB=E5=8A=A1=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E3=80=81=E4=B8=BB=E8=A1=A8=E7=8A=B6=E6=80=81=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/SapCgio.java | 59 ++++++++++++++++++++++ .../pojo/wms/bean/WmsDocMovementDetails.java | 8 +++ 2 files changed, 67 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapCgio.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapCgio.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapCgio.java new file mode 100644 index 0000000..5fc931c --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapCgio.java @@ -0,0 +1,59 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 委外材料发运 + * @Reference : + * @Author : amy + * @CreateDate : 2019-06-22 10:03 + * @Modify: + **/ +@Data +@Api(value = "委外材料发运", description = "委外材料发运") +public class SapCgio extends SapBase{ + + @ApiParam(value = "编号") + @AnnoOutputColumn + private String zinstno; + + @ApiParam(value = "行号") + @AnnoOutputColumn + private String zeile; + + @ApiParam(value = "工厂") + @AnnoOutputColumn + private String werks; + + @ApiParam(value = "发（退）料库存地点") + @AnnoOutputColumn + private String lgort; + + @ApiParam(value = "供应商代码") + @AnnoOutputColumn + private String zlifnr; + + @ApiParam(value = "物料编码") + @AnnoOutputColumn + private String matnr; + + @ApiParam(value = "发(退）料数量") + @AnnoOutputColumn + private String erfmg; + + @ApiParam(value = "计量单位") + @AnnoOutputColumn + private String erfme; + + @ApiParam(value = "状态") + @AnnoOutputColumn + private String zzlzt; + + @ApiParam(value = "业务类型") + @AnnoOutputColumn + private String zaction; + +} 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 3695b07..5f00144 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 @@ -182,6 +182,14 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value ="余数",example = "1") private Double restQty; + @Transient + @ApiParam("任务状态") + private Integer isTask; + + @Transient + @ApiParam("主表单据状态") + private Integer orderMasterStatus; + public String getRecommondLot() { return recommondLot == null ? "无" : this.recommondLot; } From 60be1763b2276a517ef2a149076c94931a5d3c0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Sat, 22 Jun 2019 15:22:59 +0800 Subject: [PATCH 15/21] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E6=95=B0=E5=AD=97?= =?UTF-8?q?=E7=B1=BB=E5=9E=8Bget=E6=96=B9=E6=B3=95=E9=87=8D=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/SapCyco.java | 74 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/wms/bean/SapDifo.java | 39 ++++++++++++ .../pojo/wms/bean/WmsDocMovementDetails.java | 4 ++ 3 files changed, 117 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapCyco.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDifo.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapCyco.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapCyco.java new file mode 100644 index 0000000..62d117f --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapCyco.java @@ -0,0 +1,74 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description :盘点 + * @Reference : + * @Author : amy + * @CreateDate : 2019-06-22 10:16 + * @Modify: + **/ +@Data +@Api(value="盘点",description = "盘点") +public class SapCyco extends SapBase{ + + @ApiParam(value = "盘点凭证号") + @AnnoOutputColumn + private String iblnr; + + @ApiParam(value = "行号") + @AnnoOutputColumn + private Integer zeili; + + @ApiParam(value = "物料编码") + @AnnoOutputColumn + private String matnr; + + @ApiParam(value = "计量单位") + @AnnoOutputColumn + private String meins; + + @ApiParam(value = "工厂") + @AnnoOutputColumn + private String werks; + + @ApiParam(value = "库存地点") + @AnnoOutputColumn + private String lgort; + + @ApiParam(value = "库存状态") + @AnnoOutputColumn + private String zstat; + + @ApiParam(value = "特殊库存标识") + @AnnoOutputColumn + private String sobkz; + + @ApiParam(value = "项目号") + @AnnoOutputColumn + private String zxm; + + @ApiParam(value = "库存帐冻结标识") + @AnnoOutputColumn + private String zdjbs; + + @ApiParam(value = "删除标识") + @AnnoOutputColumn + private String xloek; + + @ApiParam(value = "年度") + @AnnoOutputColumn + private Integer gjahr; + + public Integer getZeilVal() { + return zeili== null ? 0 : this.zeili.intValue(); + } + + public Integer getGjahrVal() { + return gjahr== null ? 0 : this.gjahr.intValue(); + } +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDifo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDifo.java new file mode 100644 index 0000000..ab258ac --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDifo.java @@ -0,0 +1,39 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 盘点调差 + * @Reference : + * @Author : amy + * @CreateDate : 2019-06-22 10:27 + * @Modify: + **/ +@Data +@Api(value="盘点调差",description = "盘点调差") +public class SapDifo extends SapBase{ + + @ApiParam(value = "工厂") + @AnnoOutputColumn + private String werks; + + @ApiParam(value = "盘点凭证号") + @AnnoOutputColumn + private String iblnr; + + @ApiParam(value = "行号") + @AnnoOutputColumn + private String zeili; + + @ApiParam(value = "调整") + @AnnoOutputColumn + private String ztzbs; + + @ApiParam(value = "年度") + @AnnoOutputColumn + private String gjahr; + +} 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 5f00144..7c8267c 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 @@ -202,6 +202,10 @@ public class WmsDocMovementDetails extends BaseBean { public Double getActualQty() {return actualQty == null ? 0D : this.actualQty.doubleValue(); } + public Integer getIsTaskVal() {return isTask == null ? 0 : this.isTask.intValue();} + + public Integer getOrderMasterStatus() { return orderMasterStatus== null ? 0 : this.orderMasterStatus.intValue(); } + @Version @Column(name = "LOCK_VERSION") @ApiParam(value = "乐观锁", example = "1") From 326992e6ceebbdd9839765d3c86a0fca4002d5dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Sat, 22 Jun 2019 17:05:22 +0800 Subject: [PATCH 16/21] =?UTF-8?q?=E9=80=9A=E8=BF=87=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E5=9C=B0=E6=9F=A5=E8=AF=A2=E5=AD=98=E5=82=A8=E5=8C=BA=E7=9A=84?= =?UTF-8?q?sql=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java | 5 +++++ .../java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java | 7 +++++++ .../cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 18 ++++++++++++++++++ 3 files changed, 30 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java index 16b0109..68e40c5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java @@ -13,6 +13,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Index; import javax.persistence.Table; +import java.math.BigDecimal; /** * @Description : 作业任务明细信息 @@ -137,6 +138,10 @@ public class WmsTaskDetails extends BaseBean { return this.qty == null ? 0 : this.qty; } + public String getQtyTxt(){ + return new BigDecimal(getQty() + "").stripTrailingZeros().toPlainString(); + } + public Double getTransQty() { return this.transQty == null ? 0 : this.transQty; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java index 6481548..06e69ff 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java @@ -89,4 +89,11 @@ public class WmsZones extends BaseBean { @Transient @ApiParam(value ="子存储区列表") private List childList; + + public WmsZones(String zoneNo){ + this.zoneNo = zoneNo; + } + + public WmsZones(){} + } 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 d876980..ead2da2 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 @@ -1998,5 +1998,23 @@ public class WmsHqlPack { return result; } + /** + * 根据存储区编号集合、库位类型查询库位信息 + * + * @param zoneNoList + *@param wmsZones + * @param locateType + * @return + */ + public static DdlPackBean packLocateNoByZoneNo(List zoneNoList , WmsZones wmsZones , Integer locateType) { + DdlPackBean result = new DdlPackBean(); + + //查询参数封装 + DdlPreparedPack.getInPackList(zoneNoList, "zoneNo", result); + DdlPreparedPack.getNumEqualPack(locateType, "locateType", result); + getStringBuilderPack(wmsZones, result); + + return result; + } } From 659968da3c3722b3f82d063a2af70e64662bcd06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Sat, 22 Jun 2019 17:31:46 +0800 Subject: [PATCH 17/21] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=AE=A1=E5=AE=B6?= =?UTF-8?q?=E5=90=AF=E5=8A=A8=E5=8A=A0=E8=BD=BD=E6=B5=81=E7=A8=8B=E4=B8=8D?= =?UTF-8?q?=E5=AD=98=E5=9C=A8=E4=B8=8D=E6=8A=A5=E9=94=99+MOVE=5FNO?= =?UTF-8?q?=E5=AD=98KEY=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java index 8ddd632..5e904b2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java @@ -29,7 +29,7 @@ public class WmsActionResponseBean implements Serializable { public Map barCode; @ApiParam("进度") - public String percent ="消息提示："; + public String percent = "消息提示："; @ApiParam("当前步骤") public Integer currentStep; @@ -97,6 +97,9 @@ public class WmsActionResponseBean implements Serializable { @ApiParam(value = "是否完成流程操作") public Boolean isComplete = false; + @ApiParam(value = "交易类型信息") + public WmsTransType wmsTransType; + public WmsActionResponseBean(Boolean codeStatus, String message) { this.codeStatus = codeStatus; this.message = message; From c6f5111510229dcd42d6ecd08eb13aa729ae800e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E5=AD=A6=E6=9D=B0?= Date: Sat, 22 Jun 2019 17:58:24 +0800 Subject: [PATCH 18/21] =?UTF-8?q?1.=20=E8=A7=A3=E5=86=B3=E6=A0=87=E5=87=86?= =?UTF-8?q?=E6=8B=A3=E8=B4=A7=E4=B8=AD=E7=9A=84=20FIFO=20=E6=8C=89?= =?UTF-8?q?=E7=85=A7=E5=AD=98=E5=82=A8=E5=8C=BA=E6=8E=A8=E8=8D=90=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/repository/WmsStockSnRepository.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsStockSnRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsStockSnRepository.java index a00ba2d..80ccc6e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsStockSnRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsStockSnRepository.java @@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn; import org.springframework.data.jpa.repository.Query; +import java.util.List; + /** * @Description : 库存条码dao层 * @Reference : @@ -21,13 +23,14 @@ public interface WmsStockSnRepository extends BaseRepository { /** + * Rock.Yu at 2019-06-22 11:05 * 按照存储区代码查询最早批次的物料条码 * 按照 特殊批次、生产日期、收货日期 优先级从高到低依次排序 * @return 最早批次的条码 */ - @Query(value = "select sn from WmsStockSn " + - "where organizeCode=?1 and isValid=?2 and isDeleted=?3 " + - "and zoneNo=?4 and partNo=?5 " + + @Query(value = "from WmsStockSn " + + "where organizeCode=?1 " + + "and zoneNo=?2 and partNo=?3 and isValid=?4 and isDeleted=?5 " + "order by fixLotNo, dateCode, lotNo") - WmsStockSn findFirstFifoSNByZoneNo(String organizeCode, int isValid, int isDeleted, String zoneNo, String partNo); + List findByFifoSNByZoneNo(String organizeCode, String zoneNo, String partNo, int isValid, int isDeleted); } From 34dcf6d526b0768dd7fcffefca5b8b092ff28da3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Sat, 22 Jun 2019 20:52:31 +0800 Subject: [PATCH 19/21] =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 8 ++++---- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapBase.java | 2 +- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsLineLocatePart.java | 1 + .../main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 3 +++ 4 files changed, 9 insertions(+), 5 deletions(-) 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 853cc70..0eb01d8 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 @@ -193,10 +193,10 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ORDER_DETAILS_STATUS { - CREATE(10, "N", "创建"), - RECEIPTED(20, "R", "已完成"), - CANCEL(30, "C", "行取消"), - PRINTED(40, "C", "已打印"); + CREATE(10, "CREATE", "创建"), + RECEIPTED(20, "FINISHED", "已完成"), + CANCEL(30, "CANCLE", "行取消"), + PRINTED(40, "PRINTED", "已打印"); private int value; private String code; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapBase.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapBase.java index 0bdd192..7d7156b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapBase.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapBase.java @@ -23,7 +23,7 @@ public class SapBase { private String actusr = "导入"; @ApiParam(value = "SID", example = "-1") - private String sid = ( Math.abs(new Random().nextInt())+ ""); + private String sid = ""; @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiParam(value = "接收数据日期", example = "-1") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLineLocatePart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLineLocatePart.java index 738622a..92b472e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLineLocatePart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLineLocatePart.java @@ -27,6 +27,7 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api(value="线边库物料信息",description = "线边库物料信息") +@Deprecated public class WmsLineLocatePart extends BaseBean { @Column(name="LOCATE_NO") 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 d876980..791af0e 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 @@ -79,6 +79,9 @@ public class WmsHqlPack { //查询参数封装 DdlPreparedPack.getStringEqualPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result); DdlPreparedPack.getNumEqualPack(wmsDocMovementDetails.getItemStatus(), "itemStatus", result); + + DdlPreparedPack.timeBuilder(wmsDocMovementDetails.getCreateDateTimeStart(), + wmsDocMovementDetails.getCreateDateTimeEnd(),"createDatetime",result,true); getStringBuilderPack(wmsDocMovementDetails, result); return result; From 7488f0652ed28fb32bd3564c4270d7542aa6ece6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Sat, 22 Jun 2019 21:26:16 +0800 Subject: [PATCH 20/21] =?UTF-8?q?=E7=A7=BB=E5=BA=93=E5=8D=95=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E3=80=81=E7=9B=98=E7=82=B9=E5=AF=BC=E5=85=A5=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 791af0e..3d3b837 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 @@ -77,8 +77,11 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getStringEqualPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result); DdlPreparedPack.getNumEqualPack(wmsDocMovementDetails.getItemStatus(), "itemStatus", result); + DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getPartNo(), "partNo", result); + DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getDestZoneNo(), "destZoneNo", result); + DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getDestLocateNo(), "destLocateNo", result); DdlPreparedPack.timeBuilder(wmsDocMovementDetails.getCreateDateTimeStart(), wmsDocMovementDetails.getCreateDateTimeEnd(),"createDatetime",result,true); From 6ee8d7d2a2ce3e3c5a583935aa32ecf79b1bd93a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E5=AD=A6=E6=9D=B0?= Date: Sat, 22 Jun 2019 22:04:07 +0800 Subject: [PATCH 21/21] =?UTF-8?q?1.=20=E4=BF=AE=E6=94=B9=E6=BD=9C=E5=9C=A8?= =?UTF-8?q?BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/WmsPOMasterDetails.java | 69 ++++++++++++---------- 1 file changed, 37 insertions(+), 32 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java index bb875c1..e6e934f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java @@ -30,125 +30,130 @@ import javax.persistence.*; }) @Api("PO订单明细信息") public class WmsPOMasterDetails extends BaseBean { + + private static final long serialVersionUID = -677572691809622129L; + @Column(name = "PART_NO") @ApiParam("物料编码") - public String partNo; + private String partNo; - @Column(name = "BOX_QTY" ) + @Column(name = "BOX_QTY") @ColumnDefault("0") - @ApiParam(value ="箱数", example = "0") - public Integer boxQty; + @ApiParam(value = "箱数", example = "0") + private Integer boxQty; @Column(name = "PART_NAME_RDD") @ApiParam("物料名称") - public String partNameRdd; + private String partNameRdd; @Column(name = "ITEM") @ApiParam("行号") - public Integer item; + private Integer item; @Column(name = "QTY") @ColumnDefault("0") @ApiParam(value = "需求数量", example = "0") - public Double qty; + private Double qty; - public Double getQty(){ return this.qty == null ? 0 : this.qty; } + // 不可能为 null 值 + // Rock.Yu at 2019-06-22 20:03 + //private Double getQty(){ return this.qty == null ? new Double(0) : this.qty; } @Column(name = "UNIT") @ApiParam("单位") - public String unit; + private String unit; @Column(name = "ORDER_NO") @ApiParam("订单号") - public String orderNo; + private String orderNo; @Column(name = "PRINT_QTY") @ColumnDefault("0") @ApiParam(value = "条码打印数量", example = "0") - public Double printQty; + private Double printQty; - public Double getPrintQty(){ return this.printQty == null ? 0 : this.printQty; } + //private Double getPrintQty(){ return this.printQty == null ? new Double(0) : this.printQty; } @Column(name = "RC_QTY") @ColumnDefault("0") @ApiParam(value = "收货数量", example = "0") - public Double rcQty; + private Double rcQty; - public Double getRcQty(){ return this.rcQty == null ? 0 : this.rcQty; } + //private Double getRcQty(){ return this.rcQty == null ? new Double(0) : this.rcQty; } @Column(name = "PASS_QTY") @ColumnDefault("0") @ApiParam(value = "质检合格数量", example = "0") - public Double passQty; + private Double passQty; - public Double getPassQty(){ return this.passQty == null ? 0 : this.passQty; } + //private Double getPassQty(){ return this.passQty == null ? new Double(0) : this.passQty; } @Column(name = "NG_QTY") @ColumnDefault("0") @ApiParam(value = "质检不合格数量", example = "0") - public Double ngQty; + private Double ngQty; - public Double getNgQty(){ return this.ngQty == null ? 0 : this.ngQty; } + //private Double getNgQty(){ return this.ngQty == null ? new Double(0) : this.ngQty; } @Column(name = "PLAN_DATE") @ApiParam("计划交货日期") - public String planDate; + private String planDate; @Column(name = "PLAN_TIME") @ApiParam("计划交货时间") - public String planTime; + private String planTime; @Column(name = "ERP_AREA_NO") @ApiParam("默认收货库存地") - public String erpAreaNo; + private String erpAreaNo; /** * 状态:10 N=正常,20 C=行取消 */ @Column(name = "ITEM_STATUS") @ApiParam("状态") - public Integer itemStatus; + private Integer itemStatus; @Column(name = "SNP") @ApiParam("标准包装") - public Double snp; + private Double snp; /** * 是否免费:0=计费,1=免费 */ @Column(name = "IS_FREE") @ApiParam(value = "是否免费", example = "1") - public Integer isFree; + private Integer isFree; @Transient @ApiParam(value = "散件收货输入数量", example = "0") - public Double inputRcQty; + private Double inputRcQty; @Transient @ApiParam(value = "供应商批次") - public String dateCode; + private String dateCode; @Transient @ApiParam("前端表格编辑使用") - public Boolean isSet = false; + private Boolean isSet = false; @Transient @ApiParam("供应商批次字段是否可编辑") - public Boolean isDateCodeEdit = true; + private Boolean isDateCodeEdit = true; - public Double getInputRcQty(){ return this.inputRcQty == null ? 0 : this.inputRcQty; } + //private Double getInputRcQty(){ return this.inputRcQty == null ? new Double(0) : this.inputRcQty; } @Version @Column(name = "LOCK_VERSION") @ApiParam(value = "乐观锁", example = "1") - public transient int lockVersion; + private transient int lockVersion; @Transient @ApiParam("PO条码总箱数") - public Integer totalBoxes; + private Integer totalBoxes; @Transient @ApiParam("差异") - public Double difference; + private Double difference; }