From c783678de8ea0a0439a71a78f9798096cd0a9bec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?LAPTOP-S9HJSOEB=5C=E6=98=8A=E5=A4=A9?=
 <wang.haotian@hzleaper.com>
Date: Fri, 30 Aug 2024 14:51:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B9=E5=90=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/zhehekeji/web/pojo/stock/CheckLogSearch.java |  2 +-
 .../com/zhehekeji/web/service/CheckLogService.java   | 12 ++++++++++--
 .../java/com/zhehekeji/web/service/PlcService.java   |  1 +
 .../com/zhehekeji/web/service/ksec/KsecDecoder.java  |  7 +++++++
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/web/src/main/java/com/zhehekeji/web/pojo/stock/CheckLogSearch.java b/web/src/main/java/com/zhehekeji/web/pojo/stock/CheckLogSearch.java
index d037e13..7995686 100644
--- a/web/src/main/java/com/zhehekeji/web/pojo/stock/CheckLogSearch.java
+++ b/web/src/main/java/com/zhehekeji/web/pojo/stock/CheckLogSearch.java
@@ -45,7 +45,7 @@ public class CheckLogSearch {
         if(this.loc!=null){
             this.streetPlc = this.loc.substring(0,3);
             this.column = Integer.parseInt(this.loc.substring(4,7));
-            this.leftRight = Integer.parseInt(this.loc.substring(3,4));
+            this.leftRight = Integer.parseInt(this.loc.substring(3,4))==1?2:1;
             this.row = Integer.parseInt(this.loc.substring(7,10));
         }
         return this;
diff --git a/web/src/main/java/com/zhehekeji/web/service/CheckLogService.java b/web/src/main/java/com/zhehekeji/web/service/CheckLogService.java
index 1d21360..1a213dd 100644
--- a/web/src/main/java/com/zhehekeji/web/service/CheckLogService.java
+++ b/web/src/main/java/com/zhehekeji/web/service/CheckLogService.java
@@ -102,12 +102,20 @@ public class CheckLogService {
             checkLogOne.setFlag("false");
             checkLogOne.setFrom_tagid(search.getTagid());
             if(checkLog != null){
-                checkLogOne.setJobnum(checkLog.getCheckNum().split("_")[1]);
+                if(checkLog.getCheckNum() !=null && !"".equals(checkLog.getCheckNum()) && checkLog.getCheckNum().split("_").length>1) {
+                    checkLogOne.setJobnum(checkLog.getCheckNum().split("_")[1]);
+                }else {
+                    checkLogOne.setJobnum(search.getJobnum().toString());
+                }
                 //图片
                 checkLogOne.setPicture_routesid(configProperties.getPicIpPort()+checkLog.getPic());
                 if(checkLog.getStatus()!= 1){
                     checkLogOne.setFlag("true");
-                    checkLogOne.setTo_tagid(search.getTagid());
+                    if(search.getTagid() != null && !"".equals(search.getTagid())) {
+                        checkLogOne.setTo_tagid(search.getTagid());
+                    }else {
+                        checkLogOne.setTo_tagid(checkLog.getTrayCode());
+                    }
                 }
             }
             checkLogOnes.add(checkLogOne);
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 aae9ce5..5c4312e 100644
--- a/web/src/main/java/com/zhehekeji/web/service/PlcService.java
+++ b/web/src/main/java/com/zhehekeji/web/service/PlcService.java
@@ -699,6 +699,7 @@ public class PlcService {
         checkLog.setRow(plcCmdInfo.getRow1());
         checkLog.setColumn(plcCmdInfo.getColumn1());
         checkLog.setWmsCode(plcCmdInfo.getCode());
+        checkLog.setCheckNum(plcCmdInfo.getOrderNum());
 
         checkLog.setTaskId((plcCmdInfo.getTaskId()));
         //默认未盘点
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 48a8a39..dd8c85c 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
@@ -90,6 +90,13 @@ public class KsecDecoder extends DelimiterBasedFrameDecoder {
                     return ;
                 }
                 KsecDataInfo dataInfo = ksecInfo.getData();
+                //滁州项目左右是1右2左，在此处替换为1左2右
+                if(dataInfo.getFromDirection()!=null){
+                    dataInfo.setFromDirection(dataInfo.getFromDirection()==1?2:1);
+                }
+                if(dataInfo.getToDirection()!=null){
+                    dataInfo.setToDirection(dataInfo.getToDirection()==1?2:1);
+                }
                 LotnumConvert lotnumConvert = new LotnumConvert(dataInfo.getLotnum());
                 String lotnum = lotnumConvert.getLotnum();
                 dataInfo.setLotnum(lotnum);