增加托盘码描述

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){
+    public Boolean check(PlcCmdInfo plcCmdInfo,String cmdCode,String wmsCode,String wmsTrayCode,String wmsTrayCatagary){
 
         long startTime = System.currentTimeMillis();
         Street street = streetService.getStreetByPlcId(plcCmdInfo.getPlcId());
@@ -598,7 +598,7 @@ 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,null,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,wmsTrayCatagary,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);

web/src/main/java/com/zhehekeji/web/service/ksec/KsecDecoder.java

@@ -170,19 +170,19 @@ public class KsecDecoder extends DelimiterBasedFrameDecoder {
 //                    log.info("other D code :{}",code);
 //                }
                 } else if (Cmd.E.name().equals(ksecInfo.getType())) {
-
+                    //成都蜜雪冰城 没有盘点批次号，把这一块注释 lotnum
+//                    if(!StringUtils.isEmpty(lotnum) && !lotnum.equals(lastLotnum)){
+//                        //需要把stock表truncate
+//                        FileUtil.save(lotnum,"lastLotnum");
+//                        tcpLogger.info("truncate table ,last lotnum:{},new lotnum:{}",lastLotnum,lotnum);
+//                        plcService.truncateStock();
+//                        lastLotnum = lotnum;
+//                    }
                     //盘点
                     //转球机到盘点位 然后拍照
-
-                    if(!StringUtils.isEmpty(lotnum) && !lotnum.equals(lastLotnum)){
-                        //需要把stock表truncate
-                        FileUtil.save(lotnum,"lastLotnum");
-                        tcpLogger.info("truncate table ,last lotnum:{},new lotnum:{}",lastLotnum,lotnum);
-                        plcService.truncateStock();
-                        lastLotnum = lotnum;
-                    }
                     plcCmdInfo.setTimes(1);
-                    Boolean ok = plcService.check(plcCmdInfo,ksecInfo.getData().getCmdName(), dataInfo.getCode(), dataInfo.getTrayCode());
+                    //成都蜜雪冰城 将lotnum当成托盘条码描述
+                    Boolean ok = plcService.check(plcCmdInfo,ksecInfo.getData().getCmdName(), dataInfo.getCode(), dataInfo.getTrayCode(), dataInfo.getLotnum());
                     if(ok){
                         ksecInfo.getData().setAckStatus(1);
                     }else {