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

@@ -4067,7 +4067,8 @@ public class MesPcnEnumUtil {
         JUMP_STEP(20, "跳过工步"),
         JUMP_STATE(30, "跳过状态点"),
         ABNORMAL_DEDUCTION(40, "扣减异常"),
-        REDO_STATION(50, "工位重做");
+        REDO_STATION(50, "工位重做"),
+        RELEASE(60, "放行继续");
 
         private int value;
         private String description;

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

@@ -0,0 +1,61 @@
+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 javax.persistence.Transient;
+import java.io.Serializable;
+
+/**
+ * @Description :MES_库位信息
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-12
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_LOCATION")
+@Api("MES_库位信息")
+public class MesLocation extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -896118285166769048L;
+    @Column(name = "LOCATION_CODE")
+    @ApiParam("库位代码")
+    private String locationCode;
+
+    @Column(name = "LOCATION_NAME")
+    @ApiParam("库位名称")
+    private String locationName;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name = "QTY")
+    @ApiParam("数量")
+    private Double qty = 0d;
+
+    @Column(name = "MAX_QTY")
+    @ApiParam("最大存储量")
+    private Integer maxQty = 0;
+
+    @Transient
+    @ApiParam("物料名称")
+    private String partNameRdd;
+}

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

@@ -132,6 +132,14 @@ public class MesPackage extends BaseBean implements Serializable {
     @ApiParam("包装二维码")
     private String qrCode;
 
+    @Column(name = "LOCATION_CODE")
+    @ApiParam("库位代码")
+    private String locationCode;
+
+    @Transient
+    @ApiParam("目标库位代码")
+    private String destLocationCode;
+
     public MesPackage() {
     }
 

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

@@ -37,4 +37,12 @@ public class MesProdCfgType extends BaseBean implements Serializable {
     @Column(name = "PROD_CFG_TYPE_NAME")
     @ApiParam("项目名称")
     private String prodCfgTypeName;
+
+    @Column(name = "PCT_VERSION")
+    @ApiParam("项目版本")
+    private String pctVersion;
+
+    @Column(name = "DWG_VERSION")
+    @ApiParam("图纸版本")
+    private String dwgVersion;
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.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;
 import java.io.Serializable;
 
 /**
@@ -61,4 +62,8 @@ public class MesQueueOrderBom extends BaseBean  implements Serializable {
     @Column(name = "OPTION_TYPE")
     @ApiParam("选配类型")
     private Integer optionType;
+
+    @Transient
+    @ApiParam("物料类型3")
+    private String categoryCode3;
 }

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

@@ -184,6 +184,10 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
     @ApiParam("队列类型")
     private Integer queueType;
 
+    @Transient
+    @ApiParam("等级名称")
+    private String gradeName;
+
     public double getQueueSeqVal() {
         return this.queueSeq == null ? 0.0d : this.queueSeq;
     }

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

@@ -51,6 +51,10 @@ public class MesStep extends BaseBean implements Serializable {
     @ApiParam("工步对象")
     private String stepObject;
 
+    @Column(name = "TRIGGER_TYPE")
+    @ApiParam("触发类型")
+    private Integer triggerType;
+
     /**
      * 工位扫描业务所需使用字段
      */

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

@@ -94,6 +94,9 @@ public class QueueOrderModel implements Serializable {
     @ApiParam("项目代码")
     private String prodCfgTypeCode;
 
+    @ApiParam("配方内容")
+    private String formulaContent;
+
     public QueueOrderModel() {
     }
 
@@ -227,7 +230,7 @@ public class QueueOrderModel implements Serializable {
     //getWaitQueueOrderModelNoSnMgn
     public QueueOrderModel(String serialNumber, String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
                            String partNo, String partNameRdd, String workType, Double finsihQty, Double qty, String pptCode, String produceCategoryCode, String prodCfgTypeCode,
-                           String vinCode) {
+                           String vinCode, String formulaContent, String queueGroupNo) {
         this.serialNumber = serialNumber;
         this.id = id;
         this.queueSeq = queueSeq;
@@ -245,11 +248,13 @@ public class QueueOrderModel implements Serializable {
         this.produceCategoryCode = produceCategoryCode;
         this.prodCfgTypeCode = prodCfgTypeCode;
         this.vinCode = vinCode;
+        this.formulaContent = formulaContent;
+        this.queueGroupNo = queueGroupNo;
     }
 
     //getAlreadyQueueOrderModelNoSnMgn
     public QueueOrderModel(String serialNumber, String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
-                           String partNo, String partNameRdd, String workType, String prodCfgTypeCode, String vinCode) {
+                           String partNo, String partNameRdd, String workType, String prodCfgTypeCode, String vinCode, String formulaContent, String queueGroupNo) {
         this.id = id;
         this.queueSeq = queueSeq;
         this.queDetailSeq = queDetailSeq;
@@ -263,6 +268,8 @@ public class QueueOrderModel implements Serializable {
         this.serialNumber = serialNumber;
         this.prodCfgTypeCode = prodCfgTypeCode;
         this.vinCode = vinCode;
+        this.formulaContent = formulaContent;
+        this.queueGroupNo = queueGroupNo;
     }
 
     //getAlreadyQueueOrderModelNoSn

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

@@ -82,11 +82,15 @@ public class StepModel implements Serializable {
     @ApiParam("工作单元代码")
     private String workCellCode;
 
+    @ApiParam("触发类型")
+    private Integer triggerType;
+
     public StepModel() {
     }
 
     public StepModel(String stepCode, String stepName, String stepText, String stepType, String stepObject,
-                     String routeCode, String processCode, Integer stepSeq, String paramCode, String stepDisplayName, String workCellCode) {
+                     String routeCode, String processCode, Integer stepSeq, String paramCode, String stepDisplayName,
+                     String workCellCode, Integer triggerType) {
         this.stepCode = stepCode;
         this.stepName = stepName;
         this.stepText = stepText;
@@ -98,5 +102,6 @@ public class StepModel implements Serializable {
         this.paramCode = paramCode;
         this.stepDisplayName = stepDisplayName;
         this.workCellCode = workCellCode;
+        this.triggerType = triggerType;
     }
 }

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

@@ -108,4 +108,21 @@ public class StepPrintSnModel extends MesProduceSn {
     @ApiParam("产品配置名称")
     private String prodCfgCodeName;
 
+    @ApiParam("项目代码")
+    private String prodCfgTypeCode;
+    @ApiParam("产品位置")
+    private String produceCategoryCode;
+    @ApiParam("结果")
+    private String result;
+    @ApiParam("项目版本")
+    private String pctVersion;
+    @ApiParam("图纸版本")
+    private String dwgVersion;
+    @ApiParam("班次名称")
+    private String shiftName;
+    @ApiParam("JIT排序号")
+    private String jitSeq;
+    @ApiParam("产品位置名称")
+    private String produceCategoryName;
+
 }

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

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.IfProductOffLine;
+import cn.estsh.i3plus.pojo.mes.bean.MesLocation;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\11\18 10:32
+ * @Modify:
+ **/
+public interface MesLocationRepository extends BaseRepository<MesLocation, Long> {
+}

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

@@ -221,6 +221,7 @@ public class MesPcnHqlPack {
                     mesWorkOrder.getCreateDateTimeEnd(),
                     "createDatetime", packBean, true);
         }
+        DdlPreparedPack.getStringEqualPack(mesWorkOrder.getAreaCode(), "areaCode", packBean);
         return packBean;
     }
 

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

@@ -90,9 +90,9 @@ public class WmsMoveMaster extends BaseBean {
     private String partNo;
 
     @Transient
-    @ApiParam("状态")
+    @ApiParam("明细状态")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class, refForeignKey = "value", value = "description")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class)
-    private Integer itemStatus;
+    private String itemStatus;
 
     @Transient
     @ApiParam("erp库存地")
@@ -135,10 +135,14 @@ public class WmsMoveMaster extends BaseBean {
     private String srcZoneNo;
 
     @Transient
-    @ApiParam("处理数量")
+    @ApiParam("需求数量")
     private Double transQty;
 
     @Transient
+    @ApiParam("处理数量")
+    private Double handledQty;
+
+    @Transient
     @ApiParam("不合格处理数量")
     private Double rejectQty;
 
@@ -197,7 +201,7 @@ public class WmsMoveMaster extends BaseBean {
         this.errorMessage = errorMessage;
         this.busiTypeCode = busiTypeCode;
         this.partNo = partNo;
-        this.itemStatus = itemStatus;
+        this.itemStatus = itemStatus.toString();
         this.refOrderNo = refOrderNo;
         this.carNo = carNo;
         this.refSrc = refSrc;
@@ -220,7 +224,7 @@ public class WmsMoveMaster extends BaseBean {
         this.partNameRdd = partNameRdd;
         this.transTypeCode = transTypeCode;
         this.transTypeName = transTypeName;
-        this.itemStatus = itemStatus;
+        this.itemStatus = itemStatus.toString();
         this.unit = unit;
         this.srcWhNo = srcWhNo;
         this.srcZoneNo = srcZoneNo;
@@ -237,22 +241,25 @@ public class WmsMoveMaster extends BaseBean {
         this.modifyDatetime = modifyDatetime;
     }
 
-    public WmsMoveMaster(String orderNo, String organizeCode, String partNo, String partNameRdd, String transTypeCode, String transTypeName, Integer itemStatus,
+    public WmsMoveMaster(String orderNo, String organizeCode, String partNo, String partNameRdd, String transTypeCode,
-                         String unit, String srcWhNo, String srcZoneNo, String destWhNo, String destZoneNo, Double transQty, Double rejectQty, String fixId, Integer busiTypeCode,
+                         String transTypeName, Integer itemStatus,String unit, String srcWhNo, String srcZoneNo,
-                         String createDatetime, String createUser, String modifyUser, String modifyDatetime, String refSrc) {
+                         String destWhNo, String destZoneNo, Double transQty,Double handledQty,Double rejectQty,
+                         String fixId, Integer busiTypeCode,String createDatetime, String createUser, String modifyUser,
+                         String modifyDatetime, String refSrc) {
         this.orderNo = orderNo;
         this.organizeCode = organizeCode;
         this.partNo = partNo;
         this.partNameRdd = partNameRdd;
         this.transTypeCode = transTypeCode;
         this.transTypeName = transTypeName;
-        this.itemStatus = itemStatus;
+        this.itemStatus = itemStatus.toString();
         this.unit = unit;
         this.srcWhNo = srcWhNo;
         this.srcZoneNo = srcZoneNo;
         this.destWhNo = destWhNo;
         this.destZoneNo = destZoneNo;
         this.transQty = transQty;
+        this.handledQty = handledQty;
         this.rejectQty = rejectQty;
         this.fixId = fixId;
         this.busiTypeCode = busiTypeCode;
@@ -272,7 +279,7 @@ public class WmsMoveMaster extends BaseBean {
         this.partNameRdd = partNameRdd;
         this.transTypeCode = transTypeCode;
         this.transTypeName = transTypeName;
-        this.itemStatus = itemStatus;
+        this.itemStatus = itemStatus.toString();
         this.unit = unit;
         this.srcWhNo = srcWhNo;
         this.srcZoneNo = srcZoneNo;