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

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

@@ -169,12 +169,13 @@ public class IfProductOffLine extends BaseBean implements Serializable {
         this.qcStatus = qcStatus;
     }
 
-    public IfProductOffLine(String workCenterCode, String partNo, String partName, String packageNo, Double qty, String createDatetime) {
+    public IfProductOffLine(String workCenterCode, String partNo, String partName, String packageNo, Double qty, String createDatetime, String workOrderNo) {
         this.workCenterCode = workCenterCode;
         this.partNo = partNo;
         this.partName = partName;
         this.packageNo = packageNo;
         this.qty = qty;
         this.createDatetime = createDatetime;
+        this.workOrderNo = workOrderNo;
     }
 }

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

@@ -132,6 +132,10 @@ public class MesQueueOrder extends BaseBean implements Serializable {
     @ApiParam("工作中心")
     private String workCenterCode;
 
+    @Column(name = "GROUP_NO")
+    @ApiParam("分组号")
+    private String groupNo;
+
     @Transient
     @ApiParam("起始车号")
     private String custFlagNoStart;

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

@@ -27,7 +27,7 @@ import java.io.Serializable;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_WORK_CELL_MODULE")
-@Api("作业程序组件参数")
+@Api("工作单元组件配置")
 public class MesWorkCellModule extends BaseBean implements Serializable {
     private static final long serialVersionUID = -3537487776977917751L;
 

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

@@ -28,6 +28,7 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_WORK_ORDER", indexes = {
         @Index(columnList = "ORDER_NO"),
+        @Index(columnList = "AREA_CODE"),
         @Index(columnList = "WORK_CENTER_CODE"),
         @Index(columnList = "WO_STATUS")
 }, uniqueConstraints = {

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

@@ -43,6 +43,9 @@ public class TJMgnBoardModel extends BaseBean implements Serializable {
     @ApiParam("不合格数量")
     private Double noQuQty;
 
+    @ApiParam("待定数量")
+    private Double determindQty;
+
     @ApiParam("一次合格率")
     private String firstPassRate;
 

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

@@ -79,6 +79,9 @@ public class MgnBjBoardModel implements Serializable {
     @ApiParam("工位名称")
     private String workCellName;
 
+    @ApiParam("工位描述")
+    private String workCellDesc;
+
     @ApiParam("x坐标内容")
     private List<String> xAxisList;
 

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

@@ -9,7 +9,7 @@ import java.io.Serializable;
 import java.util.List;
 
 /**
- * @Description : Wms实体字段Model信息
+ * @Description : mes实体字段Model信息
  * @Reference :
  * @Author : siliter.yuan
  * @CreateDate : 2020-04-24 09:53

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java

@@ -25,9 +25,16 @@ public class WmsStockFifoModel {
     @ApiParam(value = "物料集合")
     List<String> partNos;
 
+    @ApiParam(value = "物料")
+    String partNo;
+
     @ApiParam(value = "存储区集合")
     List<String> zoneNos;
 
+    @ApiParam(value = "存储区")
+    String zoneNo;
+
+
     @ApiParam(value = "物料对应的存储区")
     Map<String, String> partToZoneMap;
 

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;
     }
 
+
     /**
      * 移库单订单条码表 分页查询
      *