From 5677bbf8ba92c286d59b90321c863c14255c734e Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 29 七月 2024 09:23:49 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 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 869bbeb..a9da271 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1007,7 +1007,7 @@
// 鏍规嵁婧愮珯鐐瑰鎵惧簱浣�
// StartupDto dto = commonService.getLocNo(1, 1, param.getPalletizingNo(), null,null,null, locTypeDto);
- StartupDto dto = commonService.getLocNo(1, param.getPalletizingNo(), locTypeDto);
+ StartupDto dto = commonService.getLocNo(1, param.getPalletizingNo(), locTypeDto,0);
// 杩斿洖GWCS鐩爣淇℃伅
pushStaNoToGwcs(param.getPalletizingNo(),dto.getStaNo(),dto.getWorkNo());
@@ -1045,26 +1045,26 @@
WrkDetl wrkDetl = new WrkDetl();
wrkDetl.setWrkNo(wrkMast.getWrkNo());
obj.getRolls().forEach(roll -> {
- Mat mat = matService.selectByMatnr(roll.getSpecs());
- if (mat == null) {
- mat = new Mat();
- mat.setTagId(6L);
- mat.setMatnr(roll.getSpecs());
- mat.setMaktx(roll.getSpecs());
- mat.setSpecs(roll.getSpecs());
- mat.setStatus(1);
- mat.setCreateTime(now);
- mat.setUpdateTime(now);
- if (!matService.insert(mat)) {
- throw new CoolException("鐗╂枡瀵煎叆澶辫触锛�");
- }
- }
+// Mat mat = matService.selectByMatnr(roll.getSpecs());
+// if (mat == null) {
+// mat = new Mat();
+// mat.setTagId(6L);
+// mat.setMatnr(roll.getSpecs());
+// mat.setMaktx(roll.getSpecs());
+// mat.setSpecs(roll.getSpecs());
+// mat.setStatus(1);
+// mat.setCreateTime(now);
+// mat.setUpdateTime(now);
+// if (!matService.insert(mat)) {
+// throw new CoolException("鐗╂枡瀵煎叆澶辫触锛�");
+// }
+// }
wrkDetl.setWrkNo(wrkMast.getWrkNo());
wrkDetl.setMatnr(roll.getSpecs()); // 瑙勬牸
wrkDetl.setMaktx(roll.getSpecs()); //瑙勬牸
wrkDetl.setBatch(roll.getBoxNo()); // 绠卞彿
wrkDetl.setModel(roll.getRollNo()); // 鍗峰彿
- wrkDetl.setBrand(""); // 鏈ㄧ绫诲瀷
+ wrkDetl.setBrand(obj.getPackageGroupNo()); // 鍖呰缁勫彿
wrkDetl.setZpallet(param.getBarcode()); // 鎵樼洏鍚�
wrkDetl.setOrigin(obj.getBoxPos()); // 鏈ㄧ鍦ㄦ墭鐩樹綅缃�
wrkDetl.setWeight(roll.getNetWeight()); // 鍑�閲�
--
Gitblit v1.9.1