From 4d300a00081d7b5916c41162075bdd79851a8fcc Mon Sep 17 00:00:00 2001 From: zyx <zyx123456> Date: 星期三, 24 七月 2024 15:05:19 +0800 Subject: [PATCH] 新增MES采购入库上报功能 --- src/main/java/com/zy/asrs/controller/OpenController.java | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java index 7b763f5..88bca34 100644 --- a/src/main/java/com/zy/asrs/controller/OpenController.java +++ b/src/main/java/com/zy/asrs/controller/OpenController.java @@ -308,7 +308,7 @@ return R.parse(BaseRes.PARAM); } - String docName = param.getChildren().get(0).getIQuantity() > 0 ? "閾跺骇閲囪喘鍏ュ簱鍗�" : "閾跺骇閲囪喘閫�璐у崟"; + String docName = !Cools.isEmpty(param.getOrderType()) ? param.getOrderType() : param.getChildren().get(0).getIQuantity() > 0 ? "閾跺骇閲囪喘鍏ュ簱鍗�" : "閾跺骇閲囪喘閫�璐у崟"; boolean pakin = param.getChildren().get(0).getIQuantity() > 0 ? true : false; openService.syncOrder(param,pakin,docName); @@ -317,6 +317,26 @@ } + /* + 鐩樼偣鎺ュ彛 + */ + @PostMapping("/check/default/v1") + @AppAuth(memo = "搴撳瓨鐩樼偣") + public synchronized R checkLoc(@RequestHeader(required = false) String appkey, + @RequestBody(required = true) CheckParam param, + HttpServletRequest request){ + auth(appkey, param, request); + if (Cools.isEmpty(param)) { + return R.parse(BaseRes.PARAM); + } + + openService.checkAndAdjustLocDetl(param); + + return R.ok("搴撳瓨璋冩暣鎴愬姛"); + + } + + @PostMapping("/order/pakout/default/v1") @AppAuth(memo = "鍚屾宸ュ崟鍗曟嵁") public synchronized R orderPakout(@RequestHeader(required = false) String appkey, -- Gitblit v1.9.1