From 98b1835a279fd8c9ed2a21fae3501f24c470c39b Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期四, 09 十一月 2023 09:37:36 +0800
Subject: [PATCH] 修复权限无法修改bug 组托时检测料箱码是否存在库存中
---
src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 46 insertions(+), 8 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 46a0c58..89c9603 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
@@ -3,12 +3,11 @@
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.MatCode;
+import com.zy.asrs.entity.Mat;
import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.mapper.WrkDetlMapper;
-import com.zy.asrs.service.MatCodeService;
+import com.zy.asrs.service.MatService;
import com.zy.asrs.service.WrkDetlService;
-import com.zy.asrs.utils.VersionUtils;
import com.zy.common.model.DetlDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -21,7 +20,7 @@
public class WrkDetlServiceImpl extends ServiceImpl<WrkDetlMapper, WrkDetl> implements WrkDetlService {
@Autowired
- private MatCodeService matCodeService;
+ private MatService matService;
@Override
@Transactional
@@ -31,22 +30,26 @@
}
Date now = new Date();
for (DetlDto dto : detlDtos) {
- MatCode matCode = matCodeService.selectById(dto.getMatnr());
- if (Cools.isEmpty(matCode)){
- throw new CoolException("鐗╂枡鏉＄爜鏁版嵁涓虹┖");
+ Mat mat = matService.selectByMatnr(dto.getMatnr());
+ if (Cools.isEmpty(mat)){
+ throw new CoolException(dto.getMatnr() + "鍟嗗搧缁存姢澶辫触");
}
// 淇濇寔宸ヤ綔妗ｆ槑缁�
WrkDetl wrkDetl = new WrkDetl();
+ wrkDetl.sync(mat);
wrkDetl.setWrkNo(workNo);
wrkDetl.setIoTime(now);
wrkDetl.setBatch(dto.getBatch());
wrkDetl.setAnfme(dto.getAnfme()); // 鏁伴噺
- VersionUtils.setWrkDetl(wrkDetl, matCode); // 鐗堟湰鎺у埗
wrkDetl.setZpallet(barcode); // 鎵樼洏鏉＄爜
wrkDetl.setAppeUser(userId);
wrkDetl.setAppeTime(now);
wrkDetl.setModiUser(userId);
wrkDetl.setModiTime(now);
+
+ wrkDetl.setThreeCode(dto.getCsocode());
+ wrkDetl.setDeadTime(dto.getIsoseq());
+ wrkDetl.setSuppCode(dto.getContainerCode());
if (!this.insert(wrkDetl)) {
throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
}
@@ -57,4 +60,39 @@
public List<WrkDetl> selectByWrkNo(Integer wrkNo) {
return this.baseMapper.selectByWrkNo(wrkNo);
}
+
+ @Override
+ public boolean updateAnfme(Double anfme, Integer wrkNo, String matnr, String batch) {
+ if (anfme <= 0) {
+ return this.baseMapper.deleteItem(wrkNo, matnr, batch) > 0;
+ } else {
+ return baseMapper.updateAnfme(anfme, wrkNo, matnr, batch) > 0;
+ }
+ }
+
+ @Override
+ public List<WrkDetl> selectAndLogByOrderNo(String orderNo) {
+ return this.baseMapper.selectAndLogByOrderNo(orderNo);
+ }
+
+ @Override
+ public List<WrkDetl> selectAndLogByOrderNoGroupByMatnrOfSum(String orderNo) {
+ return this.baseMapper.selectAndLogByOrderNoGroupByMatnrOfSum(orderNo);
+ }
+
+ @Override
+ public boolean updateInspect(Integer wrkNo, String matnr, String batch) {
+ return this.baseMapper.updateInspect(wrkNo, matnr, batch) > 0;
+ }
+
+ @Override
+ public List<WrkDetl> selectPakoutQuery(Integer staNo, String matnr) {
+ return this.baseMapper.selectPakoutQuery(staNo, matnr);
+ }
+
+ @Override
+ public boolean updateOrderNo(String orderNo, Integer wrkNo, String matnr, String batch) {
+ return baseMapper.updateOrderNo(orderNo, wrkNo, matnr, batch) > 0;
+ }
+
}
--
Gitblit v1.9.1