From 5ed89989807b4e359d07ea87e417a5ae23a23409 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: Sun, 25 May 2025 16:27:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A6=82=E6=9E=9C=E7=9B=98=E7=82=B9=E5=87=BA?=
 =?UTF-8?q?=E7=8E=B0=E5=B7=B2=E7=BB=8F=E5=87=BA=E7=8E=B0=E8=BF=87=E7=9A=84?=
 =?UTF-8?q?=EF=BC=8C=E5=88=99=E7=9B=B4=E6=8E=A5=E8=B7=B3=E8=BF=87=20?=
 =?UTF-8?q?=E9=99=A4=E5=8E=BB=E6=AF=8F=E6=AC=A1=E6=96=B0=E5=BB=BArestTempl?=
 =?UTF-8?q?ate?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/OrderController.java       |  1 +
 .../com/zhehekeji/web/entity/CheckLog.java    |  3 +++
 .../com/zhehekeji/web/service/PlcService.java | 25 ++++++++++++++++++-
 .../service/algorithm/AlgorithmService.java   |  2 +-
 4 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/web/src/main/java/com/zhehekeji/web/controller/OrderController.java b/web/src/main/java/com/zhehekeji/web/controller/OrderController.java
index 21de35e..e9f8c3f 100644
--- a/web/src/main/java/com/zhehekeji/web/controller/OrderController.java
+++ b/web/src/main/java/com/zhehekeji/web/controller/OrderController.java
@@ -75,6 +75,7 @@ public class OrderController {
     public ResultResp<List<KsecDataInfo>> orderDecoder(@ApiParam("工单信息") @RequestBody KsecInfos ksecInfos){
         List<KsecInfo> dataInfos = KsecInfos.getList(ksecInfos);
         List<KsecDataInfo> ksecDataInfos = new ArrayList<>();
+        log.info("解析工单信息："+ksecInfos.toString());
         for (KsecInfo ksecInfo :dataInfos) {
 
             KsecDataInfo ksecDataInfo ;
diff --git a/web/src/main/java/com/zhehekeji/web/entity/CheckLog.java b/web/src/main/java/com/zhehekeji/web/entity/CheckLog.java
index 4b27c98..9a612b6 100644
--- a/web/src/main/java/com/zhehekeji/web/entity/CheckLog.java
+++ b/web/src/main/java/com/zhehekeji/web/entity/CheckLog.java
@@ -79,4 +79,7 @@ public class CheckLog {
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;
 
+    Integer wmsCount;
+
+    String wmsCategory;
 }
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 d364d9a..99f17cc 100644
--- a/web/src/main/java/com/zhehekeji/web/service/PlcService.java
+++ b/web/src/main/java/com/zhehekeji/web/service/PlcService.java
@@ -680,11 +680,29 @@ public class PlcService {
         long startTime = System.currentTimeMillis();
         Street street = streetService.getStreetByPlcId(plcCmdInfo.getPlcId());
 
+        if (checkLogMapper.selectCount(new QueryWrapper<CheckLog>()
+                .eq("street_Id",street.getId())
+                .eq("check_Num",plcCmdInfo.getOrderNum()))>0){
+            log.error("库存信息已经盘点");
+            CheckLog checkLog = checkLogMapper.selectOne(new QueryWrapper<CheckLog>()
+                    .eq("street_Id",street.getId())
+                    .eq("check_Num",plcCmdInfo.getOrderNum()));
+            AlgorithmPojo pojo = AlgorithmPojo.buildAlgorithmPojo(street, dataInfo);
+            if (checkLog.getWmsCategory() != null)
+            pojo.setGoodsType(checkLog.getWmsCategory());
+            if (checkLog.getWmsCount() != null)
+            pojo.setGoodsNumber(checkLog.getWmsCount());
+            if (checkLog.getCategory() != null)
+            pojo.setGoodsTypeResult(checkLog.getCategory());
+            if (checkLog.getCount() != null)
+            pojo.setGoodsNumberResult(checkLog.getCount());
+            return pojo;
+        }
         //打开光源
         streetController.openStreetLightSource( street.getId());
         CronTab.putTime(street.getId());
         plcCmdInfo.setStreetName(street.getName());
-        List<LightSource> lightSources = lightSourceMapper.selectList(new QueryWrapper<LightSource>().eq("street_id", street.getId()));
+//        List<LightSource> lightSources = lightSourceMapper.selectList(new QueryWrapper<LightSource>().eq("street_id", street.getId()));
 
         //关闭光源
         streetController.openStreetLightSource(street.getId());
@@ -792,6 +810,11 @@ public class PlcService {
         checkLog.setTrayCode(stock.getTrayCode());
         checkLog.setPreoperationPic(stock.getPreoperationPic());
         checkLog.setWmsTrayCode(stock.getWmsTrayCode());
+        checkLog.setCount(stock.getCount());
+        checkLog.setCategory(stock.getCategory());
+        checkLog.setWmsCount(stock.getWmsCount());
+        checkLog.setWmsCategory(stock.getWmsCategory());
+
         checkLog.setLotnum(stock.getLotnum());
         checkLogMapper.insert(checkLog);
     }
diff --git a/web/src/main/java/com/zhehekeji/web/service/algorithm/AlgorithmService.java b/web/src/main/java/com/zhehekeji/web/service/algorithm/AlgorithmService.java
index 0e70db1..bffc9dc 100644
--- a/web/src/main/java/com/zhehekeji/web/service/algorithm/AlgorithmService.java
+++ b/web/src/main/java/com/zhehekeji/web/service/algorithm/AlgorithmService.java
@@ -107,7 +107,7 @@ public class AlgorithmService {
     public AlgorithmPojo getGoodResult(AlgorithmPojo algorithmPojo) {
 
         String url = "http://"+algorithmPojo.getIp()+":"+algorithmPojo.getPort()+configProperties.getVisualSense().getUrl();
-        restTemplate = new RestTemplate();
+//        restTemplate = new RestTemplate();