From b6bf5c99a551f042616c184313a9abb9cab1008a Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 10 二月 2025 15:04:18 +0800
Subject: [PATCH] 导入聚乳酸明细时 牌号为161,171,181并且物资类别为改性树脂时指定主体为海正生物，生产车间为一车间
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 34 ++++++++++++++++++++++++----------
1 files changed, 24 insertions(+), 10 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 0ad4830..080b2f9 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
@@ -51,6 +52,8 @@
@Autowired
private OrderService orderService;
+ @Autowired
+ private OrderLogService orderLogService;
@Autowired
private OrderDetlService orderDetlService;
@Autowired
@@ -211,6 +214,11 @@
}
orderService.remove(order.getId());
}
+ OrderLog orderLog = orderLogService.selectByNo(param.getCCode());
+ if (!Cools.isEmpty(orderLog)) {
+ throw new CoolException(param.getCCode() + "鍗曟嵁宸茬粡瀹屾垚锛屼笉闇�瑕佸啀浼犻��");
+ }
+
DocType docType = docTypeService.selectOrAdd(param.getType(), Boolean.FALSE);
Date now = new Date();
@@ -417,7 +425,7 @@
//鍒犻櫎瀛樿揣妗ｆ
if (param.deleteFlag == 1) {
for (MatSyncParam.MatParam matParam : param.getMatDetails()) {
- matService.deleteById(matParam.getMatnr());
+ matService.delete(new EntityWrapper<Mat>().eq("matnr", matParam.getMatnr()));
}
return;
@@ -583,7 +591,7 @@
Pla pla = plaService.selectByBatchAndPackageNo(batch, packageNo, brand);
Mat mat = matService.selectByMaktx(pla.getBrand());
//褰撶敓浜у崟鍙蜂笉涓�鑷存椂锛岄渶瑕佹柊寤轰竴涓猵aram
- if (list.size() == 0 || 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()) ? "璋冩嫧鍏ュ簱鍗�" : "浜ф垚鍝佸叆搴�";
@@ -596,7 +604,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,24 +621,27 @@
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(list, "鍏ュ簱鍗曚笂鎶�", url, orderReportPath, null, "127.0.0.1");
+ for (OpenOrderPakoutParam param : list) {
+ doHttpRequest(param, "鍏ュ簱鍗曚笂鎶�", url, orderReportPath, null, "127.0.0.1");
- //}
-
+ }
return 200;
-
//return doHttpRequest(list, "鍏ュ簱鍗曚笂鎶�", url, orderReportPath, null, "127.0.0.1");
-
}
+
+
@Override
public List<Order> selectOrderInformation(Map<String, String> param) {
@@ -690,8 +702,10 @@
boolean success = false;
try {
+ log.info("璇锋眰鍙傛暟锛歿}", requestParam);
response = new HttpHandler.Builder()
.setUri(url)
+ .setTimeout(30, TimeUnit.SECONDS)
.setPath(path)
.setJson(JSONObject.toJSONString(requestParam))
.build()
@@ -704,7 +718,7 @@
}
int code = Integer.parseInt(jsonObject.get("ErrorCode").toString());
- if (code != 0) {
+ if (code == 0) {
throw new CoolException(jsonObject.get("ErrorMsg").toString());
}
success = true;
--
Gitblit v1.9.1