From c4e8e814d2c9e0d03f6449860b70e58657fd7dc2 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期二, 31 十二月 2024 11:58:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzhneasrs' into tzhneasrs
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
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 e1f6688..b812ba7 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -34,6 +34,7 @@
import java.util.Date;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.TimeUnit;
/**
* Created by vincent on 2022/4/9
@@ -596,7 +597,8 @@
OpenOrderPakoutParam.Body body = new OpenOrderPakoutParam.Body();
body.setcInvCode(mat.getMatnr());
body.setiQuantity(pla.getWeightAnfme());
- body.setcBatch("");
+ body.setcBatch(pla.getBatch());
+ body.setCPackage(pla.getPackageNo()+"");
body.setCbMemo(pla.getMemo());
bodyList.add(body);
@@ -612,16 +614,20 @@
body = new OpenOrderPakoutParam.Body();
body.setcInvCode(mat.getMatnr());
body.setiQuantity(pla.getWeightAnfme());
+ body.setcBatch(pla.getBatch());
+ body.setCPackage(pla.getPackageNo()+"");
body.setCbMemo(pla.getMemo());
bodyList.add(body);
} else {
body.setiQuantity(body.getIQuantity() + pla.getWeightAnfme());
+ body.setcBatch(pla.getBatch());
+ body.setCPackage(pla.getPackageNo()+"");
}
}
}
for (OpenOrderPakoutParam param : list) {
- //doHttpRequest(param, "鍏ュ簱鍗曚笂鎶�", url, orderReportPath, null, "127.0.0.1");
+ doHttpRequest(param, "鍏ュ簱鍗曚笂鎶�", url, orderReportPath, null, "127.0.0.1");
}
return 200;
@@ -692,6 +698,7 @@
log.info("璇锋眰鍙傛暟锛歿}", requestParam);
response = new HttpHandler.Builder()
.setUri(url)
+ .setTimeout(30, TimeUnit.SECONDS)
.setPath(path)
.setJson(JSONObject.toJSONString(requestParam))
.build()
--
Gitblit v1.9.1