From b7e08df5a07b3fa832a46ecc31983e16f2bccc8c Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 24 七月 2023 14:56:01 +0800
Subject: [PATCH] # 出库作业，和库存明细管理 排序
---
src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java | 55 +++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 47 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 fe31337..d148d52 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
@@ -4,15 +4,17 @@
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.MatCode;
-import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.entity.MatCodeCountDto;
+import com.zy.asrs.entity.WrkDetl;
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;
+import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
@@ -31,26 +33,63 @@
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()); // 鏁伴噺
+ wrkDetl.setQty(dto.getCount()); // 鏁伴噺
+ VersionUtils.setWrkDetl(wrkDetl, matCode); // 鐗堟湰鎺у埗
+ wrkDetl.setBillNo((null != dto.getBillNo()) ? dto.getBillNo() : "0");
+ wrkDetl.setSeqNo((null != dto.getSeqNo()) ? dto.getSeqNo() : 0);
+ if (Cools.isEmpty(dto.getSupplier())){
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+ wrkDetl.setSupplier(sdf.format(new Date()));
+ }else {
+ wrkDetl.setSupplier(dto.getSupplier());
+ }
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.setMemo(dto.getMemo());
wrkDetl.setModiUser(userId);
wrkDetl.setModiTime(new Date());
+ //鏂板鍔犲瓧娈�
+ if(matCode.getWeight()==null){
+ matCode.setWeight(0.0);
+ }
+ if(matCode.getStr6()==null){
+ matCode.setStr6(0.0);
+ wrkDetl.setAllQty(dto.getCount());
+ }else {
+ wrkDetl.setAllQty(matCode.getStr6()*dto.getCount());
+ }
+ wrkDetl.setAllWeight(matCode.getWeight()*dto.getCount()+30);
+ wrkDetl.setSource(dto.getSource());
+ wrkDetl.setVendor(dto.getVendor());
+ wrkDetl.setWeight(matCode.getWeight());
+ wrkDetl.setQtyBox(matCode.getStr6());
+ wrkDetl.setStr3(matCode.getStr3());
+ wrkDetl.setStr4(matCode.getStr4());
+ wrkDetl.setStr5(matCode.getStr5());
if (!this.insert(wrkDetl)) {
throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
}
}
}
+
+ @Override
+ @Transactional
+ public List<WrkDetl> queryWrkDetl(String matNo, String locNo) {
+ return baseMapper.queryWrkDetl(matNo, locNo);
+ }
+
+ /**
+ * PDA鐩樼偣鏍规嵁鍑哄簱鍙ｆ煡璇㈠搴旂墿鏂欎俊鎭�
+ */
+ @Override
+ public List<WrkDetl> queryMatFromDevNo(Integer devNo) {
+ return baseMapper.queryMatFromDevNo(devNo);
+ }
}
--
Gitblit v1.9.1