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 1/7] =?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 2/7] 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 3/7] =?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 4/7] =?UTF-8?q?=E9=80=9A=E7=94=A8EXCEl=E5=AF=BC=E5=87=BAMO?= =?UTF-8?q?DEL?= 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 5/7] =?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 6/7] =?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 7/7] =?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; }