Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev

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

@@ -0,0 +1,55 @@
+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.*;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: Crish
+ * @CreateDate:2019-04-16-17:36
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "MES_CONTAINER_SN_RECORD", indexes = {
+        @Index(columnList = "SERIAL_NUMBER"),
+        @Index(columnList = "PART_NO"),
+        @Index(columnList = "CT_NO")
+})
+@Api("容器条码记录表")
+public class MesContainerSnRecord extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -303802118993255101L;
+    @Column(name = "SERIAL_NUMBER")
+    @ApiParam("过程条码")
+    private String serialNumber;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam("物料名称")
+    private String partName;
+
+    @Column(name = "CT_NO")
+    @ApiParam("容器号")
+    private String ctNo;
+
+    @Column(name = "QTY")
+    @ApiParam("数量")
+    private Double qty;
+}

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

@@ -0,0 +1,49 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.mes.model.ProductDataModel;
+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.*;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate:2019\10\9 0009
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "MES_PLC_DATA_RECORD", indexes = {
+        @Index(columnList = "PLC_CODE")
+})
+@Api("PLC数据记录表")
+public class MesPlcDataRecord extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -8789141495695469898L;
+    @Column(name = "PLC_CODE")
+    @ApiParam("PLC代码")
+    private String plcCode;
+
+    @Column(name = "PLC_NAME")
+    @ApiParam("PLC名称")
+    private String plcName;
+
+    @Column(name = "PLC_VLAUE")
+    @ApiParam("PLC型号")
+    private String plcValue;
+
+}

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

@@ -60,5 +60,5 @@ public class MesWorkCellDefect extends BaseBean implements Serializable {
 
     @Transient
     @ApiParam("缺陷名称")
-    private String defectCodeName;
+    private String defectName;
 }

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

@@ -393,6 +393,10 @@ public class MesWorkOrder extends BaseBean implements Serializable {
     @ApiParam("生产节拍")
     private Integer takt;
 
+    @Transient
+    @ApiParam("容器号")
+    private String ctNo;
+
     /**********************  动态冗余字段（界面维护大写） *********************************/
 
     @Transient

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

@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesContainerSnRecord;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2021/5/1 12:21 PM
+ * @Modify:
+ */
+public interface MesContainerSnRecordRepository extends BaseRepository<MesContainerSnRecord, Long> {
+}

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

@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesPlcDataRecord;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2021/5/2 4:11 PM
+ * @Modify:
+ */
+public interface MesPlcDataRecordRepository extends BaseRepository<MesPlcDataRecord, Long> {
+}

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

@@ -60,6 +60,10 @@ public class WmsPrintingQueue extends BaseBean{
     @ApiParam("供应商编码")
     private String vendorNo;
 
+    @Column(name="PART_NO")
+    @ApiParam("物料编码")
+    public String partNo;
+
     public WmsPrintingQueue() {
     }
 

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

@@ -237,6 +237,11 @@ public class WmsStockSn extends BaseBean {
 //    @ApiParam(value = "乐观锁", example = "1")
 //    public Integer lockVersion;
 
+    @ApiParam("托盘(容器)类型编号")
+    @Column(name = "CT_CODE")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String ctCode;
+
     @ApiParam(value = "仓库名称")
     @Transient
     public String whNameRdd;
@@ -955,4 +960,8 @@ public class WmsStockSn extends BaseBean {
         this.zoneNo = zoneNo;
         this.vendorNo = vendorNo;
     }
+    public WmsStockSn(String partNo, Double qty) {
+        this.partNo = partNo;
+        this.qty = qty;
+    }
 }

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

@@ -3222,6 +3222,9 @@ public class WmsHqlPack {
             DdlPreparedPack.getNumEqualPack(details.getIsRequire(), "isRequire", result);
         }
         getStringBuilderPack(details, result);
+        DdlPreparedPack.getOrderByPack(
+                new Object[]{CommonEnumUtil.ASC_OR_DESC.ASC.getValue()},
+                new String[]{"seq"}, result);
         return result;
     }
 
@@ -3271,7 +3274,11 @@ public class WmsHqlPack {
         //查询参数封装
         DdlPreparedPack.getStringLikerPack(wmsTestResultDetails.getBhCode(), "bhCode", result);
         DdlPreparedPack.getStringEqualPack(wmsTestResultDetails.getWorkCenterCode(), "workCenterCode", result);
-        DdlPreparedPack.getNumEqualPack(wmsTestResultDetails.getCheckTypeCode(), "checkTypeCode", result);
+        /**
+        * @Author : gsz 2021/04/09
+        * 15635 20027-调角器BH- BH检测结果管理-管理明细增加检测类型代码查询条件 - 20210430
+        **/
+        DdlPreparedPack.getStringEqualPack(wmsTestResultDetails.getCheckTypeCode(), "checkTypeCode", result);
         DdlPreparedPack.getStringEqualPack(wmsTestResultDetails.getPartNo(), "partNo", result);
         DdlPreparedPack.getStringEqualPack(wmsTestResultDetails.getQrCode(), "qrCode", result);
         if (StringUtils.isNotBlank(wmsTestResultDetails.getCreateDateTimeStart())) {