Merge branch 'dev' into test

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java

@@ -13,10 +13,56 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 public class MesEnumUtil {
 
     /**
-     * PCN同步MES主数据同步类型枚举
+     * 包装规格-是否混包 MES_PACK_SPEC
      * 10.
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_PACK_SPEC_IS_MIXED {
+
+        TRUE(1, "是"),
+        FALSE(2, "否");
+
+        private int value;
+        private String description;
+
+        MES_PACK_SPEC_IS_MIXED(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * PCN同步MES主数据同步类型枚举
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum SYNC_TYPE {
 
         GET_MES_DATA(1, "pcn获取mes数据"),
@@ -61,7 +107,6 @@ public class MesEnumUtil {
 
     /**
      * PCN同步MES主数据同步方式枚举
-     * 10.
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum SYNC_PATTERN {
@@ -1238,7 +1283,9 @@ public class MesEnumUtil {
         MES_EQU_TASK_STANDARD(30, "设备作业要求"),
         MES_CUST_ORDER(40, "客户订单"),
         MES_PCN_SYNC_CFG(50, "PCN同步配置"),
-        MES_PART(60, "物料表");
+        MES_PART(60, "物料表"),
+        MES_PRODUCE_CATEGORY(70, "产品类型"),
+        MES_PACK_SPEC(80, "包装规格");
 
         private int value;
         private String description;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java

@@ -6,7 +6,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.mes.pcn.bean.*;
-import org.apache.commons.lang3.StringUtils;
+import org.springframework.util.StringUtils;
 
 /**
  * @Description:
@@ -54,13 +54,13 @@ public class MesHqlPack {
      */
     public static DdlPackBean getMesConfig(MesConfig mesConfig, String organizeCode) {
         DdlPackBean packBean = getAllBaseData(organizeCode);
-        if (StringUtils.isNotEmpty(mesConfig.getCfgCode())) {
+        if (!StringUtils.isEmpty(mesConfig.getCfgCode())) {
             DdlPreparedPack.getStringLikerPack(mesConfig.getCfgCode(), "cfgCode", packBean);
         }
-        if (StringUtils.isNotEmpty(mesConfig.getCfgName())) {
+        if (!StringUtils.isEmpty(mesConfig.getCfgName())) {
             DdlPreparedPack.getStringLikerPack(mesConfig.getCfgName(), "cfgName", packBean);
         }
-        if (mesConfig.getIsValid() != null) {
+        if (!StringUtils.isEmpty(mesConfig.getIsValid())) {
             DdlPreparedPack.getNumEqualPack(mesConfig.getIsValid(), "isValid", packBean);
         }
         return packBean;
@@ -120,34 +120,34 @@ public class MesHqlPack {
      */
     public static DdlPackBean getWorkOrderCondition(MesWorkOrder mesWorkOrder, String organizeCode) {
         DdlPackBean packBean = getAllBaseData(organizeCode);
-        if (StringUtils.isNotEmpty(mesWorkOrder.getOrderNo())) {
+        if (!StringUtils.isEmpty(mesWorkOrder.getOrderNo())) {
             DdlPreparedPack.getStringLikerPack(mesWorkOrder.getOrderNo(), "orderNo", packBean);
         }
-        if (StringUtils.isNotEmpty(mesWorkOrder.getPartNo())) {
+        if (!StringUtils.isEmpty(mesWorkOrder.getPartNo())) {
             DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNo(), "partNo", packBean);
         }
-        if (StringUtils.isNotEmpty(mesWorkOrder.getWorkOrderStatus() + "") && mesWorkOrder.getWorkOrderStatusVal() != 0) {
+        if (!StringUtils.isEmpty(mesWorkOrder.getWorkOrderStatus() + "") && mesWorkOrder.getWorkOrderStatusVal() != 0) {
             DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderStatus(), "workOrderStatus", packBean);
         }
-        if (StringUtils.isNotEmpty(mesWorkOrder.getWorkCenterCode())) {
+        if (!StringUtils.isEmpty(mesWorkOrder.getWorkCenterCode())) {
             DdlPreparedPack.getStringEqualPack(mesWorkOrder.getWorkCenterCode(), "workCenterCode", packBean);
         }
-        if (mesWorkOrder.getApprovalStatus() != null) {
+        if (!StringUtils.isEmpty(mesWorkOrder.getApprovalStatus())) {
             DdlPreparedPack.getNumEqualPack(mesWorkOrder.getApprovalStatus(), "approvalStatus", packBean);
         }
-        if (StringUtils.isNotEmpty(mesWorkOrder.getWorkOrderType() + "") && mesWorkOrder.getWorkOrderTypeVal() != 0) {
+        if (!StringUtils.isEmpty(mesWorkOrder.getWorkOrderType() + "") && mesWorkOrder.getWorkOrderTypeVal() != 0) {
             DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderType(), "workOrderType", packBean);
         }
-        if (StringUtils.isNotEmpty(mesWorkOrder.getCustOrderNo())) {
+        if (!StringUtils.isEmpty(mesWorkOrder.getCustOrderNo())) {
             DdlPreparedPack.getStringLikerPack(mesWorkOrder.getCustOrderNo(), "custOrderNo", packBean);
         }
-        if (StringUtils.isNotEmpty(mesWorkOrder.getPlanOrderNo())) {
+        if (!StringUtils.isEmpty(mesWorkOrder.getPlanOrderNo())) {
             DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPlanOrderNo(), "planOrderNo", packBean);
         }
-        if (StringUtils.isNotEmpty(mesWorkOrder.getCreateUser())) {
+        if (!StringUtils.isEmpty(mesWorkOrder.getCreateUser())) {
             DdlPreparedPack.getStringLikerPack(mesWorkOrder.getCreateUser(), "createUser", packBean);
         }
-        if (mesWorkOrder.getIsValid() != null) {
+        if (!StringUtils.isEmpty(mesWorkOrder.getIsValid())) {
             DdlPreparedPack.getNumEqualPack(mesWorkOrder.getIsValid(), "isValid", packBean);
         }
 
@@ -181,19 +181,19 @@ public class MesHqlPack {
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean);
 
-        if (StringUtils.isNotEmpty(mesPart.getPartNo())) {
+        if (!StringUtils.isEmpty(mesPart.getPartNo())) {
             DdlPreparedPack.getStringLikerPack(mesPart.getPartNo(), "partNo", packBean);
         }
-        if (StringUtils.isNotEmpty(mesPart.getPartName())) {
+        if (!StringUtils.isEmpty(mesPart.getPartName())) {
             DdlPreparedPack.getStringLikerPack(mesPart.getPartName(), "partName", packBean);
         }
-        if (StringUtils.isNotEmpty(mesPart.getCategoryCode1())) {
+        if (!StringUtils.isEmpty(mesPart.getCategoryCode1())) {
             DdlPreparedPack.getStringEqualPack(mesPart.getCategoryCode1(), "categoryCode1", packBean);
         }
-        if (StringUtils.isNotEmpty(mesPart.getCategoryCode2())) {
+        if (!StringUtils.isEmpty(mesPart.getCategoryCode2())) {
             DdlPreparedPack.getStringEqualPack(mesPart.getCategoryCode2(), "categoryCode2", packBean);
         }
-        if (StringUtils.isNotEmpty(mesPart.getCategoryCode3())) {
+        if (!StringUtils.isEmpty(mesPart.getCategoryCode3())) {
             DdlPreparedPack.getStringEqualPack(mesPart.getCategoryCode3(), "categoryCode3", packBean);
         }
 
@@ -210,10 +210,10 @@ public class MesHqlPack {
      */
     public static DdlPackBean getMesCustomer(MesCustomer customer, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(customer, organizeCode);
-        if (StringUtils.isNotEmpty(customer.getCustomerCode())) {
+        if (!StringUtils.isEmpty(customer.getCustomerCode())) {
             DdlPreparedPack.getStringLikerPack(customer.getCustomerCode(), "customerCode", packBean);
         }
-        if (StringUtils.isNotEmpty(customer.getCustomerName())) {
+        if (!StringUtils.isEmpty(customer.getCustomerName())) {
             DdlPreparedPack.getStringLikerPack(customer.getCustomerName(), "customerName", packBean);
         }
 
@@ -228,13 +228,13 @@ public class MesHqlPack {
      */
     public static DdlPackBean getMesRepair(MesRepair mesRepair, String organizeCode) {
         DdlPackBean packBean = getAllBaseData(organizeCode);
-        if (StringUtils.isNotEmpty(mesRepair.getRepairCode())) {
+        if (!StringUtils.isEmpty(mesRepair.getRepairCode())) {
             DdlPreparedPack.getStringLikerPack(mesRepair.getRepairCode(), "repairCode", packBean);
         }
-        if (StringUtils.isNotEmpty(mesRepair.getRepairName())) {
+        if (!StringUtils.isEmpty(mesRepair.getRepairName())) {
             DdlPreparedPack.getStringLikerPack(mesRepair.getRepairName(), "repairName", packBean);
         }
-        if (mesRepair.getRepairType() != null) {
+        if (!StringUtils.isEmpty(mesRepair.getRepairType())) {
             DdlPreparedPack.getNumEqualPack(mesRepair.getRepairType(), "repairType", packBean);
         }
         return packBean;
@@ -248,13 +248,13 @@ public class MesHqlPack {
      */
     public static DdlPackBean getMesScrap(MesScrap mesScrap, String organizeCode) {
         DdlPackBean packBean = getAllBaseData(organizeCode);
-        if (StringUtils.isNotEmpty(mesScrap.getScrapCode())) {
+        if (!StringUtils.isEmpty(mesScrap.getScrapCode())) {
             DdlPreparedPack.getStringLikerPack(mesScrap.getScrapCode(), "scrapCode", packBean);
         }
-        if (StringUtils.isNotEmpty(mesScrap.getScrapName())) {
+        if (!StringUtils.isEmpty(mesScrap.getScrapName())) {
             DdlPreparedPack.getStringLikerPack(mesScrap.getScrapName(), "scrapName", packBean);
         }
-        if (StringUtils.isNotEmpty(mesScrap.getScrapType())) {
+        if (!StringUtils.isEmpty(mesScrap.getScrapType())) {
             DdlPreparedPack.getStringLikerPack(mesScrap.getScrapType(), "scrapType", packBean);
         }
         return packBean;
@@ -268,13 +268,13 @@ public class MesHqlPack {
      */
     public static DdlPackBean getMesDefectCause(MesDefectCause mesDefectCause, String organizeCode) {
         DdlPackBean packBean = getAllBaseData(organizeCode);
-        if (StringUtils.isNotEmpty(mesDefectCause.getDcCode())) {
+        if (!StringUtils.isEmpty(mesDefectCause.getDcCode())) {
             DdlPreparedPack.getStringLikerPack(mesDefectCause.getDcCode(), "dcCode", packBean);
         }
-        if (StringUtils.isNotEmpty(mesDefectCause.getDcName())) {
+        if (!StringUtils.isEmpty(mesDefectCause.getDcName())) {
             DdlPreparedPack.getStringLikerPack(mesDefectCause.getDcName(), "dcName", packBean);
         }
-        if (mesDefectCause.getDcType() != null) {
+        if (!StringUtils.isEmpty(mesDefectCause.getDcType())) {
             DdlPreparedPack.getNumEqualPack(mesDefectCause.getDcType(), "dcType", packBean);
         }
         return packBean;
@@ -324,19 +324,19 @@ public class MesHqlPack {
     public static DdlPackBean getPackageSnPrint(MesPackage mesPackage) {
 
         DdlPackBean packBean = getAllBaseData(mesPackage.getOrganizeCode());
-        if (!org.springframework.util.StringUtils.isEmpty(mesPackage.getPartNo())) {
+        if (!StringUtils.isEmpty(mesPackage.getPartNo())) {
             DdlPreparedPack.getStringLikerPack(mesPackage.getPartNo(), "partNo", packBean);
         }
 
-        if (!org.springframework.util.StringUtils.isEmpty(mesPackage.getPackLevel())) {
+        if (!StringUtils.isEmpty(mesPackage.getPackLevel())) {
             DdlPreparedPack.getNumEqualPack(mesPackage.getPackLevel(), "packLevel", packBean);
         }
 
-        if (!org.springframework.util.StringUtils.isEmpty(mesPackage.getPackageNo())) {
+        if (!StringUtils.isEmpty(mesPackage.getPackageNo())) {
             DdlPreparedPack.getStringLikerPack(mesPackage.getPackageNo(), "packageNo", packBean);
         }
 
-        if (!org.springframework.util.StringUtils.isEmpty(mesPackage.getWorkCenterCode())) {
+        if (!StringUtils.isEmpty(mesPackage.getWorkCenterCode())) {
             DdlPreparedPack.getStringLikerPack(mesPackage.getWorkCenterCode(), "workCenterCode", packBean);
         }
 

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java

@@ -56,12 +56,15 @@ public class WmsTaskInfoModel implements Serializable {
     @ApiParam(value = "创建日期")
     public String createDatetime;
 
+    @ApiParam(value = "创建人")
+    public String createUser;
+
     public WmsTaskInfoModel() {
     }
 
     public WmsTaskInfoModel(String orderNo, Integer taskStatus, String opTypeName, String transTypeCode, String refSrc,
                             String busiTypeDesc, String zdate, String ztime, String custNo, String vendorNo,
-                            String createDatetime, String srcZoneNo) {
+                            String createDatetime, String srcZoneNo, String createUser) {
         this.orderNo = orderNo;
         this.taskStatus = taskStatus;
         this.opTypeName = opTypeName;
@@ -74,5 +77,6 @@ public class WmsTaskInfoModel implements Serializable {
         this.vendorNo = vendorNo;
         this.createDatetime = createDatetime;
         this.srcZoneNo = srcZoneNo;
+        this.createUser = createUser;
     }
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java

@@ -330,11 +330,12 @@ public class WmsStockSn extends BaseBean {
         this.qty = qty;
     }
 
-    public WmsStockSn(String sn, String partNo, String partNameRdd, String unit, Integer snStatus,
+    public WmsStockSn(Long id,String sn, String partNo, String partNameRdd, String unit, Integer snStatus,
                       Integer qcStatus, Double qty, String locateNo, String zoneNo, String whNo, String lotNo,
                       String dateCode, String leftCode, String fixLotNo, String vendorNo, String vendorNameRdd,
                       String qualityDate, String custNo, String lotCheckRule, String sn2d,
                       String packageNo, String createDatetime, String createUser, String modifyDatetime, String modifyUser) {
+        this.id = id;
         this.sn = sn;
         this.partNo = partNo;
         this.partNameRdd = partNameRdd;