From aefc453a2a9bfcc654bcc7a2ce4735243119665e Mon Sep 17 00:00:00 2001
From: bfwms <1>
Date: 星期二, 23 九月 2025 15:27:40 +0800
Subject: [PATCH] ERP对接
---
src/main/java/com/zy/asrs/controller/OpenController.java | 14 +++++++-------
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 8 ++++----
src/main/java/com/zy/asrs/task/ERPReportScheduler.java | 1 +
3 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index e83bde1..9d16f1f 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -164,10 +164,10 @@
*/
@PostMapping("/order/pakout/new/default/v1")
@AppAuth(memo = "娣诲姞璁㈠崟鍑哄簱")
- public synchronized R pakoutOrderCreate(
- @RequestBody HashMap<String , Object> map
+ public synchronized R pakoutOrderCreate(@RequestHeader(required = false) String appkey,
+ @RequestBody HashMap<String , Object> map, HttpServletRequest request
) {
-// auth(appkey, param, request);
+ auth(appkey, map, request);
String toJSONString = JSONObject.toJSONString(map.get("data"));
List<OpenOrderPakoutParam> openOrderPakoutParams=JSON.parseArray(toJSONString,OpenOrderPakoutParam.class);
int i=1;
@@ -198,10 +198,10 @@
*/
@PostMapping("/pickToFill/barcode")
@AppAuth(memo = "鎹℃枡杞叏鏉�")
- public synchronized R againOut(@RequestHeader(required = false) String appkey,
- @RequestBody PackParam param,
- HttpServletRequest request) {
-// auth(appkey, param, request);
+ public synchronized R againOut(@RequestHeader(required = false) String appkey,@RequestBody HashMap<String , Object> map, HttpServletRequest request) {
+ auth(appkey, map, request);
+ String toJSONString = JSONObject.toJSONString(map);
+ PackParam param=JSON.parseObject(toJSONString,PackParam.class);
if (Cools.isEmpty(param)||Cools.isEmpty(param.getBarcode())) {
return R.error("鎵樼洏鐮佷负绌�,璇锋鏌�");
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 98861b1..8c7f3fa 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -300,10 +300,10 @@
boolean boo= true;
for(WrkDetl wrkDetl : wrkDetls) {
if(wrkDetl.getMatnr().equals(locDetl.getMatnr())&&wrkDetl.getBatch().equals(locDetl.getBatch())) {
- v = locDetl.getAnfme() - wrkDetl.getAnfme();
- if(v == 0){
- boo = false;
- }
+ wrkDetl.setAnfme(locDetl.getAnfme());
+ wrkDetlService.updateAnfme(locDetl.getAnfme(),wrkMast.getWrkNo(),wrkDetl.getMatnr(),wrkDetl.getBatch());
+ boo=false;
+ break;
}
}
if(boo){
diff --git a/src/main/java/com/zy/asrs/task/ERPReportScheduler.java b/src/main/java/com/zy/asrs/task/ERPReportScheduler.java
index 9292c76..e12900d 100644
--- a/src/main/java/com/zy/asrs/task/ERPReportScheduler.java
+++ b/src/main/java/com/zy/asrs/task/ERPReportScheduler.java
@@ -135,6 +135,7 @@
}else{
wrkMast.setWrkSts(18L);//鍑哄簱杞巻鍙叉。
}
+ success = true;
wrkMastService.updateById(wrkMast);
} else {
log.error("浠诲姟鍙�={}锛屼笂鎶ュけ璐�",wrkMast.getWrkNo());
--
Gitblit v1.9.1