From 9c0c8f4f998b7e7f4370e7c1186d750659d6d660 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期三, 15 一月 2025 08:18:07 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 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 2524d15..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
@@ -573,7 +574,7 @@
JSONArray jsonArray = JSONArray.parseArray(json.getJSONArray("pla").toJSONString());
List<OpenOrderPakoutParam> list = new ArrayList<>();
- String time = new Date().getTime() + "";
+
for (Object o : jsonArray) {
JSONObject jsonObject = (JSONObject) o;
String brand = jsonObject.get("brand").toString();
@@ -582,15 +583,12 @@
Pla pla = plaService.selectByBatchAndPackageNo(batch, packageNo, brand);
Mat mat = matService.selectByMaktx(pla.getBrand());
- if (Cools.isEmpty(pla.getProOrderNo())) {
- pla.setProOrderNo(time);
- }
//褰撶敓浜у崟鍙蜂笉涓�鑷存椂锛岄渶瑕佹柊寤轰竴涓猵aram
- if (list.isEmpty() || checkOrder(list, pla.getProOrderNo()) == null) {
+ if (list.isEmpty() || (!Cools.isEmpty(pla.getProOrderNo()) && checkOrder(list, pla.getProOrderNo()) == null)) {
OpenOrderPakoutParam param = new OpenOrderPakoutParam();
param.setcMaker(json.get("user").toString());
String type = Cools.isEmpty(pla.getProOrderNo()) ? "璋冩嫧鍏ュ簱鍗�" : "浜ф垚鍝佸叆搴�";
- param.setcCode(Cools.isEmpty(pla.getProOrderNo()) ? time : pla.getProOrderNo());
+ param.setcCode(Cools.isEmpty(pla.getProOrderNo()) ? (new Date().getTime()) + "" : pla.getProOrderNo());
param.setcAccount(pla.getWorkshop());
param.setdDate(Utils.getDateStr(new Date()));
param.setType(type);
@@ -599,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);
@@ -615,10 +614,14 @@
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()+"");
}
}
}
@@ -630,6 +633,7 @@
return 200;
//return doHttpRequest(list, "鍏ュ簱鍗曚笂鎶�", url, orderReportPath, null, "127.0.0.1");
}
+
@Override
@@ -694,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