条码规则数量改为20

src/main/java/com/neotel/smfcore/core/barcode/bean/BarcodeRule.java

@@ -841,9 +841,14 @@ public class BarcodeRule {
         rule="EXPDATEyyMMdd[12:0:-1]|BATCH[2:0:-1]|QTY[2:0:-1]|RI[2:0:-1]|PN[1:0:-1]|MPN[-1:0:2]";
         rule="EXPDATEyyMMdd[12:0:-1]|BATCH[2:0:-1]|QTY[2:0:-1]|RI[2:0:-1]|PN[1:0:-1]|MPN[-1:0:2]";
 //        rule="PN[1:0:-1]|BATCH[2:0:-1]|LOT[2:0:-1]|QTY[2_7Q:0:-1]|RI[1:0:-1]|SP[3:0:-1]|PRODATEyyyyMMdd[2:0:-1]|xxx";
 //        rule="PN[1:0:-1]|BATCH[2:0:-1]|LOT[2:0:-1]|QTY[2_7Q:0:-1]|RI[1:0:-1]|SP[3:0:-1]|PRODATEyyyyMMdd[2:0:-1]|xxx";
 
 
+        codeStr="P529-500089|1PPM8607B1-F3EI|1T2314003080|7Q33+EA|S10000000000263353|21PMICROCHIP|9D20220704|4LTW|7E4";
+        codeStr="P529-500089|1PPM8607B1-F3EI|1T2314003080|7Q33+EA|S10000000000263353|21PMICROCHIP|9D20220704|4LTW|7E4|1PPM8607B1-F3EI|1T2314003080|7Q33+EA|S10000000000263353|XXX|XXX|9D20220704|XXX|XXX|XXX|XXX|xxx##";
+        rule="PN[1:0:-1]|MPN[2:0:-1]|BATCH[2:0:-1]|QTY[2_7Q:0:-1]|RI[1:0:-1]|SP[3:0:-1]|PRODATEyyyyMMdd[2:0:-1]|xxx|MSL[1:0:-1]";
+
         BarcodeRule br = BarcodeRule.newRule(rule);
         BarcodeRule br = BarcodeRule.newRule(rule);
         Barcode b = br.toCodeBean(codeStr).getBarcode();
         Barcode b = br.toCodeBean(codeStr).getBarcode();
         if(b != null){
         if(b != null){
+            System.out.println(codeStr);
             System.out.println("PN:"+b.getPartNumber());
             System.out.println("PN:"+b.getPartNumber());
             System.out.println("RI:"+b.getBarcode());
             System.out.println("RI:"+b.getBarcode());
             System.out.println("QTY:"+b.getAmount());
             System.out.println("QTY:"+b.getAmount());

src/main/java/com/neotel/smfcore/core/barcode/rest/BarcodeController.java

@@ -130,7 +130,8 @@ public class BarcodeController {
         if(params.getCodeRuleList().isEmpty()){
         if(params.getCodeRuleList().isEmpty()){
             throw new ValidateException("smfcore.valueCanotNull","{0}不能为空",new String[]{"codeRuleList"} );
             throw new ValidateException("smfcore.valueCanotNull","{0}不能为空",new String[]{"codeRuleList"} );
         }
         }
-        if(params.getCodeRuleList().size()>10){
+        //条码规则改成20条
+        if(params.getCodeRuleList().size()>20){
             throw new ValidateException("smfcore.valueCanotNull","{0}不能为空",new String[]{"codeRuleList"} );
             throw new ValidateException("smfcore.valueCanotNull","{0}不能为空",new String[]{"codeRuleList"} );
         }
         }
 
 

src/main/java/com/neotel/smfcore/core/order/rest/OrderController.java

@@ -370,7 +370,14 @@ public class OrderController {
         } else if (!ObjectUtils.isEmpty(orderNo)) {
         } else if (!ObjectUtils.isEmpty(orderNo)) {
             liteOrder = liteOrderManager.findByOrderNo(orderNo);
             liteOrder = liteOrderManager.findByOrderNo(orderNo);
         }
         }
+
+        boolean needAddCol=false;
+        if(liteOrder.isNew()){
+            needAddCol=true ;
+        }
+
         if (liteOrder != null) {
         if (liteOrder != null) {
+           OrderDto orderDto= toOrderDto(liteOrder);
             List<List<String>> header = new ArrayList<>();
             List<List<String>> header = new ArrayList<>();
             Locale locale = request.getLocale();
             Locale locale = request.getLocale();
             header.add(Lists.newArrayList(MessageUtils.getText("smfcore.order.ri",locale,"RI")));
             header.add(Lists.newArrayList(MessageUtils.getText("smfcore.order.ri",locale,"RI")));
@@ -394,10 +401,18 @@ public class OrderController {
                 }
                 }
             }
             }
 
 
+            if(needAddCol){
+                header.add(Lists.newArrayList(MessageUtils.getSmfClientMsg("smfclient.workOrder.inVenqty",locale,"Inventory Quantity")));
+                header.add(Lists.newArrayList(MessageUtils.getSmfClientMsg("smfclient.workOrder.inReelBundle",locale,"Inventory Reel/Bundle count")));
+                header.add(Lists.newArrayList(MessageUtils.getSmfClientMsg("smfclient.workOrder.inQty",locale,"Insufficient Quantity")));
+                header.add(Lists.newArrayList(MessageUtils.getSmfClientMsg("smfclient.workOrder.insufficientBundle",locale,"Insufficient Reel/Bundle count")));
+                header.add(Lists.newArrayList(MessageUtils.getSmfClientMsg("smfclient.workOrder.incient",locale,"Insufficient")));
+            }
+
             header.add(Lists.newArrayList(MessageUtils.getText("smfcore.order.exception",locale,"异常")));
             header.add(Lists.newArrayList(MessageUtils.getText("smfcore.order.exception",locale,"异常")));
             List<List<Object>> dataList = new ArrayList<>();
             List<List<Object>> dataList = new ArrayList<>();
 
 
-            for (LiteOrderItem orderItem : liteOrder.getOrderItems()) {
+            for (OrderItemDto orderItem : orderDto.getOrderItems()) {
 
 
                 List<Object> data = new ArrayList<>();
                 List<Object> data = new ArrayList<>();
                 data.add(orderItem.getRi());
                 data.add(orderItem.getRi());
@@ -418,6 +433,20 @@ public class OrderController {
                         String v=orderItem.getAppendData().getOrDefault(key,"");
                         String v=orderItem.getAppendData().getOrDefault(key,"");
                         data.add(v);
                         data.add(v);
                     }
                     }
+                } if(needAddCol) {
+                    boolean needN = orderItem.getNeedNum() > 0;
+                    boolean needR = orderItem.getNeedReelCount() > 0;
+                    data.add(needN ? orderItem.getInventoryQty() : "");
+                    data.add(needR ? orderItem.getInventoryReelCount() : "");
+                    int insufficientQty = orderItem.getNeedNum() - orderItem.getInventoryQty();
+                    int insufficientReelNum = orderItem.getNeedReelCount() - orderItem.getInventoryReelCount();
+                    String ins = "";
+                    if (insufficientQty > 0 || insufficientReelNum > 0) {
+                        ins = "Yes";
+                    }
+                    data.add(needN ? insufficientQty : "");
+                    data.add(needR ? insufficientReelNum : "");
+                    data.add(ins);
                 }
                 }
                 boolean exc=false;
                 boolean exc=false;
                 if(orderItem.getOutNum()<orderItem.getNeedNum()){
                 if(orderItem.getOutNum()<orderItem.getNeedNum()){