From a041b056be31d3fe2fb045b1785dd0870f759744 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期一, 28 十月 2024 11:00:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzhneasrs' into tzhneasrs
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 12 +++++-------
1 files changed, 5 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..e1f6688 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -573,7 +573,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 +582,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);
@@ -624,7 +621,7 @@
}
for (OpenOrderPakoutParam param : list) {
- doHttpRequest(param, "鍏ュ簱鍗曚笂鎶�", url, orderReportPath, null, "127.0.0.1");
+ //doHttpRequest(param, "鍏ュ簱鍗曚笂鎶�", url, orderReportPath, null, "127.0.0.1");
}
return 200;
@@ -632,6 +629,7 @@
}
+
@Override
public List<Order> selectOrderInformation(Map<String, String> param) {
List<Order> list = new ArrayList<>();
--
Gitblit v1.9.1