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

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

@@ -0,0 +1,59 @@
+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.ColumnDefault;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @Description :锁定记录
+ * @Reference :
+ * @Author : dominic
+ * @CreateDate : 2021-06-10
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "MES_LOCK_RECORD")
+@Api("mes锁定记录表")
+public class MesLockRecord extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 5132229443235106976L;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("产线代码")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工位代码")
+    private String workCellCode;
+
+    @Column(name = "PROCESS_CODE")
+    @ApiParam("工序代码")
+    private String processCode;
+
+    @Column(name = "LOCK_REASON")
+    @ApiParam("锁定原因")
+    private String lockReason;
+
+    @Column(name = "EMPLOYEE_NUMBER")
+    @ApiParam("工号")
+    private String employeeNumber;
+
+    @Column(name = "LOCK_STATUS")
+    @ColumnDefault("1")
+    @ApiParam("锁定状态")
+    private Integer lockStatus = 1;
+}

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

@@ -29,15 +29,12 @@ public class CosmaDefectModel {
     @ApiParam("过程条码")
     private String serialNumber;
 
-    @ApiParam("缺陷代码集合")
+    @ApiParam("缺陷代码")
-    private List<String> defectCodeList;
+    private String defectCode;
 
     @ApiParam("缺陷位置")
     private String location;
 
     @ApiParam("操作人")
     private String userName;
-
-    @ApiParam("报废原因")
-    private String scrapCode;
 }

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

@@ -8,6 +8,7 @@ import java.io.Serializable;
 
 /**
  * 产品履历报表-产品信息
+ *
  * @author yumingxing
  * @version 1.0
  * @date 2020/12/18 15:16
@@ -33,6 +34,9 @@ public class ProductSnModel implements Serializable {
     @ApiParam("CMS标签号")
     private String qrCode;
 
+    @ApiParam("料架号")
+    private String ctNo;
+
     @ApiParam("产线")
     private String workCenterName;
 
@@ -55,10 +59,8 @@ public class ProductSnModel implements Serializable {
     private String qcStatusName;
 
 
-
+    public ProductSnModel(String packageNo, String customerPartNo, String serialNumber, String partNo,
-
+                          String qrCode, String ctNo, String workCenterName, String processName,
-    public ProductSnModel(String packageNo,String customerPartNo, String serialNumber, String partNo,
-                          String qrCode, String workCenterName, String processName,
                           String workCellName, String createDatetime,
                           String createUser, Integer qcStatus) {
         this.packageNo = packageNo;
@@ -66,6 +68,7 @@ public class ProductSnModel implements Serializable {
         this.serialNumber = serialNumber;
         this.partNo = partNo;
         this.qrCode = qrCode;
+        this.ctNo = ctNo;
         this.workCenterName = workCenterName;
         this.processName = processName;
         this.workCellName = workCellName;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLockRecordRepository.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.MesLockRecord;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : dominic
+ * @CreateDate : 2021/6/10 19:36
+ * @Modify:
+ **/
+@Repository
+public interface MesLockRecordRepository extends BaseRepository<MesLockRecord, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -236,7 +236,7 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", packBean);
         DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getCostCenter(), "costCenter", packBean);
         DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getThirdRemake(), "thirdRemake", packBean);
-        DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getVendorNo(), "vendorNo", packBean);
+        DdlPreparedPack.getStringEqualPack(wmsDocMovementMaster.getVendorNo(), "vendorNo", packBean);
 
         getStringBuilderPack(wmsDocMovementMaster, packBean);
 
@@ -484,6 +484,7 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringLikerPack(basVendor.getVendorDesc(), "vendorDesc", result);
         DdlPreparedPack.getStringLikerPack(basVendor.getVendorAddr(), "vendorAddr", result);
         DdlPreparedPack.getStringLikerPack(basVendor.getVendorEmail(), "vendorEmail", result);
+        DdlPreparedPack.getStringLikerPack(basVendor.getUserName(), "userName", result);
         DdlPreparedPack.getNumEqualPack(basVendor.getIsAsn(), "isAsn", result);
         DdlPreparedPack.getNumEqualPack(basVendor.getVendorType(), "vendorType", result);