Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test

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<String> 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查询语句
      *

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;

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;
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DismantleRecordModel.java

@@ -0,0 +1,45 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesDefect;
+import cn.estsh.i3plus.pojo.mes.bean.MesDismantleRecord;
+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<MesDismantleRecord> dismantleRecordList;
+
+    @ApiParam("不良集合")
+    private List<MesDefect> defectList;
+}

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<T> {
 
     @ApiParam("实现类")
     private Object futrueTaskService;
@@ -32,5 +34,12 @@ public class FutrueTaskModel {
     @ApiParam("工作单元代码")
     private String workCellCode;
 
+    @ApiParam("总装批量执行逻辑")
+    private List<T> requestBeanList;
+
+    @ApiParam("总装批量执行逻辑")
+    private Object specialBusinessType;
+
+
 
 }

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 = "用户消息不存在";
         }

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();
     }

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;

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<String> 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);