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/MatOutServiceImpl.java | 184 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 162 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MatOutServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MatOutServiceImpl.java
index 50e41ec..adccb2b 100644
--- a/src/main/java/com/zy/asrs/service/impl/MatOutServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MatOutServiceImpl.java
@@ -1,43 +1,183 @@
package com.zy.asrs.service.impl;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.common.Cools;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.BasDevp;
-import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.StockOutParam;
-import com.zy.asrs.service.MatOutService;
+import com.zy.asrs.service.*;
+import com.zy.asrs.utils.VersionUtils;
import com.zy.common.model.LocDetlDto;
+import com.zy.common.service.CommonService;
+import com.zy.ints.entity.WaitMatout;
+import com.zy.ints.mapper.WaitMatoutMapper;
+import com.zy.ints.service.WaitMatoutService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
@Service
public class MatOutServiceImpl implements MatOutService {
+ // 宸ヤ綔鍙风敓鎴愯鍒欓粯璁ょ被鍨�
+ private static final int DEFAULT_WORK_NO_TYPE = 0;
+ // 搴撲綅鎺掑彿鍒嗛厤榛樿绫诲埆
+ private static final int DEFAULT_ROW_NO_TYPE = 1;
+
+ @Autowired
+ BasDevpService basDevpService;
+ @Autowired
+ LocDetlService locDetlService;
+ @Autowired
+ LocMastService locMastService;
+ @Autowired
+ StaDescService staDescService;
+ @Autowired
+ private CommonService commonService;
+ @Autowired
+ private WrkDetlService wrkDetlService;
+ @Autowired
+ private WrkMastService wrkMastService;
+ @Autowired
+ private WaitMatoutMapper waitMatoutMapper;
+ @Autowired
+ private WaitMatoutService waitMatoutService;
@Override
@Transactional
public void startupMatOut(StockOutParam param, Long userId){
-// // 鐩爣绔欑偣鐘舵�佹娴�
-// BasDevp staNo = basDevpService.checkSiteStatus(param.getOutSite());
-// // 鑾峰彇搴撲綅鏄庣粏
-// List<LocDetlDto> locDetlDtos = new ArrayList<>();
-// for (StockOutParam.LocDetl paramLocDetl : param.getLocDetls()) {
-// if (!Cools.isEmpty(paramLocDetl.getLocNo(), paramLocDetl.getMatNo(), paramLocDetl.getCount())) {
-// LocDetl sqlParam = new LocDetl();
-// sqlParam.setLocNo(paramLocDetl.getLocNo());
-// sqlParam.setMatNo(paramLocDetl.getMatNo());
-// LocDetl one = locDetlService.selectOne(new EntityWrapper<>(sqlParam));
-// if (null != one) locDetlDtos.add(new LocDetlDto(one, paramLocDetl.getCount()));
-// }
-// }
-// if (!locDetlDtos.isEmpty()) {
-// // 鍚姩鍑哄簱寮�濮� 101.鍑哄簱
-// stockOut(staNo, locDetlDtos, null, userId);
-// } else {
-// throw new CoolException("搴撲綅浜у搧涓嶅瓨鍦�");
-// }
+
+ // 鐩爣绔欑偣鐘舵�佹娴�
+ BasDevp staNo = basDevpService.checkSiteStatus(param.getOutSite());
+ // 鑾峰彇搴撲綅鏄庣粏
+ List<LocDetlDto> locDetlDtos = new ArrayList<>();
+ for (StockOutParam.LocDetl paramLocDetl : param.getLocDetls()) {
+ if (!Cools.isEmpty(paramLocDetl.getMatNo())) {
+ //鏌ヨ鎵�鏈夊簱浣嶇姸鎬佷负F鐨勫簱浣嶄俊鎭�
+ List<LocDetl> locDetls=locDetlService.getlocDetlList(paramLocDetl.getMatNo());
+ if (locDetls.size()==0){
+ throw new CoolException("搴撲綅鐘舵�佸嚭閿�");
+ }
+ for (LocDetl locDetl : locDetls) {
+ WaitMatout waitMatout = waitMatoutService.selectOne(new EntityWrapper<WaitMatout>().eq("bill_no", paramLocDetl.getBillNo()).eq("seq_no",paramLocDetl.getSeqNo()));
+ Double outQty = paramLocDetl.getCount() - waitMatout.getOutQty();
+ if(waitMatout.getOutQty() >= waitMatout.getQty()){
+ break;
+ }
+ // 鍒ゆ柇鍏ュ嚭搴撶被鍨嬶細101.鍏ㄦ澘鍑哄簱 or 103.鎷ｆ枡鍑哄簱
+ Double sumCount=locDetlService.getLocDetlSumQty(locDetl.getLocNo());
+ int ioType=0;
+ ioType = sumCount-locDetl.getQty()>0 ? 103 : 101;
+
+ Double curOutQty = outQty >= locDetl.getQty() ? locDetl.getQty() : outQty; //鏈鍑哄簱閲�
+ stockOut(waitMatout.getBillNo(),waitMatout.getSeqNo(),staNo,new LocDetlDto(locDetl,curOutQty),ioType,userId);
+ waitMatout.setOutQty(waitMatout.getOutQty() + curOutQty);
+ waitMatout.setIoStatus(1);
+ //淇敼璁板綍
+ Integer update = waitMatoutMapper.update(waitMatout, new EntityWrapper<WaitMatout>().eq("bill_no", paramLocDetl.getBillNo())
+ .eq("seq_no",paramLocDetl.getSeqNo()));
+
+// if (outQty >= locDetl.getQty()){
+// //鐢熸垚鏂囨。璁板綍
+// stockOut(waitMatout.getBillNo(),waitMatout.getSeqNo(),staNo,new LocDetlDto(locDetl,locDetl.getQty()),ioType,userId);
+// waitMatout.setOutQty(waitMatout.getOutQty() + locDetl.getQty());
+// waitMatout.setIoStatus(1);
+// //淇敼璁板綍
+// Integer update = waitMatoutMapper.update(waitMatout, new EntityWrapper<WaitMatout>().eq("bill_no", paramLocDetl.getBillNo())
+// .eq("seq_no",paramLocDetl.getSeqNo()));
+// }else {
+// //鐢熸垚鏂囨。璁板綍
+// stockOut(waitMatout.getBillNo(),waitMatout.getSeqNo(),staNo,new LocDetlDto(locDetl,outQty),ioType,userId);
+// waitMatout.setOutQty(waitMatout.getOutQty() + outQty);
+// waitMatout.setIoStatus(1);
+// //淇敼璁板綍
+// Integer update = waitMatoutMapper.update(waitMatout, new EntityWrapper<WaitMatout>().eq("bill_no", paramLocDetl.getBillNo())
+// .eq("seq_no",paramLocDetl.getSeqNo()));
+// }
+ }
+ }
+ }
}
+
+ @Override
+ @Transactional
+ public void stockOut(String billNo, Integer seqNo, BasDevp staNo, LocDetlDto locDetlDtos, Integer ioType, Long userId) {
+ // 鐢熸垚宸ヤ綔妗�
+ LocDetl locDetl=locDetlDtos.getLocDetl();
+ // 鑾峰彇搴撲綅
+ LocMast locMast = locMastService.selectById(locDetl.getLocNo());
+ // 鑾峰彇璺緞
+ Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
+ .eq("type_no", ioType)
+ .eq("stn_no", staNo.getDevNo())
+ .eq("crn_no", locMast.getCrnNo());
+ StaDesc staDesc = staDescService.selectOne(wrapper);
+ if (Cools.isEmpty(staDesc)) {
+ throw new CoolException("鍑哄簱璺緞涓嶅瓨鍦�");
+ }
+ int rok;
+ if(ioType==103){
+ rok=2;
+ }else{
+ rok=1;
+ }
+ // 鐢熸垚宸ヤ綔鍙�
+ int workNo = commonService.getWorkNo(rok);
+ // 鐢熸垚宸ヤ綔妗�
+ WrkMast wrkMast = new WrkMast();
+ wrkMast.setWrkNo(workNo);
+ wrkMast.setIoTime(new Date());
+ wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
+ wrkMast.setIoType(ioType); // 鍏ュ嚭搴撶姸鎬�
+ wrkMast.setIoPri(13D); // 浼樺厛绾э細13
+ wrkMast.setCrnNo(locMast.getCrnNo());
+ wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 婧愮珯
+ wrkMast.setStaNo(staDesc.getStnNo()); // 鐩爣绔�
+ wrkMast.setSourceLocNo(locDetl.getLocNo()); // 婧愬簱浣�
+ wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
+ wrkMast.setPicking("N"); // 鎷ｆ枡
+ wrkMast.setExitMk("N"); // 閫�鍑�
+ wrkMast.setEmptyMk("N"); // 绌烘澘
+ wrkMast.setLinkMis("N");
+ wrkMast.setAppeUser(userId); // 鎿嶄綔浜哄憳鏁版嵁
+ wrkMast.setAppeTime(new Date());
+ wrkMast.setModiUser(userId);
+ wrkMast.setModiTime(new Date());
+ if (!wrkMastService.insert(wrkMast)) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐ワ紝鍑哄簱搴撲綅鍙凤細"+locDetl.getLocNo());
+ }
+ // 鍑哄簱鏃讹紝鏁伴噺涓�0鐨勭洿鎺ュ拷鐣�
+ if (locDetlDtos.getCount()==null || locDetlDtos.getCount() <= 0.0D) {return;}
+ WrkDetl wrkDetl = new WrkDetl();
+ wrkDetl.setWrkNo(workNo);
+ wrkDetl.setIoTime(new Date());
+ wrkDetl.setQty(locDetlDtos.getCount()); // 鏁伴噺
+ VersionUtils.setWrkDetl(wrkDetl, locDetlDtos.getLocDetl()); // 鐗堟湰鎺у埗
+ wrkDetl.setAppeTime(new Date());
+ wrkDetl.setAppeUser(userId);
+ wrkDetl.setModiTime(new Date());
+ wrkDetl.setBillNo(billNo);
+ wrkDetl.setSeqNo(seqNo);
+ wrkDetl.setModiUser(userId);
+ if (!wrkDetlService.insert(wrkDetl)) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
+ }
+
+ // 淇敼搴撲綅鐘舵��: F.鍦ㄥ簱 ====>>> R.鍑哄簱棰勭害/P.鎷ｆ枡/鐩樼偣/骞舵澘鍑哄簱涓�
+ locMast = locMastService.selectById(locDetl.getLocNo());
+ if (locMast.getLocSts().equals("F")) {
+ locMast.setLocSts(ioType==101?"R":"P");
+ locMast.setModiUser(userId);
+ locMast.setModiTime(new Date());
+ if (!locMastService.updateById(locMast)) {
+ throw new CoolException("棰勭害搴撲綅鐘舵�佸け璐ワ紝搴撲綅鍙凤細"+locDetl.getLocNo());
+ }
+ } else {
+ throw new CoolException(locDetl.getLocNo() + "搴撲綅涓嶆槸鍦ㄥ簱鐘舵��");
+ }
+ }
}
--
Gitblit v1.9.1