Merge branch 'test' of i3-IMPP/i3plus-pojo into ext-dev

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java

@@ -435,6 +435,35 @@ public class AndonManageQueue extends BaseManageQueue implements Serializable {
         this.andonCount = andonCount;
     }
 
+    /**
+     * 工位统计报表查询 构造函数
+     * @param workCenterCode
+     * @param workCenterNameRdd
+     * @param workCellCode
+     * @param workCellNameRdd
+     * @param equipmentCode
+     * @param equipmentNameRdd
+     * @param shiftCode
+     * @param shiftNameRdd
+     * @param alarmCode
+     * @param andonCount
+     */
+    public AndonManageQueue(String workCenterCode,String workCenterNameRdd, String workCellNameRdd,String workCellCode,
+                            String equipmentCode, String equipmentNameRdd, String shiftCode, String shiftNameRdd,
+                            String alarmCode, Long andonCount) {
+        this.workCenterCode = workCenterCode;
+        this.workCenterNameRdd = workCenterNameRdd;
+        this.workCellNameRdd = workCellNameRdd;
+        this.workCellCode = workCellCode;
+        this.equipmentCode = equipmentCode;
+        this.equipmentNameRdd = equipmentNameRdd;
+        this.shiftCode = shiftCode;
+        this.shiftNameRdd = shiftNameRdd;
+        this.alarmCode = alarmCode;
+        this.andonCount = andonCount;
+    }
+
+
     public static void main(String[] args) {
         try {
             List ds = new ArrayList();

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

@@ -9163,11 +9163,11 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum RC_BOARD_STATUS {
-        FINISH(10, "已完成(绿色)"),
-        OVER_TIME(20, "已超时（红色）"),
-        UNRECEIVED(30, "未收货（蓝色）"),
-        VARIANT(40, "有差异（黄色）"),
-        NORMAL(50, "正常（白色）");
+        FINISH(10, "已完成"),//绿色
+        OVER_TIME(20, "已超时"),//红色
+        UNRECEIVED(30, "未收货"),//蓝色
+        VARIANT(40, "有差异"),//黄色
+        NORMAL(50, "正常");//白色
 
         private int value;
         private String description;

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

@@ -5,16 +5,12 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.ColumnDefault;
 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.*;
 import java.io.Serializable;
 
 /**
@@ -62,4 +58,12 @@ public class MesCustomerPart extends BaseBean implements Serializable {
     @Column(name = "CUSTOMER_CFG_CODE")
     @ApiParam("客户配置代码")
     private String customerCfgCode;
+
+    @Column(name = "CUSTOMER_MARK")
+    @ApiParam("客户代号")
+    private String customerMark;
+
+    @Column(name = "CUSTOMER_LATCH")
+    @ApiParam("客户抬头")
+    private String customerLatch;
 }

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

@@ -119,6 +119,22 @@ public class MesDefectRecord extends BaseBean implements Serializable {
     @ApiParam("产品二维码")
     private String productSn;
 
+    @Transient
+    @ApiParam("措施代码")
+    private String repairCode;
+
+    @Transient
+    @ApiParam("措施描述")
+    private String repairName;
+
+    @Transient
+    @ApiParam("缺陷原因代码")
+    private String dcCode;
+
+    @Transient
+    @ApiParam("缺陷原因描述")
+    private String dcName;
+
     public int getRepairStatusVal() {
         return this.repairStatus == null ? 0 : this.repairStatus;
     }
@@ -149,4 +165,33 @@ public class MesDefectRecord extends BaseBean implements Serializable {
         this.modifyUser = modifyUser;
         this.modifyDatetime = modifyDatetime;
     }
+
+    public MesDefectRecord(Long id, String serialNumber, String workOrderNo, String partNo, String partName, String defectCode,
+                           String defectName, String defectLocation, String sideLocation, Integer repairStatus, String workCenterCode,
+                           String workCellCode, String memo, String defectActionType, Double qty, String repairCode, String repairName,
+                           String dcCode, String dcName, String createUser, String createDatetime, String modifyUser, String modifyDatetime) {
+        this.id = id;
+        this.serialNumber = serialNumber;
+        this.workOrderNo = workOrderNo;
+        this.partNo = partNo;
+        this.partName = partName;
+        this.defectCode = defectCode;
+        this.defectName = defectName;
+        this.defectLocation = defectLocation;
+        this.sideLocation = sideLocation;
+        this.repairStatus = repairStatus;
+        this.workCenterCode = workCenterCode;
+        this.workCellCode = workCellCode;
+        this.memo = memo;
+        this.defectActionType = defectActionType;
+        this.qty = qty;
+        this.repairCode = repairCode;
+        this.repairName = repairName;
+        this.dcCode = dcCode;
+        this.dcName = dcName;
+        this.createUser = createUser;
+        this.createDatetime = createDatetime;
+        this.modifyUser = modifyUser;
+        this.modifyDatetime = modifyDatetime;
+    }
 }

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

@@ -55,6 +55,10 @@ public class MesLoopQcGenerateDetail extends BaseBean implements Serializable {
     @ApiParam("末次时间")
     private String lastTime;
 
+    @Column(name = "SEQ")
+    @ApiParam("序号")
+    private Integer seq;
+
     @ApiParam(value = "物料号")
     @Transient
     private String partNo;

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

@@ -149,6 +149,10 @@ public class MesQcCheckStandard extends BaseBean implements Serializable {
     @ApiParam("备注")
     private String memo;
 
+    @Transient
+    @ApiParam("序号")
+    private Integer seq;
+
     public MesQcCheckStandard() {
     }
 

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

@@ -122,6 +122,10 @@ public class MesQcOrderDetail extends BaseBean implements Serializable {
     @ApiParam("检测值配置编号")
     private String checkCfgNo;
 
+    @Column(name = "SEQ")
+    @ApiParam("序号")
+    private Integer seq;
+
     @Transient
     @ApiParam("判定结果")
     private Integer checkResult = 0;

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

@@ -121,4 +121,8 @@ public class MesQualityStandard extends BaseBean implements Serializable {
     @ApiParam("检测值配置编号")
     private String checkCfgNo;
 
+    @Column(name = "SEQ")
+    @ApiParam("序号")
+    private Integer seq;
+
 }

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

@@ -97,7 +97,7 @@ public class MesRepairRecord extends BaseBean implements Serializable {
     @ApiParam("备注")
     private String spareMemo;
 
-    @Transient
+    @Column(name = "DEFECT_RECORD_ID")
     @ApiParam("不良记录id")
     private Long defectRecordId;
 

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

@@ -0,0 +1,36 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description: 业务队列model
+ * @Reference:
+ * @Author: wangjie
+ * @CreateDate: 2020-06-28-11:44
+ * @Modify:
+ **/
+@Data
+public class BusiQueueDispatchModel<T> {
+
+    @ApiParam("实现类")
+    private Object busDispatchervice;
+
+    @ApiParam("组织代码")
+    private String organizeCode;
+
+    @ApiParam("key")
+    private String key;
+
+    @ApiParam("数据")
+    private Object Obj;
+
+    @ApiParam("信息")
+    private String info;
+
+    @ApiParam("集合")
+    private List<T> list;
+
+}

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

@@ -130,4 +130,8 @@ public class MesControlPlanTemplateModel extends BaseBean {
     @AnnoOutputColumn
     private String checkCfgNo;
 
+    @ApiParam("序号")
+    @AnnoOutputColumn
+    private Integer seq;
+
 }

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

@@ -80,4 +80,7 @@ public class MesQualityStandardModel {
 
     @ApiParam("检测值配置编号")
     private String checkCfgNo;
+
+    @ApiParam("序号")
+    private Integer seq;
 }

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

@@ -19,7 +19,7 @@ public class DefectRecordModel implements Serializable {
     private static final long serialVersionUID = 4994719388513997046L;
 
     @ApiParam("产线")
-    private String workCenterCode;
+    private String workCenterName;
 
     @ApiParam("工序名称")
     private String processName;
@@ -52,8 +52,8 @@ public class DefectRecordModel implements Serializable {
     public String createDatetime;
 
 
-    public DefectRecordModel(String workCenterCode, String processName, Integer qcStatus, String defectName, String defectLocation, String customerPartNo, String serialNumber, String createUser, String createDatetime) {
-        this.workCenterCode = workCenterCode;
+    public DefectRecordModel(String workCenterName, String processName, Integer qcStatus, String defectName, String defectLocation, String customerPartNo, String serialNumber, String createUser, String createDatetime) {
+        this.workCenterName = workCenterName;
         this.processName = processName;
         this.qcStatus = qcStatus;
         this.defectName = defectName;

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

@@ -21,6 +21,9 @@ public class PackageTravelModel implements Serializable {
     private static final long serialVersionUID = -7031472442162953544L;
 
     @ApiParam("客户零件号")
+    private String packageNo;
+
+    @ApiParam("客户零件号")
     private String customerPartNo;
 
     @ApiParam("零件二维码")
@@ -33,7 +36,7 @@ public class PackageTravelModel implements Serializable {
     private String qrCode;
 
     @ApiParam("产线")
-    private String workCenterCode;
+    private String workCenterName;
 
     @ApiParam("工序名称")
     private String processName;
@@ -62,12 +65,13 @@ public class PackageTravelModel implements Serializable {
     @ApiParam("执行时间")
     private String createUser;
 
-    public PackageTravelModel(String customerPartNo, String serialNumber, String partNo, String qrCode, String workCenterCode, String processName, String ctCode, String ctNo, String modelNo, String fnLocationNo, String ctLocationNo, String createDatetime, String createUser) {
+    public PackageTravelModel(String packageNo,String customerPartNo, String serialNumber, String partNo, String qrCode, String workCenterName, String processName, String ctCode, String ctNo, String modelNo, String fnLocationNo, String ctLocationNo, String createDatetime, String createUser) {
+        this.packageNo = packageNo;
         this.customerPartNo = customerPartNo;
         this.serialNumber = serialNumber;
         this.partNo = partNo;
         this.qrCode = qrCode;
-        this.workCenterCode = workCenterCode;
+        this.workCenterName = workCenterName;
         this.processName = processName;
         this.ctCode = ctCode;
         this.ctNo = ctNo;

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

@@ -51,8 +51,11 @@ public class ProductDetailResult {
     @ApiParam(value = "修改日期")
     public String modifyDatetime;
 
+    @ApiParam(value = "生产线名称")
+    public String workCenterName;
 
-    public ProductDetailResult(String serialNumber, String partNo,String customerPartNo, String partNameRdd, String workCenterCode, String processCode, String processName, String qcStatus, String createUser, String createDatetime, String modifyUser, String modifyDatetime) {
+
+    public ProductDetailResult(String serialNumber, String partNo,String customerPartNo, String partNameRdd, String workCenterCode, String processCode, String processName, String qcStatus, String createUser, String createDatetime, String modifyUser, String modifyDatetime,String workCenterName) {
         this.serialNumber = serialNumber;
         this.partNo = partNo;
         this.customerPartNo = customerPartNo;
@@ -65,5 +68,6 @@ public class ProductDetailResult {
         this.createDatetime = createDatetime;
         this.modifyUser = modifyUser;
         this.modifyDatetime = modifyDatetime;
+        this.workCenterName = workCenterName;
     }
 }

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

@@ -43,8 +43,10 @@ public class ProductResult {
     private BigDecimal unqualifiedRate;
     @ApiParam("报废率")
     private BigDecimal scrapRate;
+    @ApiParam("生产线名称")
+    private String workCenterName;
 
-    public ProductResult(String workCellCode,String partNo, String customerPartNo,String partNameRdd, String workCenterCode, String processCode, String processName, long qualified, long unqualified, long scrap) {
+    public ProductResult(String workCellCode,String partNo, String customerPartNo,String partNameRdd, String workCenterCode, String processCode, String processName, long qualified, long unqualified, long scrap,String workCenterName) {
         this.workCellCode = workCellCode;
         this.partNo = partNo;
         this.customerPartNo = customerPartNo;
@@ -55,5 +57,6 @@ public class ProductResult {
         this.qualified = qualified;
         this.unqualified = unqualified;
         this.scrap = scrap;
+        this.workCenterName = workCenterName;
     }
 }

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

@@ -31,7 +31,7 @@ public class ProductSnConditionModel implements Serializable {
     private String prodCfgTypeCode;
 
     @ApiParam("产线")
-    private String workCenterCode;
+    private String workCenterName;
 
     @ApiParam("工序名称")
     private String processName;
@@ -48,12 +48,12 @@ public class ProductSnConditionModel implements Serializable {
     @ApiParam("质量状态Name")
     private String qcStatusName;
 
-    public ProductSnConditionModel(String serialNumber, String customerPartNo, String partNo, String prodCfgTypeCode, String workCenterCode, String processName, String workCellName, String createDatetime, Integer qcStatus) {
+    public ProductSnConditionModel(String serialNumber, String customerPartNo, String partNo, String prodCfgTypeCode, String workCenterName, String processName, String workCellName, String createDatetime, Integer qcStatus) {
         this.serialNumber = serialNumber;
         this.customerPartNo = customerPartNo;
         this.partNo = partNo;
         this.prodCfgTypeCode = prodCfgTypeCode;
-        this.workCenterCode = workCenterCode;
+        this.workCenterName = workCenterName;
         this.processName = processName;
         this.workCellName = workCellName;
         this.createDatetime = createDatetime;

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

@@ -16,7 +16,7 @@ import java.io.Serializable;
 @ApiModel("产品履历报表-产品信息")
 public class ProductSnModel implements Serializable {
 
-    private static final long serialVersionUID = 5217363746963291483L;
+    private static final long serialVersionUID = 7137684552464509466L;
 
 
     @ApiParam("客户零件号")
@@ -32,7 +32,7 @@ public class ProductSnModel implements Serializable {
     private String qrCode;
 
     @ApiParam("产线")
-    private String workCenterCode;
+    private String workCenterName;
 
     @ApiParam("工序名称")
     private String processName;
@@ -40,12 +40,12 @@ public class ProductSnModel implements Serializable {
     @ApiParam("工位名称")
     private String workCellName;
 
-    @ApiParam(value = "执行人")
-    public String createUser;
-
     @ApiParam(value = "扫码时间")
     public String createDatetime;
 
+    @ApiParam(value = "执行人")
+    public String createUser;
+
     @ApiParam("质量代码")
     private Integer qcStatus;
 
@@ -53,16 +53,16 @@ public class ProductSnModel implements Serializable {
     private String qcStatusName;
 
 
-    public ProductSnModel(String customerPartNo, String serialNumber, String partNo, String qrCode, String workCenterCode, String processName, String workCellName, String createUser, String createDatetime, Integer qcStatus) {
+    public ProductSnModel(String customerPartNo, String serialNumber, String partNo, String qrCode, String workCenterName, String processName, String workCellName, String createDatetime, String createUser, Integer qcStatus) {
         this.customerPartNo = customerPartNo;
         this.serialNumber = serialNumber;
         this.partNo = partNo;
         this.qrCode = qrCode;
-        this.workCenterCode = workCenterCode;
+        this.workCenterName = workCenterName;
         this.processName = processName;
         this.workCellName = workCellName;
-        this.createUser = createUser;
         this.createDatetime = createDatetime;
+        this.createUser = createUser;
         this.qcStatus = qcStatus;
     }
 }

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

@@ -2220,9 +2220,6 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(defectRecord.getWorkOrderNo())) {
             DdlPreparedPack.getStringEqualPack(defectRecord.getWorkOrderNo(), "workOrderNo", packBean);
         }
-        if (!StringUtils.isEmpty(defectRecord.getProductSn())) {
-            DdlPreparedPack.getStringEqualPack(defectRecord.getProductSn(), "productSn", packBean);
-        }
         if (!StringUtils.isEmpty(defectRecord.getRepairStatus())) {
             DdlPreparedPack.getNumEqualPack(defectRecord.getRepairStatus(), "repairStatus", packBean);
         }

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

@@ -9,14 +9,19 @@ import cn.estsh.i3plus.pojo.base.util.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 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.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import javax.persistence.Version;
 
 /**
  * @Description :移库单明细实体(用于转储类业务)
@@ -387,6 +392,12 @@ public class WmsDocMovementDetails extends BaseBean {
     @ApiParam(value = "目的库位名称")
     public String destLocateName;
 
+    @Transient
+    @ApiParam("报废类型")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.SCRAP_TYPE.class, refForeignKey = "value", value = "description")
+    public Integer scrapType;
+
+
 
     public String getRecommondLot() {
         return recommondLot == null ? "无" : this.recommondLot;
@@ -740,9 +751,9 @@ public WmsDocMovementDetails (String partNo,String orderNo) {
         this.destLocateName = locateName;
     }
 
-    public WmsDocMovementDetails(String organizeCode, String workOrderCode, String orderNo,Integer moveType, Integer busiType,
-                                 String item, String partNo, String partNameRdd,String unit, Double qty,
-                                 Integer isSn, Integer orderMasterStatus,String createUser, String createDatetime) {
+    public WmsDocMovementDetails(String organizeCode, String workOrderCode, String orderNo, Integer moveType, Integer busiType,
+                                 String item, String partNo, String partNameRdd, String unit, Double qty,
+                                 Integer isSn, Integer orderMasterStatus, String createUser, String createDatetime, String seqNo) {
         this.organizeCode = organizeCode;
         this.workOrderCode = workOrderCode;
         this.orderNo = orderNo;
@@ -757,5 +768,21 @@ public WmsDocMovementDetails (String partNo,String orderNo) {
         this.orderMasterStatus = orderMasterStatus;
         this.createUser = createUser;
         this.createDatetime = createDatetime;
+        this.seqNo = seqNo;
+    }
+
+    public WmsDocMovementDetails(String orderNo, String partNo, String custPartNo, String srcZoneNo, String destZoneNo, String destLocateNo, Double qty, Double pickQty, String createDatetime, Integer orderStatus, String createUser) {
+        this.orderNo = orderNo;
+        this.partNo = partNo;
+        this.custPartNo = custPartNo;
+        this.srcZoneNo = srcZoneNo;
+        this.destZoneNo = destZoneNo;
+        this.destLocateNo = destLocateNo;
+        this.qty = qty;
+        this.pickQty = pickQty;
+        this.createDatetime = createDatetime;
+        this.orderStatus = orderStatus;
+        this.createUser = createUser;
+
     }
 }