From 328505c3e9fe76d2da22948229dbdf08a5bcb1f8 Mon Sep 17 00:00:00 2001
From: yiming <wang.yiming@hzleaper.com>
Date: Fri, 3 Feb 2023 09:33:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=98=E7=9B=98=E7=A0=81?=
 =?UTF-8?q?=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/zhehekeji/web/service/PlcService.java |  4 ++--
 .../web/service/ksec/KsecDecoder.java         | 20 +++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/web/src/main/java/com/zhehekeji/web/service/PlcService.java b/web/src/main/java/com/zhehekeji/web/service/PlcService.java
index ab58836..ba787b6 100644
--- a/web/src/main/java/com/zhehekeji/web/service/PlcService.java
+++ b/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);
diff --git a/web/src/main/java/com/zhehekeji/web/service/ksec/KsecDecoder.java b/web/src/main/java/com/zhehekeji/web/service/ksec/KsecDecoder.java
index b607823..7e562e2 100644
--- a/web/src/main/java/com/zhehekeji/web/service/ksec/KsecDecoder.java
+++ b/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 {