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

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

@@ -0,0 +1,54 @@
+package cn.estsh.i3plus.pojo.andon.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 : siliter
+ * @CreateDate : 2019-03-07 09:58
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="ANDON_PLC_COLOR_CFG")
+@Api(value="PLC三色灯控制")
+public class AndonPlcColorCfg extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -3284234821448131212L;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元")
+    private String workCellCode;
+
+    @Column(name="RED_PLC_CODE")
+    @ApiParam(value ="红灯PLC代码")
+    private String redPlcCode;
+
+    @Column(name="YELLOW_PLC_CODE")
+    @ApiParam(value ="黄灯PLC代码")
+    private String yellowPlcCode;
+
+    @Column(name="GREEN_PLC_CODE")
+    @ApiParam(value ="绿灯PLC代码")
+    private String greenPlcCode;
+
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonPlcColorCfgRepository.java

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonActionModule;
+import cn.estsh.i3plus.pojo.andon.bean.AndonPlcColorCfg;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-05-13 11:07
+ * @Modify:
+ **/
+@Repository
+public interface IAndonPlcColorCfgRepository extends BaseRepository<AndonPlcColorCfg, Long> {
+}

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

@@ -57,7 +57,7 @@ public class MesDbCheckRecord extends BaseBean implements Serializable {
 
     @Column(name = "PRODUCT_DATA_ID")
     @ApiParam("生产记录表主键ID")
-    private String productDataId;
+    private Long productDataId;
 
     //是否停线：1=是，2=否
     @Column(name = "IS_STOP_LINE")

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

@@ -155,4 +155,8 @@ public class MesPart extends BaseBean implements Serializable {
     @Transient
     @ApiParam("拉动数量")
     private Double pullQty;
+
+    @Transient
+    @ApiParam("BOM用量")
+    private Double bomQty = 0d;
 }

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

@@ -100,4 +100,8 @@ public class MesRepairRecord extends BaseBean implements Serializable {
     @Transient
     @ApiParam("缺陷集合")
     private List<MesDefect> mesDefectList;
+
+    @Transient
+    @ApiParam("质量状态")
+    private Integer qcStatus;
 }

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

@@ -0,0 +1,35 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @CreateDate: 2020/9/24
+ * @Author: simon.song
+ */
+@Data
+public class MesDbCheckRecordModel {
+    @ApiParam("过程条码")
+    private String serialNumber;
+
+    @ApiParam("物料号")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partDesc;
+
+    @ApiParam("异常取值字段")
+    private String errorFiledCode;
+
+    @ApiParam("异常描述")
+    private String errorDesc;
+
+    public MesDbCheckRecordModel(String serialNumber, String partNo, String partDesc, String errorFiledCode, String errorDesc) {
+        this.serialNumber = serialNumber;
+        this.partNo = partNo;
+        this.partDesc = partDesc;
+        this.errorFiledCode = errorFiledCode;
+        this.errorDesc = errorDesc;
+    }
+}

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

@@ -353,7 +353,7 @@ public class MesPcnHqlPack {
             DdlPreparedPack.getStringLikerPack(dbCheckRecord.getErrorFiledCode(), "errorFiledCode", packBean);
         }
         if (!StringUtils.isEmpty(dbCheckRecord.getProductDataId())) {
-            DdlPreparedPack.getStringLikerPack(dbCheckRecord.getProductDataId(), "productDataId", packBean);
+            DdlPreparedPack.getNumberBiggerEqualPack(dbCheckRecord.getProductDataId(), "productDataId", packBean);
         }
         if (!StringUtils.isEmpty(dbCheckRecord.getIsStopLine())) {
             DdlPreparedPack.getNumberBiggerEqualPack(dbCheckRecord.getIsStopLine(), "isStopLine", packBean);

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java

@@ -173,4 +173,8 @@ public class WmsInterfaceDataMapper extends BaseBean {
     @ColumnDefault("10")
     @AnnoOutputColumn(refClass = WmsEnumUtil.SOFT_DATA_FORM.class, refForeignKey = "value", value = "description", required = false)
     public Integer softDataType;
+
+    @ApiParam("接口名称")
+    @Column(name = "INTERFACE_NAME")
+    public String interfaceName;
 }

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

@@ -2543,6 +2543,7 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringLikerPack(wmsInterfaceDataMapper.getDestBeanName(), "destBeanName", result);
         DdlPreparedPack.getStringLikerPack(wmsInterfaceDataMapper.getBusiRoute(), "busiRoute", result);
         DdlPreparedPack.getStringLikerPack(wmsInterfaceDataMapper.getGroupName(), "groupName", result);
+        DdlPreparedPack.getStringLikerPack(wmsInterfaceDataMapper.getInterfaceName(), "interfaceName", result);
 
         getStringBuilderPack(wmsInterfaceDataMapper, result);