备件消耗替代增加查询字段

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

@@ -145,9 +145,9 @@ public class MesQueueJitActual extends BaseBean implements Serializable {
     @ApiParam("通知标识")
     private Integer noticeSign = 10;
 
-    @Column(name = "REPLACE_VIN_CODE")
+    @Column(name = "RELATION_VIN_CODE")
     @ApiParam("替换vin")
-    private String replaceVinCode;
+    private String relationVinCode;
 
     @Transient
     @ApiParam("创建时间")

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

@@ -121,5 +121,5 @@ public class MesQueueJitPlan extends BaseBean implements Serializable {
 
     @Transient
     @ApiParam("替换vin")
-    private String replaceVinCode;
+    private String relationVinCode;
 }

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

@@ -356,14 +356,14 @@ public class QueueOrderModel implements Serializable {
     }
 
     // getQueueOrderBySerialNumber
-    public QueueOrderModel(Long id, String orderNo, String queueGroupNo, String jitLotNo, String vinCode, String organizeCode, String produceCategoryCode, String workType,
+    public QueueOrderModel(Long id, String orderNo, String queueGroupNo, String jitLotNo, String vinCode, String jisActualNo, String produceCategoryCode, String workType,
                            String partNo, String prodCfgTypeCode) {
         this.id = id;
         this.orderNo = orderNo;
         this.queueGroupNo = queueGroupNo;
         this.jitLotNo = jitLotNo;
         this.vinCode = vinCode;
-        this.organizeCode = organizeCode;
+        this.jisActualNo = jisActualNo;
         this.produceCategoryCode = produceCategoryCode;
         this.workType = workType;
         this.partNo = partNo;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsImportModel.java

@@ -53,7 +53,7 @@ public class SparePartsImportModel {
     private String custPartNo;
 
     @ApiParam("替换VIN")
-    private String replaceVinCode;
+    private String relationVinCode;
 
     @ApiParam("用量")
     private Integer qty;

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

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

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

@@ -2489,8 +2489,8 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(queueJitActual.getProdCfgCode())) {
             DdlPreparedPack.getStringLikerPack(queueJitActual.getProdCfgCode(), "prodCfgCode", packBean);
         }
-        if (!StringUtils.isEmpty(queueJitActual.getReplaceVinCode())) {
-            DdlPreparedPack.getStringLikerPack(queueJitActual.getReplaceVinCode(), "replaceVinCode", packBean);
+        if (!StringUtils.isEmpty(queueJitActual.getRelationVinCode())) {
+            DdlPreparedPack.getStringLikerPack(queueJitActual.getRelationVinCode(), "replaceVinCode", packBean);
         }
         if (queueJitActual.getStatus() != null) {
             DdlPreparedPack.getNumEqualPack(queueJitActual.getStatus(), "status", packBean);