From 0ac582221270f883cd2a8f842ce1b352afaeb3f4 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 24 九月 2024 10:57:53 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 280 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 274 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 2d50476..b8c8370 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -10,13 +10,12 @@
import com.core.common.SnowflakeIdWorker;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
-import com.zy.asrs.entity.param.CheckBom;
-import com.zy.asrs.entity.param.CombParam;
-import com.zy.asrs.entity.param.MobileAdjustParam;
-import com.zy.asrs.entity.param.OffSaleParam;
+import com.zy.asrs.entity.param.*;
import com.zy.asrs.mapper.ManLocDetlMapper;
import com.zy.asrs.service.*;
import com.zy.common.model.DetlDto;
+import com.zy.common.model.LocDetlDto;
+import com.zy.common.model.enums.IoWorkType;
import com.zy.common.service.CommonService;
import com.zy.common.utils.Synchro;
import lombok.extern.slf4j.Slf4j;
@@ -81,6 +80,8 @@
private MatV2Service matV2Service;
@Autowired
private BomMatService bomMatService;
+ @Autowired
+ private WorkService workService;
@Override
@Transactional
@@ -389,6 +390,199 @@
}
+
+ @Override
+ @Transactional
+ public void comb3(CombParam param, Long userId) {
+
+ if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {
+ throw new CoolException(BaseRes.PARAM);
+ }
+ if(param.getCombMats().stream().anyMatch(obj -> obj.getAnfme() == null)){
+ throw new CoolException("鍏ュ簱鐗╂枡鏁伴噺涓嶈兘涓虹┖");
+ }
+ // 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
+ if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
+ eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
+ throw new CoolException(param.getBarcode() + "鏁版嵁姝ｅ湪杩涜鍏ュ簱");
+ }
+
+ int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
+ WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());
+ if (wrkMast != null && wrkMast.getIoType() < 100){
+ throw new CoolException("宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�===>>" + param.getBarcode());
+
+ }
+ if (countLoc > 0 ) {
+ throw new CoolException("宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�===>>" + param.getBarcode());
+ }
+
+
+ //璁剧疆闈瀗ull鎵瑰彿锛�
+ for (CombParam.CombMat combMat : param.getCombMats()) {
+ if (combMat.getBatch() == null){
+ combMat.setBatch("");
+ }
+ }
+
+
+
+
+ Date now = new Date();
+
+ // 鏃犲崟缁勬墭
+ if (Cools.isEmpty(param.getCombMats().get(0).getOrderNo())) {
+
+ // 鐢熸垚鍏ュ簱閫氱煡妗�
+ List<DetlDto> detlDtos = new ArrayList<>();
+ param.getCombMats().forEach(elem -> {
+ DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme());
+ if (DetlDto.has(detlDtos, detlDto)) {
+ DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
+ assert one != null;
+ one.setAnfme(one.getAnfme() + detlDto.getAnfme());
+ } else {
+ detlDtos.add(detlDto);
+ }
+ });
+
+
+ for (DetlDto detlDto : detlDtos) {
+ Mat mat = matService.selectByMatnr(detlDto.getMatnr());
+ WaitPakin waitPakin = new WaitPakin();
+ if (Cools.isEmpty(mat)) {
+ MatV2 matV2 = matV2Service.selectOne(new EntityWrapper<MatV2>().eq("matnr", detlDto.getMatnr()));
+ if(Cools.isEmpty(matV2)){
+ throw new CoolException(detlDto.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
+ }
+ waitPakin.sync(matV2);
+ waitPakin.setBrand("缁勪欢");
+ } else {
+ waitPakin.sync(mat);
+ }
+ // 鏍￠獙鏄惁涓篵om鍏ュ簱 bom鍏ュ簱鐨勬暟閲忎笉鑳借秴杩囧簱瀛樺師鏈夋暟閲�
+ if (!Cools.isEmpty(param.getBomCode())) {
+ BomMat bomMat = bomMatService.selectOne(new EntityWrapper<BomMat>().eq("bom_num", param.getBomCode()).eq("element_num", detlDto.getMatnr()));
+ Double bomQyt = locDetlService.getBomQyt(param.getBomCode(), detlDto.getMatnr());
+ if (!Cools.isEmpty(bomQyt)) {
+ bomMat.setZpalletAnfme(bomMat.getZpalletAnfme() - bomQyt);
+ }
+ Double bomQty = wrkDetlService.getBomQty(param.getBomCode(), detlDto.getMatnr());
+ if (!Cools.isEmpty(bomQty)) {
+ bomMat.setZpalletAnfme(bomMat.getZpalletAnfme() - bomQty);
+ }
+ if (bomMat.getZpalletAnfme() == 0.0D) {
+ throw new CoolException(detlDto.getMatnr() + "褰撳墠鐗╂枡宸插叆鏈�澶ф暟閲�");
+ } else {
+ if (bomMat.getZpalletAnfme() < detlDto.getAnfme()) {
+ throw new CoolException(detlDto.getMatnr() + "褰撳墠鐗╂枡鏈�澶氬彲鍏�" + bomMat.getZpalletAnfme() + "浠�");
+ }
+ }
+ }
+ waitPakin.setBatch(detlDto.getBatch());
+ waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
+ waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
+ waitPakin.setAnfme(detlDto.getAnfme()); // 鏁伴噺
+ waitPakin.setStatus("Y"); // 鐘舵��
+ waitPakin.setAppeUser(userId);
+ waitPakin.setBomCode(param.getBomCode());
+ waitPakin.setAppeTime(now);
+ waitPakin.setModiUser(userId);
+ waitPakin.setModiTime(now);
+ if (!waitPakinService.insert(waitPakin)) {
+ throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
+ }
+ }
+ // 鍏宠仈缁勬墭
+ } else {
+ for (CombParam.CombMat combMat : param.getCombMats()) {
+ // 鐢熸垚鍏ュ簱閫氱煡妗�
+ Order order = orderService.selectByNo(combMat.getOrderNo());
+
+ //鍒ゆ柇璁㈠崟绫诲瀷鏄惁鏄叆搴�
+ DocType docType=docTypeService.selectById(order.getDocType());
+ if(docType.getPakin()!=1 || docType.getStatus()!=1){
+ throw new CoolException("璁㈠崟涓哄嚭搴撹鍗曪紝涓嶈兘缁勬墭锛�");
+ }
+
+ if (order.getSettle() > 2) {
+ throw new CoolException("鍗曟嵁缂栧彿宸茶繃鏈�");
+ }
+ OrderDetl orderDetl = orderDetlService.selectItem(combMat.getOrderNo(), combMat.getMatnr(), combMat.getBatch(), combMat.getBomCode(), combMat.getThreeCode());
+ if (orderDetl == null) {
+ throw new CoolException("鎵句笉鍒扮粍鎵樼殑鍗曟嵁鏄庣粏");
+ }
+ //璁㈠崟鏁�-宸ヤ綔涓殑鏁伴噺-缁勬墭鏁伴噺
+ if ( orderDetl.getAnfme() - orderDetl.getWorkQty() - combMat.getAnfme()<0) {
+ throw new CoolException("缁勬墭鏁伴噺宸茶秴鍑鸿鍗曢渶姹傞噺锛岃妫�鏌ユ槸鍚︽湁鍏朵粬鐨勭粍鎵樺凡瀹屾垚");
+ }
+ // 淇敼璁㈠崟浣滀笟鏁伴噺
+ if (!orderDetlService.increaseWorkQty(order.getId(), combMat.getMatnr(), combMat.getBatch(), combMat.getBomCode(),combMat.getThreeCode(), combMat.getAnfme())) {
+ throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
+ }
+ Mat mat = matService.selectByMatnr(combMat.getMatnr());
+ if (Cools.isEmpty(mat)) {
+ throw new CoolException(combMat.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
+ }
+ WaitPakin waitPakin = new WaitPakin();
+ waitPakin.sync(mat);
+ waitPakin.setOrderNo(order.getOrderNo()); // 鍗曟嵁缂栧彿
+ waitPakin.setBomCode(combMat.getBomCode());
+ waitPakin.setThreeCode(combMat.getThreeCode());
+ waitPakin.setBatch(combMat.getBatch());
+ waitPakin.setIsFull(param.getIsFull().equals("1") ? "Y" : "N"); // 搴忓垪鐮�
+ waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
+ waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
+ waitPakin.setAnfme(combMat.getAnfme()); // 鏁伴噺
+ waitPakin.setStatus("Y"); // 鐘舵��
+ waitPakin.setAppeUser(userId);
+ waitPakin.setAppeTime(now);
+ waitPakin.setModiUser(userId);
+ waitPakin.setModiTime(now);
+ if (!waitPakinService.insert(waitPakin)) {
+ throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
+ }
+
+// DetlDto detlDto = new DetlDto(combMat.getMatnr(), combMat.getBatch(), combMat.getAnfme());
+// if (DetlDto.has(detlDtos, detlDto)) {
+// DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
+// assert one != null;
+// one.setAnfme(one.getAnfme() + detlDto.getAnfme());
+// } else {
+// }
+ orderService.updateSettle(order.getId(), 2L, userId);
+ }
+
+ }
+
+ }
+
+
+ @Override
+ @Transactional
+ public List<LocMast> checkFullplt(CombParam.CombMat param, Long userId) {
+ // 鏌ヨ鍖呭惈寰呯粍鎵樼墿鏂欏湪搴撳瓨涓槸鍚﹀瓨鍦�
+ List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>()
+ .eq("three_code", param.getThreeCode())
+ .eq("bom_code", param.getBomCode()));
+ if (Cools.isEmpty(locDetls)) {
+ throw new CoolException("搴撳瓨涓病鏈夊瓨鍦ㄥ綋鍓嶇墿鏂欐墍浣跨敤鐨勯攢鍞崟鍙�");
+ }
+ ArrayList<LocMast> locMasts = new ArrayList<>();
+
+ locDetls.forEach(locDetl -> {
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetl.getLocNo()));
+ if (!Cools.isEmpty(locMast)) {
+ if (!locMasts.contains(locMast)) {
+ locMasts.add(locMast);
+ }
+ }
+ });
+ return locMasts;
+ }
+
+
+
@Override
@Transactional
public void mergeComb(CombParam param, Long userId) {
@@ -422,8 +616,6 @@
Date now = new Date();
for (CombParam.CombMat combMat : param.getCombMats()) {
Mat mat = matService.selectByMatnr(combMat.getMatnr());
-
-
LocDetl locDetl = new LocDetl();
locDetl.sync(mat);
locDetl.setLocNo(wrkMast.getSourceLocNo());
@@ -445,6 +637,82 @@
@Override
@Transactional
+ public void mergeComb2(CombParam param, Long userId) {
+ if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {
+ throw new CoolException(BaseRes.PARAM);
+ }
+ if(param.getCombMats().stream().anyMatch(obj -> obj.getAnfme() == null)){
+ throw new CoolException("鍏ュ簱鐗╂枡鏁伴噺涓嶈兘涓虹┖");
+ }
+ // 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
+ if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
+ eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
+ throw new CoolException(param.getBarcode() + "鏁版嵁姝ｅ湪杩涜鍏ュ簱");
+ }
+
+ int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
+ WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());
+ if (wrkMast.getWrkSts() != 14L) {
+ throw new CoolException("褰撳墠鎵樼洏鍑哄簱鏈畬鎴愶紒");
+ }
+
+ //璁剧疆闈瀗ull鎵瑰彿锛�
+ for (CombParam.CombMat combMat : param.getCombMats()) {
+ if (combMat.getBatch() == null){
+ combMat.setBatch("");
+ }
+ }
+
+ Date now = new Date();
+ for (CombParam.CombMat combMat : param.getCombMats()) {
+ Mat mat = matService.selectByMatnr(combMat.getMatnr());
+ WrkDetl wrkDetl = new WrkDetl();
+ wrkDetl.sync(mat);
+ wrkDetl.setWrkNo(wrkMast.getWrkNo());
+ wrkDetl.setZpallet(param.getBarcode());
+ wrkDetl.setOrderNo(combMat.getOrderNo());
+ wrkDetl.setBatch(combMat.getBatch());
+ wrkDetl.setBomCode(combMat.getBomCode());
+ wrkDetl.setThreeCode(combMat.getThreeCode());
+ wrkDetl.setAnfme(combMat.getAnfme());
+ wrkDetl.setAppeTime(now);
+ wrkDetl.setAppeUser(userId);
+ wrkDetl.setModiTime(now);
+ wrkDetl.setModiUser(userId);
+ wrkDetl.setMemo("骞舵澘");
+ wrkDetlService.insert(wrkDetl);
+ // 鍚屾璁㈠崟
+ OrderDetl orderDetl = orderDetlService.selectItem(combMat.getOrderNo(), combMat.getMatnr(), combMat.getBatch(), combMat.getBomCode(), combMat.getThreeCode());
+ orderDetl.setQty(orderDetl.getWorkQty() + combMat.getAnfme());
+ orderDetlService.update(orderDetl,new EntityWrapper<OrderDetl>()
+ .eq("order_no", combMat.getOrderNo())
+ .eq("matnr", combMat.getMatnr())
+ .eq("batch", combMat.getBatch())
+ .eq("bom_code", combMat.getBomCode())
+ .eq("three_code", combMat.getThreeCode()));
+ }
+ }
+
+ @Override
+ @Transactional
+ public void mergeOut(String locNo,String staNo, Long userId) {
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locNo));
+ if (!locMast.getLocSts().equals("F")) {
+ throw new CoolException("褰撳墠搴撲綅鐘舵�佷笉鏄湪搴撶姸鎬佷笉鑳藉嚭搴�");
+ }
+ List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", locNo));
+ // 鑾峰彇搴撲綅鏄庣粏
+ List<LocDetlDto> locDetlDtos = new ArrayList<>();
+ for (LocDetl locDetl : locDetls) {
+ locDetlDtos.add(new LocDetlDto(locDetl, locDetl.getAnfme()));
+
+ }
+ BasDevp basDevp = basDevpService.selectById(staNo);
+ workService.stockOut(basDevp, locDetlDtos, IoWorkType.MERGE_OUT, userId);
+ }
+
+ @Override
+ @Transactional
public R checkBom(CheckBom param, Long userId) {
--
Gitblit v1.9.1