From 5fe9c379f0cc696568a0db249026a1e8a3b02a5a Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期二, 15 九月 2020 13:52:39 +0800
Subject: [PATCH] Merge branch 'gdasrs' of https://gitee.com/luxiaotao1123/zy-asrs into gdasrs
---
src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
index fe31337..3f4e893 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
@@ -9,6 +9,7 @@
import com.zy.asrs.mapper.WrkDetlMapper;
import com.zy.asrs.service.MatCodeService;
import com.zy.asrs.service.WrkDetlService;
+import com.zy.asrs.utils.VersionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -31,19 +32,15 @@
for (MatCodeCountDto dto : matCodeCountDtos) {
MatCode matCode = matCodeService.selectById(dto.getMatNo());
if (Cools.isEmpty(matCode)){
- throw new CoolException("鐗╂枡鏉＄爜鏁版嵁涓虹┖");
+ throw new CoolException("浜у搧鏉＄爜鏁版嵁涓虹┖");
}
// 淇濇寔宸ヤ綔妗ｆ槑缁�
WrkDetl wrkDetl = new WrkDetl();
wrkDetl.setWrkNo(workNo);
wrkDetl.setIoTime(new Date());
- wrkDetl.setMatnr(matCode.getMatNo()); // 鐗╂枡缂栧彿
wrkDetl.setAnfme(dto.getCount()); // 鏁伴噺
+ VersionUtils.setWrkDetl(wrkDetl, matCode); // 鐗堟湰鎺у埗
wrkDetl.setZpallet(barcode); // 鎵樼洏鏉＄爜
- wrkDetl.setLgnum("寰呭畾"); // todo
- wrkDetl.setTbnum(0); // todo
- wrkDetl.setTbpos(0); // todo
- wrkDetl.setZmatid("寰呭畾"); // todo
wrkDetl.setAppeUser(userId);
wrkDetl.setAppeTime(new Date());
wrkDetl.setModiUser(userId);
--
Gitblit v1.9.1