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 | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 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 8ca4135..d148d52 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
@@ -3,10 +3,9 @@
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.LocDetl;
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;
@@ -15,7 +14,6 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
@@ -47,17 +45,34 @@
wrkDetl.setSeqNo((null != dto.getSeqNo()) ? dto.getSeqNo() : 0);
if (Cools.isEmpty(dto.getSupplier())){
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
- dto.setSupplier(sdf.format(new Date()));
+ wrkDetl.setSupplier(sdf.format(new Date()));
}else {
wrkDetl.setSupplier(dto.getSupplier());
}
-
wrkDetl.setZpallet(barcode); // 鎵樼洏鏉＄爜
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("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
}
--
Gitblit v1.9.1