From d19fbe8cf116b7db63776fc5a548e4ad0590e515 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Wed, 16 Sep 2020 15:22:15 +0800 Subject: [PATCH 1/6] =?UTF-8?q?fix(core):=E7=94=A8=E6=88=B7=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=AF=BC=E5=87=BA=E6=97=B6=EF=BC=8C=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=BF=A1=E6=81=AF=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/model/platform/UserExportModel.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserExportModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserExportModel.java index c665e3b..527391a 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserExportModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserExportModel.java @@ -119,13 +119,10 @@ public class UserExportModel extends BaseBean { @ApiModelProperty(value ="家庭地址") private String infoFamilyAddress; - @ApiModelProperty(value ="账号状态(枚举：1正常,2冻结使用,3账号异常,4离职，5服务到期)" , example ="-1") + @ApiModelProperty(value ="账号状态" , example ="-1") @AnnoOutputColumn(refClass = CommonEnumUtil.USER_STATUS.class) private Integer userStatus; - @ApiModelProperty(value ="用户状态" , example ="-1") - private Integer infoStatus; - public UserExportModel() { } @@ -140,6 +137,7 @@ public class UserExportModel extends BaseBean { this.userPhone = sysUser.getUserPhone(); this.userEmail = sysUser.getUserEmail(); this.infoEmpNo = sysUser.getUserEmpNo(); + this.userStatus = sysUser.getUserStatus(); } else { this.userLoginName = "用户账号不存在"; } @@ -172,6 +170,11 @@ public class UserExportModel extends BaseBean { this.infoPoliticalStatus = sysUserInfo.getUserPoliticalStatus(); this.infoHobby = sysUserInfo.getUserHobby(); this.infoFamilyAddress = sysUserInfo.getUserFamilyAddress(); + this.organizeCode=sysUserInfo.getOrganizeCode(); + this.createDatetime=sysUserInfo.getCreateDatetime(); + this.createUser=sysUserInfo.getCreateUser(); + this.modifyDatetime=sysUserInfo.getModifyDatetime(); + this.modifyUser=sysUserInfo.getModifyUser(); } else { this.infoName = "用户消息不存在"; } From ad5c122df80d4263e1ff0f373f11e22073d14a27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Wed, 16 Sep 2020 16:29:28 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3-=E6=B7=BB=E5=8A=A0=E6=80=BB=E8=A3=85=E8=B4=A8?= =?UTF-8?q?=E9=87=8F=E6=A3=80=E6=B5=8B=E5=BC=B9=E6=A1=86=E5=B7=A5=E6=AD=A5?= =?UTF-8?q?=E5=92=8C=E8=BF=94=E5=B7=A5=E8=BF=94=E4=BF=AE=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesPackage.java | 4 ++ .../pojo/mes/model/DismantleRecordModel.java | 46 ++++++++++++++++++++++ .../i3plus/pojo/mes/model/FutrueTaskModel.java | 11 +++++- 3 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DismantleRecordModel.java 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 a22dd03..c809906 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 @@ -140,6 +140,10 @@ public class MesPackage extends BaseBean implements Serializable { @ApiParam("库位代码") private String locationCode; + @Column(name = "ERP_WORK_CENTER_CODE") + @ApiParam("erp工作中心") + private String erpWorkCenterCode; + @Transient @ApiParam("目标库位代码") private String destLocationCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DismantleRecordModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DismantleRecordModel.java new file mode 100644 index 0000000..99913d8 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DismantleRecordModel.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesDefect; +import cn.estsh.i3plus.pojo.mes.bean.MesDismantleRecord; +import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +@Data +public class DismantleRecordModel { + + @ApiParam("组织代码") + private String organizeCode; + + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("工作单元代码") + private String workCellCode; + + @ApiParam("工单号") + private String workOrderNo; + + @ApiParam("过程条码") + private String serialNumber; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partName; + + @ApiParam("缺陷类型") + private String defectType; + + @ApiParam("用户") + private String userInfo; + + @ApiParam("物料拆解集合") + private List dismantleRecordList; + + @ApiParam("不良集合") + private List defectList; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java index 77ab351..1fdcdda 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java @@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.util.List; + /** * @Description: 条码解绑实体 * @Reference: @@ -12,7 +14,7 @@ import lombok.Data; * @Modify: **/ @Data -public class FutrueTaskModel { +public class FutrueTaskModel { @ApiParam("实现类") private Object futrueTaskService; @@ -32,5 +34,12 @@ public class FutrueTaskModel { @ApiParam("工作单元代码") private String workCellCode; + @ApiParam("总装批量执行逻辑") + private List requestBeanList; + + @ApiParam("总装批量执行逻辑") + private Object specialBusinessType; + + } From f58e07fa335bb7278d32306fb7f6afcbd06dd586 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Wed, 16 Sep 2020 16:30:41 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3-=E6=B7=BB=E5=8A=A0=E6=80=BB=E8=A3=85=E8=B4=A8?= =?UTF-8?q?=E9=87=8F=E6=A3=80=E6=B5=8B=E5=BC=B9=E6=A1=86=E5=B7=A5=E6=AD=A5?= =?UTF-8?q?=E5=92=8C=E8=BF=94=E5=B7=A5=E8=BF=94=E4=BF=AE=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/DismantleRecordModel.java | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DismantleRecordModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DismantleRecordModel.java index 99913d8..931906d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DismantleRecordModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DismantleRecordModel.java @@ -2,7 +2,6 @@ package cn.estsh.i3plus.pojo.mes.model; import cn.estsh.i3plus.pojo.mes.bean.MesDefect; import cn.estsh.i3plus.pojo.mes.bean.MesDismantleRecord; -import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn; import io.swagger.annotations.ApiParam; import lombok.Data; From ba8022f9ca4ea1c858bd915e57fa7ee174e65401 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Wed, 16 Sep 2020 19:31:29 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E9=98=9F=E5=88=97?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E5=A2=9E=E5=8A=A0=E6=9D=A1=E7=A0=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 --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java index 382dd6a..e33fd3a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java @@ -124,6 +124,10 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { @ApiParam("分组序号") private String groupSeq; + @Column(name = "PRODUCT_SN") + @ApiParam("产品条码") + private String productSn; + @Transient @ApiParam("Vin") private String vinCode; @@ -181,10 +185,6 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { private Integer masterStatus; @Transient - @ApiParam("产品条码") - private String productSn; - - @Transient @ApiParam("队列类型") private Integer queueType; From ae6ffa27f485c8dc61694b5f71fef69e865a82ce Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 16 Sep 2020 21:15:50 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8DTJ=20MGN=20BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/tool/DdlPreparedPack.java | 28 +++++++++++++++++ .../estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 4 +++ .../estsh/i3plus/pojo/wms/bean/WmsStockQuan.java | 35 +++++++++++++++++++++- 3 files changed, 66 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java index 926f68f..341490d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.base.tool; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.util.StringUtil; import org.apache.commons.lang3.StringUtils; import java.text.SimpleDateFormat; @@ -649,6 +650,33 @@ public class DdlPreparedPack { } } + + /** + * 多个字段列or查询 + * + * @param data + * @param columnNames + * @param columnNamesKey + * @param packBean + */ + public static void getMultOrPackString(String data, List columnNames, String columnNamesKey, DdlPackBean packBean) { + StringBuffer sbf = new StringBuffer(" and ( "); + if (StringUtil.isEmpty(columnNamesKey)) { + columnNamesKey = "mult_column_name"; + } + for (int i = 0; i < columnNames.size(); i++) { + String columnName = columnNames.get(i); + sbf.append(" model." + columnName + "=:m_" + columnNamesKey); + if (i == columnNames.size() - 1) { + continue; + } + sbf.append(" or "); + } + sbf.append(" )"); + packBean.addColumnQuery(columnNamesKey, sbf.toString(), data); + + } + /** * 封装in String查询语句 * diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java index 68738c4..fda0174 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java @@ -265,6 +265,10 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsLocate", @ApiParam(value = "jis料架号") private String queueGroupNo; + @Transient + @ApiParam(value = "来源存储区/目标存储区") + private Integer srcOrDestZoneno; + public Integer getIsSnapshot() { return isSnapshot == null ? 0 : isSnapshot.intValue(); } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java index a587db3..6312970 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java @@ -9,7 +9,11 @@ import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.*; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Table; +import javax.persistence.Transient; import java.util.List; /** @@ -154,6 +158,12 @@ public class WmsStockQuan extends BaseBean { @Transient private Integer isSnapshot; + + @Transient + @ApiParam(value = "应有数量") + private Double theoryQty; + + public Integer getIsSnapshot() { return this.isSnapshot == null ? 0 : this.isSnapshot; } @@ -229,11 +239,34 @@ public class WmsStockQuan extends BaseBean { this.freezeQty = freezeQty; this.consignQty = consignQty; this.lockQty = lockQty; + this.sumQty = sumQty; this.prodCfgTypeCode = prodCfgTypeCode; this.prodCfgTypeName = prodCfgTypeName; this.scrapQty = scrapQty; } + public WmsStockQuan(String organizeCode, String whNo, String zoneNo, String unit, String partNo, String partName, + Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, + Double consignQty, Double lockQty, Double sumQty, String prodCfgTypeCode, String prodCfgTypeName, Double scrapQty) { + this.organizeCode = organizeCode; + this.whNo = whNo; + this.zoneNo = zoneNo; + this.unit = unit; + this.partNo = partNo; + this.partNameRdd = partName; + this.qty = qty; + this.failQty = failQty; + this.holdQty = holdQty; + this.qcQty = qcQty; + this.rinQty = rinQty; + this.freezeQty = freezeQty; + this.consignQty = consignQty; + this.lockQty = lockQty; + this.sumQty = sumQty; + this.prodCfgTypeCode = prodCfgTypeCode; + this.prodCfgTypeName = prodCfgTypeName; + this.scrapQty = scrapQty; + } public WmsStockQuan(Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty, Double scrapQty) { this.qty = qty; this.failQty = failQty; From 5e0c0a40517b452b0d4da8281ca165315b6f66d0 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 16 Sep 2020 21:18:13 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8DTJ=20MGN=20BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 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 ef66f02..9b0e4ed 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 @@ -1203,8 +1203,15 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getUnit(), "unit", packBean); DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getSrcWhNo(), "srcWhNo", packBean); DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getDestWhNo(), "destWhNo", packBean); - DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getSrcZoneNo(), "srcZoneNo", packBean); - DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getDestZoneNo(), "destZoneNo", packBean); + if (wmsMoveDetails.getSrcOrDestZoneno() != null && wmsMoveDetails.getSrcOrDestZoneno().intValue() == WmsEnumUtil.TRUE_OR_FALSE.TRUE.getValue()) { + List columnNames = new ArrayList<>(); + columnNames.add("srcZoneNo"); + columnNames.add("destZoneNo"); + DdlPreparedPack.getMultOrPackString(wmsMoveDetails.getZoneNo(), columnNames, null, packBean); + } else { + DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getSrcZoneNo(), "srcZoneNo", packBean); + DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getDestZoneNo(), "destZoneNo", packBean); + } DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getSrcLocateNo(), "srcLocateNo", packBean); DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getDestLocateNo(), "destLocateNo", packBean); DdlPreparedPack.getNumEqualPack(wmsMoveDetails.getItemStatus(), "itemStatus", packBean);