成都蜜雪冰城 没有盘点批次号

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

@@ -550,7 +550,7 @@ public class PlcService {
     @Resource
     private LightSourceMapper lightSourceMapper;
 
-    public Boolean check(PlcCmdInfo plcCmdInfo,String cmdCode,String wmsCode,String wmsTrayCode,String wmsTrayCatagary){
+    public Boolean check(PlcCmdInfo plcCmdInfo,String cmdCode,String wmsCode,String wmsTrayCode,String wmsCatagary){
 
         long startTime = System.currentTimeMillis();
         Street street = streetService.getStreetByPlcId(plcCmdInfo.getPlcId());
@@ -598,16 +598,19 @@ public class PlcService {
         Stock stock = stockMapper.getByStreetAndDirectionAndSideAndRowColumn(orderInfo.getStreetId(),orderInfo.getLeftRight(),orderInfo.getSeparation(),orderInfo.getRow(),orderInfo.getColumn());
         //核对异常
         if(stock == null){
-            stock = new Stock(null,null,plcCmdInfo.getOrderNum(),plcCmdInfo.getLotnum(),"", null,null,wmsCode,wmsTrayCatagary,null,wmsTrayCode,"",orderInfo.getStreetId(),orderInfo.getLeftRight(),orderInfo.getSeparation(),orderInfo.getRow(),orderInfo.getColumn(),0,null,null,path, LocalDateTime.now());
+            stock = new Stock(null,null,plcCmdInfo.getOrderNum(),plcCmdInfo.getLotnum(),"", null,null,wmsCode,wmsCatagary,null,wmsTrayCode,"",orderInfo.getStreetId(),orderInfo.getLeftRight(),orderInfo.getSeparation(),orderInfo.getRow(),orderInfo.getColumn(),0,null,null,path, LocalDateTime.now());
             stockMapper.insert(stock);
         }else {
             //stock.setStatus(status);
-            stock.setLotnum(plcCmdInfo.getLotnum());
+            //stock.setLotnum(plcCmdInfo.getLotnum());
             stock.setExportTime(LocalDateTime.now());
             stock.setCheckPic(path);
             stock.setCheckNum(plcCmdInfo.getOrderNum());
             //stock.setTrayCode(trayCode);
             stock.setWmsTrayCode(wmsTrayCode);
+            stock.setWmsCategory(wmsCatagary);
+            stock.setCategory(wmsCatagary);
+            stock.setCode(wmsTrayCode);
             //stock.setCode(scanCode);
             stock.setWmsCode(wmsCode);
             stockMapper.updateById(stock);

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

@@ -45,7 +45,7 @@ public class TestService {
                     PlcCmdInfo plcCmdInfo = new PlcCmdInfo(street.getPlcId(),taskId,1,leftRight,j,i,1,1,1,1,1,1,"");
                     plcCmdInfo.setTimes(1);
                     int co = j%3 + 1;
-                    plcService.check(plcCmdInfo,"E"+co,code,code);
+                    plcService.check(plcCmdInfo,"E"+co,code,code,null);
                     try {
                         Thread.sleep(1000);
                     } catch (InterruptedException e) {