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

@@ -70,7 +70,7 @@ public class BiModel implements Serializable {
     private double unQualifiedRate = 0;
 
     @ApiParam("目标合格率")
-    private double targetPassRate;
+    private double targetPassRate = 0;
 
     @ApiParam("颜色标识")
     private Integer colorFlag = 0;
@@ -93,6 +93,9 @@ public class BiModel implements Serializable {
     @ApiParam("末检")
     private Integer endCheck;//首件、30中件、40末件
 
+    @ApiParam("质量状态")
+    private Integer qcStatus;
+
     private double qty;
 
     @ApiParam("比率")
@@ -116,4 +119,10 @@ public class BiModel implements Serializable {
         this.qty = qty;
         this.partNo = partNo;
     }
+
+    public BiModel(String workCellCode, String partNo, Integer qcStatus) {
+        this.workCellCode = workCellCode;
+        this.partNo = partNo;
+        this.qcStatus = qcStatus;
+    }
 }

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

@@ -3711,4 +3711,13 @@ public class MesHqlPack {
         return packBean;
     }
 
+    public static DdlPackBean getMesQueueOrderDetail(MesQueueOrderDetail queueOrderDetail) {
+        DdlPackBean packBean = getAllBaseData(queueOrderDetail.getOrganizeCode());
+        DdlPreparedPack.getStringLikerPack(queueOrderDetail.getSerialNumber(), "serialNumber", packBean);
+        DdlPreparedPack.getStringLikerPack(queueOrderDetail.getOrderNo(), "orderNo", packBean);
+        DdlPreparedPack.getStringLikerPack(queueOrderDetail.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getStringLikerPack(queueOrderDetail.getPartNameRdd(), "partNameRdd", packBean);
+        return packBean;
+    }
+
 }

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

@@ -42,4 +42,7 @@ public class WmsOperationBean<Obj> extends BaseBean {
 
     @ApiParam("选中的明细数据")
     public List<String> details;
+
+    @ApiParam("是否确认重置")
+    public int isConfirmReset;
 }