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 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 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 } }