From b8975f62b72528006a840e63810f1644560ac4fd Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 23 四月 2022 09:58:18 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 33 +++++++++++++++++++++------------
1 files changed, 21 insertions(+), 12 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 2992414..c0045f2 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -12,6 +12,7 @@
import com.zy.asrs.entity.result.OpenOrderCompeteResult;
import com.zy.asrs.entity.result.StockVo;
import com.zy.asrs.service.*;
+import com.zy.asrs.utils.MatUtils;
import com.zy.common.model.DetlDto;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -315,16 +316,16 @@
@Override
@Transactional
public void packageUp(String barcode) {
+ Mat analyse = MatUtils.analyseMat(barcode);
Pack pack = packService.selectByBarcode(barcode);
if (null != pack) {
throw new CoolException(barcode + "閲嶅鎻愪氦");
}
Date now = new Date();
- // todo:luxiaotao 瑙ｆ瀽鏉＄爜瑙勫垯锛岃幏鍙栫墿鏂欎唬鐮�
pack = new Pack(
barcode, // 鏉＄爜[闈炵┖]
- null, // 鍟嗗搧缂栧彿
- null, // 鎵瑰彿
+ analyse.getMatnr(), // 鍟嗗搧缂栧彿
+ analyse.getBarcode(), // 鎵瑰彿
1L, // 璁㈠崟鐘舵��
1, // 鐘舵��
now, // 娣诲姞鏃堕棿
@@ -336,15 +337,23 @@
if (!packService.insert(pack)) {
throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
}
- Mat mat = new Mat();
- mat.setTagId(tagService.getTop().getId());
- mat.setMatnr(barcode);
- mat.setMaktx(barcode);
- mat.setStatus(1);
- mat.setCreateTime(now);
- mat.setUpdateTime(now);
- if (!matService.insert(mat)) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+
+ Mat mat = matService.selectByMatnr(analyse.getMatnr());
+ if (mat == null) {
+ mat = new Mat();
+ // todo
+ mat.setTagId(tagService.getTop().getId());
+ mat.setMatnr(analyse.getMatnr());
+ mat.setMaktx(barcode);
+ mat.setStatus(1);
+ mat.setCreateTime(now);
+ mat.setUpdateTime(now);
+ mat.setMemo("鎵撳寘涓婄嚎");
+ if (!matService.insert(mat)) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ } else {
+ log.info("鎵撳寘涓婄嚎娣诲姞鏂扮墿鏂橻鍟嗗搧缂栧彿锛歿}]", mat.getMatnr());
+ }
}
}
--
Gitblit v1.9.1