root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rev:返检入库自动将回传字段置为1

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2023-08-25 08:37:54 +08:00
parent 745978de54
commit efb03886e5
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lms/nladmin-system/src/main/java/org/nl/wms/ext/szls/rest/LmsToBigScreenController.java
View File

@@ -1,5 +1,6 @@
package org.nl.wms.ext.szls.rest; package org.nl.wms.ext.szls.rest;
import cn.dev33.satoken.annotation.SaIgnore;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
@@ -25,6 +26,7 @@ public class LmsToBigScreenController {
@PostMapping("/getDeviceInfo") @PostMapping("/getDeviceInfo")
@Log("数字孪生请求LMS获取设备信息") @Log("数字孪生请求LMS获取设备信息")
@ApiOperation("数字孪生请求LMS获取设备信息") @ApiOperation("数字孪生请求LMS获取设备信息")
@SaIgnore
public ResponseEntity<Object> getDeviceInfo(@RequestBody JSONObject jo) { public ResponseEntity<Object> getDeviceInfo(@RequestBody JSONObject jo) {
return new ResponseEntity<>(LmsToBigScreenService.getDeviceInfo(jo), HttpStatus.OK); return new ResponseEntity<>(LmsToBigScreenService.getDeviceInfo(jo), HttpStatus.OK);
} }
@@ -32,6 +34,7 @@ public class LmsToBigScreenController {
@PostMapping("/getStructInfo") @PostMapping("/getStructInfo")
@Log("数字孪生请求LMS获取设备信息") @Log("数字孪生请求LMS获取设备信息")
@ApiOperation("数字孪生请求LMS获取设备信息") @ApiOperation("数字孪生请求LMS获取设备信息")
@SaIgnore
public ResponseEntity<Object> getStructInfo(@RequestBody JSONObject jo) { public ResponseEntity<Object> getStructInfo(@RequestBody JSONObject jo) {
return new ResponseEntity<>(LmsToBigScreenService.getStructInfo(jo), HttpStatus.OK); return new ResponseEntity<>(LmsToBigScreenService.getStructInfo(jo), HttpStatus.OK);
} }

6
lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/InbillServiceImpl.java
View File

@@ -183,6 +183,10 @@ public class InbillServiceImpl {
mst_jo.put("confirm_optid", currentUserId); mst_jo.put("confirm_optid", currentUserId);
mst_jo.put("confirm_optname", nickName); mst_jo.put("confirm_optname", nickName);
mst_jo.put("confirm_time", now); mst_jo.put("confirm_time", now);
//返检入库，将回传字段改为1
if (StrUtil.equals(mst_jo.getString("bill_type"), "0006")) {
mst_jo.put("is_upload", "1");
}
//更新主表状态为99 //更新主表状态为99
WQLObject.getWQLObject("ST_IVT_IOStorInv").update(mst_jo); WQLObject.getWQLObject("ST_IVT_IOStorInv").update(mst_jo);
@@ -206,6 +210,8 @@ public class InbillServiceImpl {
WQLObject.getWQLObject("ST_IVT_IOStorInv").update(mst_jo); WQLObject.getWQLObject("ST_IVT_IOStorInv").update(mst_jo);
} }
} }
//回传SAP //回传SAP
} }
} }