Merge remote-tracking branch 'origin/dev' into dev

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

@@ -144,6 +144,10 @@ public class MesProduceSn extends BaseBean implements Serializable {
     @ApiParam("客户标签模板")
     private String custLabelTemplate;
 
+    @Column(name = "LOT_NO")
+    @ApiParam("生产批次")
+    private String lotNo;
+
 //    @Version
 //    @Column(name = "LOCK_VERSION")
 //    @ApiParam(value = "乐观锁", example = "1")

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

@@ -138,6 +138,14 @@ public class MesStationBom extends BaseBean implements Serializable {
     @ApiParam("产品类型名称")
     private String produceCategoryName;
 
+    @Transient
+    @ApiParam("字符长度")
+    private Integer length;
+
+    @Transient
+    @ApiParam("校验内容")
+    private String checkContent;
+
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;
     }

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

@@ -4,6 +4,8 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * @Description : 涂装工单条码-展示组件(产品包装)model
  * @Reference :
@@ -13,35 +15,47 @@ import lombok.Data;
  **/
 @Data
 @Api("产品包装model")
-public class ProdPackModel {
+public class ProdPackModel implements Serializable {
 
     // 产品条码表--产品条码
     @ApiParam("产品条码")
-    private String productSn;
+    public String productSn;
 
     // 包装主表--包装编号
     @ApiParam("一检箱条码")
-    private String packageNo;
+    public String packageNo;
 
     // 包装明细表--创建时间
     @ApiParam("一检校验时间")
-    private String createDatetime;
+    public String createDatetime;
 
     // 包装主表--打印状态(10：未打印 20：已打印)
     @ApiParam("箱条码状态")
-    private Integer printStatus;
+    public Integer printStatus;
 
     // 涂装客户标签打印
     @ApiParam("客户标签")
-    private String custSn;
+    public String custSn;
 
     // 涂装客户标签打印
     @ApiParam("当前工序")
-    private String processCode;
+    public String processCode;
 
     // 涂装客户标签打印
     @ApiParam("更新时间")
-    private String modifyDateTime;
+    public String modifyDateTime;
+
+    @ApiParam("工单号")
+    public String workOrderNo;
+
+    @ApiParam("组织代码")
+    public String organizeCode;
+
+    @ApiParam("物料号")
+    public String parentPartNo;
+
+    public ProdPackModel() {
+    }
 
     public ProdPackModel(String productSn, String packageNo, String createDatetime, Integer printStatus) {
         this.productSn = productSn;

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

@@ -357,6 +357,10 @@ public class MesPcnHqlPack {
             DdlPreparedPack.getNumEqualPack(mesProduceSn.getSnStatus(), "snStatus", packBean);
         }
 
+        if (!StringUtils.isEmpty(mesProduceSn.getWorkOrderNo())) {
+            DdlPreparedPack.getNumEqualPack(mesProduceSn.getWorkOrderNo(), "workOrderNo", packBean);
+        }
+
         // 时间段查询
         if (!StringUtils.isEmpty(mesProduceSn.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesProduceSn.getCreateDateTimeEnd())) {
             DdlPreparedPack.timeBuilder(
@@ -636,7 +640,9 @@ public class MesPcnHqlPack {
         if (!StringUtils.isEmpty(mesWorkOrder.getWorkOrderStatus())) {
             DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderStatus(), "workOrderStatus", packBean);
         }
-        DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderType(), "workOrderType", packBean);
+        if (!StringUtils.isEmpty(mesWorkOrder.getWorkOrderType() + "") && mesWorkOrder.getWorkOrderTypeVal() != 0) {
+            DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderType(), "workOrderType", packBean);
+        }
         // 时间段查询
         if (!StringUtils.isEmpty(mesWorkOrder.getStartTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getStartTimeEnd())) {
             DdlPreparedPack.timeBuilder(