放置个数为空

取消随行拍照

web/src/main/java/com/zhehekeji/web/controller/OrderController.java

@@ -74,7 +74,13 @@ public class OrderController {
         List<KsecInfo> dataInfos = KsecInfos.getList(ksecInfos);
         List<KsecDataInfo> ksecDataInfos = new ArrayList<>();
         for (KsecInfo ksecInfo :dataInfos) {
-            KsecDataInfo ksecDataInfo = plcService.orderDecoder(ksecInfo);
+
+            KsecDataInfo ksecDataInfo ;
+            try {
+                ksecDataInfo = plcService.orderDecoder(ksecInfo);
+            }catch (Exception e){
+                ksecDataInfo =ksecInfo.getData();
+            }
             ksecDataInfos.add(ksecDataInfo);
         }
         return ResultResp.success(ksecDataInfos);

web/src/main/java/com/zhehekeji/web/service/PlcService.java

@@ -376,7 +376,7 @@ public class PlcService {
                     delayTime = configProperties.getCameraConfig().getC2OutDelayCaptureTime();
                 }
                 if (configProperties.getOrderTest() == 1) {
-                    checkTest(plcCmdInfo);
+                    //checkTest(plcCmdInfo);
                 }
             } else if (code.startsWith("C3")) {
                 delayTime = configProperties.getCameraConfig().getC3DelayCaptureTime();

web/src/main/java/com/zhehekeji/web/service/StockService.java

@@ -398,7 +398,8 @@ public class StockService {
         //Assert.isTrue( StockStatus.PENDING.getStatus().equals(oldStatus) || StockStatus.ERROR.getStatus().equals(oldStatus), "无需核对");
 
         log.info("check stock correct, street_id:{},direction:{},side:{},row:{},column:{}", stockCheck.getStreetId(),stockCheck.getDirection(),stockCheck.getSide(), stockCheck.getRow(), stockCheck.getColumn());
-        if(stockCheck.getCountTop()+stock.getCount() == stock.getWmsCount() && stockCheck.getCategory().equals( stock.getWmsCategory())){
+        int count =(stock.getCount() != null) ? stock.getCount() : 0;
+        if(stockCheck.getCountTop()+ count == stock.getWmsCount() &&   stock.getWmsCategory().equals(stockCheck.getCategory())){
 
             stock.setStatus(StockStatus.MANUAL.getStatus());
         }else {