From e19ec1ee90d61b5877ee251399b236ef84f2f5ff Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期四, 16 四月 2026 08:11:34 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java b/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java
index 3fef8ef..1b42119 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java
@@ -269,6 +269,9 @@
continue;
}
JSONArray data = jsonResponse.getJSONObject("data").getJSONArray("rows");
+ if(data == null){
+ continue;
+ }
if(data.size()<=0) continue;
//鍟嗗搧妗ｆ鍚屾
if(kingDeeUtilType.formId.equals("BD_MATERIAL")) {
@@ -577,17 +580,14 @@
}
Double erpAnfme = anfme*mat.getSafeQty();
Order order1 = orderService.selectByNo( billNo);
- List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order1.getId());
- boolean sign = false;
- for (OrderDetl orderDetl : orderDetls){
- if (orderDetl.getMatnr().equals(matnr)){
- sign = true;
- break;
- }
- }
- if (sign){
- continue;
- }
+ List<OrderDetl> orderDetls =
+ orderDetlService.selectByOrderId(order.getId());
+ boolean exists = orderDetls.stream()
+ .anyMatch(o ->
+ o.getMatnr().equals(matnr) &&
+ o.getBoxType3().equals(pOrderNo)
+ );
+ if (exists) continue;
LocSupp locSupp = null;
String supp =null;
locSupp = locSuppService.selectByUuid(suppCode);
@@ -1671,9 +1671,9 @@
orderDetl.setSupp(supp);
orderDetl.setSuppCode(suppCode);
orderDetl.setSku(matnr);
- orderDetl.setStandby1(s1 != null? s1:"1");
- orderDetl.setStandby2(s2 != null? s2:"1");
- orderDetl.setStandby3(s3 != null? s3:"1");
+ orderDetl.setStandby1(Cools.isEmpty(s1) ? "1" : s1);
+ orderDetl.setStandby2(Cools.isEmpty(s2) ? "1" : s2);
+ orderDetl.setStandby3(Cools.isEmpty(s3) ? "1" : s3);
orderDetl.setBoxType1(owner);
orderDetl.setBoxType2(ownerUuid);
orderDetl.setBoxType3(pOrderNo);
--
Gitblit v1.9.1