From efb03886e54084b5657469cf6821dda7733a95f6 Mon Sep 17 00:00:00 2001
From: "ZHOUZ\\Noble'lift" <1014987728@qq.com>
Date: Fri, 25 Aug 2023 08:37:54 +0800
Subject: [PATCH] =?UTF-8?q?rev:=E8=BF=94=E6=A3=80=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=B0=86=E5=9B=9E=E4=BC=A0=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E7=BD=AE=E4=B8=BA1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/nl/wms/ext/szls/rest/LmsToBigScreenController.java  | 3 +++
 .../nl/wms/st/inbill/service/impl/InbillServiceImpl.java    | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/szls/rest/LmsToBigScreenController.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/szls/rest/LmsToBigScreenController.java
index 45266d01b..36ebe730b 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/szls/rest/LmsToBigScreenController.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/szls/rest/LmsToBigScreenController.java
@@ -1,5 +1,6 @@
 package org.nl.wms.ext.szls.rest;
 
+import cn.dev33.satoken.annotation.SaIgnore;
 import com.alibaba.fastjson.JSONObject;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -25,6 +26,7 @@ public class LmsToBigScreenController {
     @PostMapping("/getDeviceInfo")
     @Log("数字孪生请求LMS获取设备信息")
     @ApiOperation("数字孪生请求LMS获取设备信息")
+    @SaIgnore
     public ResponseEntity<Object> getDeviceInfo(@RequestBody JSONObject jo) {
         return new ResponseEntity<>(LmsToBigScreenService.getDeviceInfo(jo), HttpStatus.OK);
     }
@@ -32,6 +34,7 @@ public class LmsToBigScreenController {
     @PostMapping("/getStructInfo")
     @Log("数字孪生请求LMS获取设备信息")
     @ApiOperation("数字孪生请求LMS获取设备信息")
+    @SaIgnore
     public ResponseEntity<Object> getStructInfo(@RequestBody JSONObject jo) {
         return new ResponseEntity<>(LmsToBigScreenService.getStructInfo(jo), HttpStatus.OK);
     }
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/InbillServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/InbillServiceImpl.java
index 4c5564cb9..ce1f7d244 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/InbillServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/InbillServiceImpl.java
@@ -183,6 +183,10 @@ public class InbillServiceImpl {
         mst_jo.put("confirm_optid", currentUserId);
         mst_jo.put("confirm_optname", nickName);
         mst_jo.put("confirm_time", now);
+        //返检入库，将回传字段改为1
+        if (StrUtil.equals(mst_jo.getString("bill_type"), "0006")) {
+            mst_jo.put("is_upload", "1");
+        }
 
         //更新主表状态为99
         WQLObject.getWQLObject("ST_IVT_IOStorInv").update(mst_jo);
@@ -206,6 +210,8 @@ public class InbillServiceImpl {
                 WQLObject.getWQLObject("ST_IVT_IOStorInv").update(mst_jo);
             }
         }
+
+
         //回传SAP
     }
 }