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/MesBoardShift.java

@@ -41,4 +41,8 @@ public class MesBoardShift extends BaseBean implements Serializable {
     @Column(name = "SHIFT_NAME")
     @ApiParam("班次名称")
     private String shiftName;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("产线代码")
+    private String workCenterCode;
 }

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

@@ -217,7 +217,7 @@ public class MesQueueOrder extends BaseBean implements Serializable {
     public MesQueueOrder(Long id, Double seq, String partNo, String partNameRdd,Integer boxQty,
                                Integer queueType,Integer status,String createUser,
                          String createDatetime,String modifyUser,String modifyDatetime,String workType,String orderNo,
-                         String workCenterCode, String workCellCode, Double qty, Double finsihQty) {
+                         String workCenterCode, String workCellCode, Double qty, Double finsihQty, String groupNo) {
         this.id = id;
         this.seq = seq;
         this.partNo = partNo;
@@ -235,6 +235,7 @@ public class MesQueueOrder extends BaseBean implements Serializable {
         this.workCellCode = workCellCode;
         this.qty = qty;
         this.finsihQty = finsihQty;
+        this.groupNo = groupNo;
     }
 
 }

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

@@ -92,6 +92,10 @@ public class MesStationBom extends BaseBean implements Serializable {
     private Double feedWarningQty;
 
     @Transient
+    @ApiParam("标准包规数量")
+    private Double partSpecQty = 0d;
+
+    @Transient
     @ApiParam("是否已绑定")
     private Boolean isBind;
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java

@@ -18,13 +18,13 @@ public class MgnBjBoardModel implements Serializable {
 
     private Integer qty;
     @ApiParam("jsa数量")
-    private Integer jsaQty;
+    private Integer jsaQty = 0;
     @ApiParam("jsa数量")
     private Integer jsaRate;
     @ApiParam("完成数量")
     private Integer completeQty = 0;
     @ApiParam("完成率")
-    private Integer completeRate;
+    private Integer completeRate = 0;
     @ApiParam("总数量")
     private Integer totalQty = 0;
     @ApiParam("预警数量")

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/SparePartStockModel.java

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.mes.model.mgn.bj;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/11/29 5:40 PM
+ * @Modify:
+ */
+@Data
+public class SparePartStockModel {
+
+    private Integer maxQty;
+
+    private Integer minQty;
+}

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

@@ -154,6 +154,14 @@ public class WmsPOMasterDetails extends BaseBean {
     @ApiParam("备注")
     private String remark;
 
+    @Column(name = "REMARK1")
+    @ApiParam("备注1")
+    private String remark1;
+
+    @Column(name = "REMARK2")
+    @ApiParam("备注2")
+    private String remark2;
+
     @Transient
     @ApiParam(value = "散件收货输入数量", example = "0")
     private Double inputRcQty;

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

@@ -179,6 +179,13 @@ public class WmsPoSn extends BaseBean {
     @ApiParam("物料库位")
     private String partLocateNo;
 
+    @Transient
+    @ApiParam("备注1")
+    private String remark1;
+
+    @Transient
+    @ApiParam("备注2")
+    private String remark2;
 
     public WmsPoSn(){}
 

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

@@ -2030,8 +2030,9 @@ public class WmsHqlPack {
         DdlPackBean result = new DdlPackBean();
         DdlPreparedPack.getStringEqualPack(wmsDocMovementSn.getOrderNo(), "orderNo", result);
         DdlPreparedPack.getStringEqualPack(wmsDocMovementSn.getPartNo(), "partNo", result);
-        DdlPreparedPack.getStringEqualPack(wmsDocMovementSn.getSrcLocateNo(), "srcLocateNo", result);
-        DdlPreparedPack.getStringEqualPack(wmsDocMovementSn.getDestLocateNo(), "destLocateNo", result);
+        if (!StringUtil.isEmpty(wmsDocMovementSn.getItem())) {
+            DdlPreparedPack.getStringEqualPack(wmsDocMovementSn.getItem(), "item", result);
+        }
         DdlPreparedPack.getNumEqualPack(wmsDocMovementSn.getSnType(), "snType", result);
 
         getStringBuilderPack(wmsDocMovementSn, result);
@@ -2039,6 +2040,7 @@ public class WmsHqlPack {
         return result;
     }
 
+
     /**
      * 移库单订单条码表 分页查询
      *