From d7d99af35f7a304bba700ca7cb8a3330237cc8ea Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期一, 04 八月 2025 15:44:26 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 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 b9e7d99..bbf8a2e 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -22,10 +22,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* Created by vincent on 2022/4/9
@@ -525,6 +522,16 @@
callApiLogSaveMES(param, null, param.getBarcode() + "锛氬伐浣滄槑缁嗘。宸插瓨鍦ㄦ鏁版嵁", false);
throw new CoolException("宸ヤ綔鏄庣粏妗ｅ凡瀛樺湪姝ゆ暟鎹�===>>" + param.getBarcode());
}
+ List<CombParam.CombMat> combMats = param.getCombMats();
+ Map<String, String> map = new HashMap<>();
+ for (CombParam.CombMat combMat : combMats) {
+ String batch = Cools.isEmpty(combMat.getBatch()) ? "" : combMat.getBatch();
+ if (!Cools.isEmpty(map.get(combMat.getMatnr() + batch))) {
+ throw new CoolException(param.getBarcode() + "缁勬墭鐨勭墿鏂欐槑缁嗛噸澶�,璇锋鏌ユ槸鍚﹂噸澶嶆壂鐮�");
+ } else {
+ map.put(combMat.getMatnr() + batch, combMat.getMatnr());
+ }
+ }
Date now = new Date();
try{
@@ -740,9 +747,9 @@
order.setOrderNo(toString(param.get("id")));
//涓氬姟绫诲瀷
//order.setDefNumber(param.get("cBusType").toString());
- order.setDefNumber(toString(param.get("cBusType")));
+ order.setDefNumber(toString(param.get("cVouchType")));
//鍗曟嵁绫诲瀷
- DocType docType = docTypeService.selectOrAdd(param.get("cVouchType").toString(), pakin);
+ DocType docType = docTypeService.selectOrAdd(param.get("cBusType").toString(), pakin);
order.setDocType(docType.getDocId());
//鍗曟嵁鏃ユ湡
//order.setOrderTime(param.get("dDate").toString());
--
Gitblit v1.9.1