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/enumutil/MesPcnEnumUtil.java

@@ -2479,7 +2479,7 @@ public class MesPcnEnumUtil {
     public enum PACKAGE_PRINT_STATUS {
 
         UNPRINTED(10, "未打印"),
-        PRINTED(20, "打印");
+        PRINTED(20, "已打印");
 
         private int value;
         private String description;

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

@@ -775,6 +775,19 @@ public class WmsEnumUtil {
             return tmp;
         }
 
+        public static OUT_MOVEMENT_BUSI_TYPE codeOfs(Integer value) {
+            if (value == null) {
+                return null;
+            } else {
+                for (int i = 0; i < values().length; i++) {
+                    if (values()[i].value == value) {
+                        return values()[i];
+                    }
+                }
+            }
+            return null;
+        }
+
         public static int descOf(String desc) {
             int tmp = 1;
             for (int i = 0; i < values().length; i++) {

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java

@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.io.Serializable;
 
 /**
@@ -31,10 +32,6 @@ import java.io.Serializable;
 public class MesCellFeed extends BaseBean implements Serializable {
     private static final long serialVersionUID = 1947971369479107782L;
 
-    @Column(name = "ORDER_NO")
-    @ApiParam("工单号")
-    private String orderNo;
-
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam("工作中心")
     private String workCenterCode;
@@ -71,6 +68,10 @@ public class MesCellFeed extends BaseBean implements Serializable {
     @ApiParam("供应商代码")
     private String supplierCode;
 
+    @Transient
+    @ApiParam("工单号")
+    private String orderNo;
+
 
     public double getRawQtyVal() {
         return this.rawQty == null ? 0l : this.rawQty;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeedRecord.java

@@ -30,6 +30,11 @@ import java.io.Serializable;
 @Api("工位投料履历信息")
 public class MesCellFeedRecord extends BaseBean implements Serializable {
     private static final long serialVersionUID = 1947971369489107783L;
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("工单号")
+    private String orderNo;
+
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam("工作中心")
     private String workCenterCode;
@@ -66,7 +71,6 @@ public class MesCellFeedRecord extends BaseBean implements Serializable {
     @ApiParam("供应商代码")
     private String supplierCode;
 
-
     public double getRawQtyVal() {
         return this.rawQty == null ? 0l : this.rawQty;
     }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java

@@ -0,0 +1,50 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description :产品工作中心配置
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_PROD_WORK_CENTER")
+@Api("产品工作中心配置")
+public class MesProdWorkCenter extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 9215737252535074536L;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name = "IS_DEFAULT")
+    @ApiParam("是否默认")
+    private Integer isDefault;
+
+    @Column(name = "PART_SN")
+    @ApiParam("料箱条码")
+    private String partSn;
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java

@@ -144,6 +144,10 @@ public class MesProduceSn extends BaseBean implements Serializable {
     @ApiParam("客户标签模板")
     private String custLabelTemplate;
 
+    @Column(name = "LOT_NO")
+    @ApiParam("生产批次")
+    private String lotNo;
+
 //    @Version
 //    @Column(name = "LOCK_VERSION")
 //    @ApiParam(value = "乐观锁", example = "1")
@@ -177,7 +181,9 @@ public class MesProduceSn extends BaseBean implements Serializable {
     @ApiParam("条码类型名称")
     private String snTypeName;
 
-
+    @Transient
+    @ApiParam("条码打印状态名称")
+    private String printStatusName;
 
     public MesProduceSn() {
     }

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

@@ -30,6 +30,6 @@ public class CellFeedModel {
 
     private String scanQty;
 
-    private String LineRemainQty;
+    private String lineRemainQty;
 
 }

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

@@ -4,6 +4,8 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * @Description : 涂装工单条码-展示组件(产品包装)model
  * @Reference :
@@ -13,35 +15,47 @@ import lombok.Data;
  **/
 @Data
 @Api("产品包装model")
-public class ProdPackModel {
+public class ProdPackModel implements Serializable {
 
     // 产品条码表--产品条码
     @ApiParam("产品条码")
-    private String productSn;
+    public String productSn;
 
     // 包装主表--包装编号
     @ApiParam("一检箱条码")
-    private String packageNo;
+    public String packageNo;
 
     // 包装明细表--创建时间
     @ApiParam("一检校验时间")
-    private String createDatetime;
+    public String createDatetime;
 
     // 包装主表--打印状态(10：未打印 20：已打印)
     @ApiParam("箱条码状态")
-    private Integer printStatus;
+    public Integer printStatus;
 
     // 涂装客户标签打印
     @ApiParam("客户标签")
-    private String custSn;
+    public String custSn;
 
     // 涂装客户标签打印
     @ApiParam("当前工序")
-    private String processCode;
+    public String processCode;
 
     // 涂装客户标签打印
     @ApiParam("更新时间")
-    private String modifyDateTime;
+    public String modifyDateTime;
+
+    @ApiParam("工单号")
+    public String workOrderNo;
+
+    @ApiParam("组织代码")
+    public String organizeCode;
+
+    @ApiParam("物料号")
+    public String parentPartNo;
+
+    public ProdPackModel() {
+    }
 
     public ProdPackModel(String productSn, String packageNo, String createDatetime, Integer printStatus) {
         this.productSn = productSn;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdWorkCenterRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesProdWorkCenter;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: wangjie
+ * @CreateDate:2019-04-24-17:13
+ * @Modify:
+ **/
+@Repository
+public interface MesProdWorkCenterRepository extends BaseRepository<MesProdWorkCenter, Long> {
+}

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

@@ -1515,7 +1515,7 @@ public class MesHqlPack {
             DdlPreparedPack.getStringEqualPack(mesQcCheckStandard.getWorkCenterCode(), "workCenterCode", packBean);
         }
         if (mesQcCheckStandard.getCheckType() != null) {
-            DdlPreparedPack.getNumberBiggerEqualPack(mesQcCheckStandard.getCheckType(), "checkType", packBean);
+            DdlPreparedPack.getNumEqualPack(mesQcCheckStandard.getCheckType(), "checkType", packBean);
         }
         if (!StringUtils.isEmpty(mesQcCheckStandard.getCheckItem())) {
             DdlPreparedPack.getStringLikerPack(mesQcCheckStandard.getCheckItem(), "checkItem", packBean);
@@ -3113,4 +3113,21 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
+    /**
+     * 产品工作中心配置
+     * @param prodWorkCenter
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesProdWorkCenter(MesProdWorkCenter prodWorkCenter, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(prodWorkCenter, organizeCode);
+        if (!StringUtils.isEmpty(prodWorkCenter.getPartNo())) {
+            DdlPreparedPack.getStringLikerPack(prodWorkCenter.getPartNo(), "partNo", packBean);
+        }
+        if (!StringUtils.isEmpty(prodWorkCenter.getWorkCenterCode())) {
+            DdlPreparedPack.getStringLikerPack(prodWorkCenter.getWorkCenterCode(), "workCenterCode", packBean);
+        }
+        return packBean;
+    }
 }

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

@@ -357,6 +357,10 @@ public class MesPcnHqlPack {
             DdlPreparedPack.getNumEqualPack(mesProduceSn.getSnStatus(), "snStatus", packBean);
         }
 
+        if (!StringUtils.isEmpty(mesProduceSn.getWorkOrderNo())) {
+            DdlPreparedPack.getNumEqualPack(mesProduceSn.getWorkOrderNo(), "workOrderNo", packBean);
+        }
+
         // 时间段查询
         if (!StringUtils.isEmpty(mesProduceSn.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesProduceSn.getCreateDateTimeEnd())) {
             DdlPreparedPack.timeBuilder(
@@ -636,7 +640,9 @@ public class MesPcnHqlPack {
         if (!StringUtils.isEmpty(mesWorkOrder.getWorkOrderStatus())) {
             DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderStatus(), "workOrderStatus", packBean);
         }
-        DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderType(), "workOrderType", packBean);
+        if (!StringUtils.isEmpty(mesWorkOrder.getWorkOrderType() + "") && mesWorkOrder.getWorkOrderTypeVal() != 0) {
+            DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderType(), "workOrderType", packBean);
+        }
         // 时间段查询
         if (!StringUtils.isEmpty(mesWorkOrder.getStartTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getStartTimeEnd())) {
             DdlPreparedPack.timeBuilder(

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

@@ -117,4 +117,8 @@ public class AmpJisRec extends BaseBean {
         this.qty = qty;
         this.unit = unit;
     }
+
+    public AmpJisRec() {
+
+    }
 }

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

@@ -0,0 +1,43 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description : 自动任务日志
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2020-06-23 13:55
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name = "WMS_AUTO_TASK_LOG")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value = "自动任务日志", description = "自动任务日志")
+public class WmsAutoTaskLog extends BaseBean {
+    private static final long serialVersionUID = -7839329617395574378L;
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("关联订单号")
+    public String orderNo;
+
+    @Column(name = "BUSI_TYPE")
+    @ApiParam("业务类型")
+    public String busiType;
+
+    @Column(name = "ERROR_MSG")
+    @ApiParam("错误信息")
+    public String errorMsg;
+}

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

@@ -11,7 +11,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;
 
 /**
  * @Description : 移库单条码表
@@ -78,6 +82,14 @@ public class WmsDocMovementSn extends BaseBean {
     @ApiParam(value = "供应商编码")
     public String vendorNo;
 
+    @Column(name = "WORK_ORDER_CODE")
+    @ApiParam(value = "工单码")
+    private String workOrderCode;
+
+    @Column(name = "SEQ_NO")
+    @ApiParam(value = "父位置号")
+    private String seqNo;
+
     @Column(name = "SN_TYPE")
     @ApiParam(value = "条码类型")
     @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_STOCK_TYPE.class, refForeignKey = "value", value = "description")

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

@@ -212,6 +212,10 @@ public class WmsMoveToERP extends BaseBean {
     @Transient
     private Long finishedCounts;
 
+    @Column(name = "POD_DIR")
+    @ApiParam(value = "方向")
+    private Integer podDir;
+
     @Transient
     private Long shippingId;
 

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

@@ -72,4 +72,8 @@ public class WmsPackageSpec extends BaseBean {
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL,
             isRequire = 2, dataSrc = "/wms/base-data/wms-package-spec/query", listColumnName = "specName", explicitColumnName = "specName")
     private String parentName;
+
+    @Column(name = "DIRECTION")
+    @ApiParam(value = "方向")
+    private Integer direction;
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoTaskModel.java

@@ -1,8 +1,13 @@
 package cn.estsh.i3plus.pojo.wms.modelbean;
 
+import cn.estsh.i3plus.pojo.wms.bean.WmsDocMovementDetails;
+import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn;
+import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description :
@@ -14,14 +19,36 @@ import java.util.List;
 @Data
 public class WmsAutoTaskModel {
 
-    String lockLocacte;
-    String lockCar;
+    @ApiParam("业务类型")
+    private Integer busiType;
 
-    Integer busiType;
+    @ApiParam("存储区")
+    private String zoneNo;
 
-    String srcZoneNo;
-    String descZoneNo;
-    List<String> partList;
+    @ApiParam("物料集合")
+    private List<String> partList;
 
-    String organizeCode;
+    @ApiParam("工厂代码")
+    private String organizeCode;
+
+    @ApiParam("交易类型")
+    private String transTypeCode;
+
+    @ApiParam("锁定库位")
+    private String lockLocacte;
+
+    @ApiParam("方向")
+    private Integer direction;
+
+    @ApiParam("货格")
+    private String packageNo;
+
+    @ApiParam("锁定料车")
+    private String lockCar;
+
+    @ApiParam("物料对应的明细集合")
+    Map<String, WmsDocMovementDetails>  partNoDetailsList;
+
+    @ApiParam("锁定条码")
+    HashMap<String,List<WmsStockSn>> stringListHashMap;
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsAutoTaskLogRecRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsAutoTaskLog;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2020-06-23 21:46
+ * @Modify:
+ **/
+@Repository
+public interface WmsAutoTaskLogRecRepository extends BaseRepository<WmsAutoTaskLog,Long> {
+}