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/model/MgnBoardAreaYieldModel.java

@@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.mes.model;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class MgnBoardAreaYieldModel {
 
@@ -15,4 +17,13 @@ public class MgnBoardAreaYieldModel {
     @ApiParam("注塑")
     private MgnBoardListModel injectMoldBoardListModel;
 
+    @ApiParam("组装集合")
+    private List<MgnBoardListModel> assembleBoardListModelList;
+
+    @ApiParam("涂装集合")
+    private List<MgnBoardListModel> paintBoardListModelList;
+
+    @ApiParam("注塑集合")
+    private List<MgnBoardListModel> injectMoldBoardListModelList;
+
 }

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

@@ -38,10 +38,19 @@ public class MgnBoardListModel {
     @ApiParam("计划完成率")
     private String planCompleteRate;
 
-    @ApiParam("异常数量")
+    @ApiParam("呼叫异常数量")
     private Integer exceptQty;
 
+    @ApiParam("响应异常数量")
+    private Integer responseQty;
+
     @ApiParam("正常数量")
     private Integer normalQty;
 
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @ApiParam("车间")
+    private String areaCode;
+
 }

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

@@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import javax.persistence.Transient;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -65,4 +66,12 @@ public class TJMgnBoardModel extends BaseBean {
     @ApiParam("不良汇总列值")
     private List<Double> defectValueList;
 
+    @Transient
+    @ApiParam("开始工单")
+    private String workOrderNoStart;
+
+    @Transient
+    @ApiParam("结束工单")
+    private String workOrderNoEnd;
+
 }

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

@@ -10,7 +10,11 @@ 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.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description : 库存移动单条码信息
@@ -167,6 +171,11 @@ public class WmsMoveSnSnapshot extends SnapshotBean {
     @ApiParam("供应商编号")
     private String vendorNo;
 
+    @Column(name = "LEFT_CODE")
+    @ApiParam(value = "生产批次")
+    private String leftCode;
+
+
     @Transient
     @ApiParam("业务类型编码")
     @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description")

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

@@ -1373,6 +1373,7 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringLikerPack(wmsStockSn.getSn(), "sn", result);
         DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getCustSn(), "custSn", result);
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result);
+        DdlPreparedPack.getStringEqualPack(wmsStockSn.getLeftCode(), "leftCode", result);
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result);
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getPackageNo(), "packageNo", result);
         if (wmsStockSn.getCheckQyt() != null && wmsStockSn.getCheckQyt().intValue() == WmsEnumUtil.TRUE_OR_FALSE.TRUE.getValue()) {