From 7db0b0e7c13676da1c771c915a7925689d3c09c4 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 20 四月 2022 16:39:00 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 265 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 234 insertions(+), 31 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 fd0a2c1..8ab62e4 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -4,66 +4,95 @@
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.MatCode;
-import com.zy.asrs.entity.Order;
-import com.zy.asrs.entity.OrderDetl;
-import com.zy.asrs.entity.WaitPakin;
+import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.CombParam;
+import com.zy.asrs.entity.param.MobileAdjustParam;
import com.zy.asrs.service.*;
-import com.zy.asrs.utils.VersionUtils;
+import com.zy.common.entity.Parameter;
+import com.zy.common.model.DetlDto;
+import lombok.extern.slf4j.Slf4j;
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.Iterator;
+import java.util.List;
/**
* 绉诲姩绔湇鍔℃牳蹇冪被
* Created by vincent on 2020/6/28
*/
+@Slf4j
@Service
public class MobileServiceImpl implements MobileService {
@Autowired
- private MatCodeService matCodeService;
+ private MatService matService;
@Autowired
private WaitPakinService waitPakinService;
@Autowired
private OrderService orderService;
@Autowired
private OrderDetlService orderDetlService;
+ @Autowired
+ private BasDevpService basDevpService;
+ @Autowired
+ private WrkMastService wrkMastService;
+ @Autowired
+ private WrkDetlService wrkDetlService;
+ @Autowired
+ private PackService packService;
@Override
@Transactional
public void comb(CombParam param, Long userId) {
- if (Cools.isEmpty(param.getBarcode()) || param.getCombMats().isEmpty()) {
+ if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {
throw new CoolException(BaseRes.PARAM);
}
// 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
- throw new CoolException("鏉＄爜鏁版嵁宸插瓨鍦�");
+ throw new CoolException(param.getBarcode() + "鏁版嵁姝ｅ湪杩涜鍏ュ簱");
}
+ Date now = new Date();
+
// 鏃犲崟缁勬墭
if (Cools.isEmpty(param.getOrderNo())) {
- for (CombParam.CombMat combMat : param.getCombMats()) {
- MatCode matCode = matCodeService.selectById(combMat.getMatNo());
- if (Cools.isEmpty(matCode)) {
- throw new CoolException("鐗╂枡鏁版嵁閿欒");
+
+ // 鐢熸垚鍏ュ簱閫氱煡妗�
+ 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());
+ if (Cools.isEmpty(mat)) {
+ throw new CoolException(detlDto.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
}
WaitPakin waitPakin = new WaitPakin();
+ waitPakin.sync(mat);
+ waitPakin.setBatch(detlDto.getBatch());
waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
- waitPakin.setStatus("Y"); // 鐘舵��
- waitPakin.setAnfme(combMat.getCount()); // 鏁伴噺
waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
+ waitPakin.setAnfme(detlDto.getAnfme()); // 鏁伴噺
+ waitPakin.setStatus("Y"); // 鐘舵��
waitPakin.setAppeUser(userId);
- waitPakin.setAppeTime(new Date());
+ waitPakin.setAppeTime(now);
waitPakin.setModiUser(userId);
- waitPakin.setModiTime(new Date());
- VersionUtils.setWaitPakIn(waitPakin, matCode);
-
+ waitPakin.setModiTime(now);
if (!waitPakinService.insert(waitPakin)) {
- throw new CoolException("淇濆瓨鏁版嵁澶辫触");
+ throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
}
}
// 鍏宠仈缁勬墭
@@ -72,32 +101,206 @@
if (order.getSettle() > 2) {
throw new CoolException("鍗曟嵁缂栧彿宸茶繃鏈�");
}
- for (CombParam.CombMat comb : param.getCombMats()) {
- OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), comb.getMatNo(), comb.getBatch());
- if (comb.getCount() > orderDetl.getEnableQty()) {
+ // 鐢熸垚鍏ュ簱閫氱煡妗�
+ List<DetlDto> detlDtos = new ArrayList<>();
+ param.getCombMats().forEach(elem -> {
+
+ // 璁㈠崟鏄庣粏鏁伴噺鏍￠獙
+ OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), elem.getMatnr(), elem.getBatch());
+ if (elem.getAnfme() > orderDetl.getEnableQty()) {
throw new CoolException(orderDetl.getMatnr() + "鍏ュ簱鏁伴噺涓嶅悎娉�");
}
- // 淇敼鍗曠粏鏁伴噺
- if (!orderDetlService.increase(order.getId(), comb.getMatNo(), comb.getBatch(), comb.getCount())) {
+ // 淇敼璁㈠崟鏄庣粏鏁伴噺
+ if (!orderDetlService.increase(order.getId(), elem.getMatnr(), elem.getBatch(), elem.getAnfme())) {
throw new CoolException("淇敼鍗曟嵁鏄庣粏鏁伴噺澶辫触");
}
- // 娣诲姞鍏ュ簱閫氱煡妗�
+
+ 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());
+ if (Cools.isEmpty(mat)) {
+ throw new CoolException(detlDto.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
+ }
WaitPakin waitPakin = new WaitPakin();
+ waitPakin.sync(mat);
+ waitPakin.setOrderNo(order.getOrderNo()); // 鍗曟嵁缂栧彿
+ waitPakin.setBatch(detlDto.getBatch()); // 鎵瑰彿
waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
- waitPakin.setStatus("Y"); // 鐘舵��
- waitPakin.setAnfme(comb.getCount()); // 鏁伴噺
waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
+ waitPakin.setAnfme(detlDto.getAnfme()); // 鏁伴噺
+ waitPakin.setStatus("Y"); // 鐘舵��
waitPakin.setAppeUser(userId);
- waitPakin.setAppeTime(new Date());
+ waitPakin.setAppeTime(now);
waitPakin.setModiUser(userId);
- waitPakin.setModiTime(new Date());
-// VersionUtils.setWaitPakIn(waitPakin, orderDetl);
+ waitPakin.setModiTime(now);
if (!waitPakinService.insert(waitPakin)) {
- throw new CoolException("娣诲姞鍏ュ簱閫氱煡妗ｅけ璐�");
+ throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
+ }
+ }
+ orderService.updateSettle(order.getId(), 2L, userId);
+ }
+
+ }
+
+ @Override
+ @Transactional
+ public void adjust(MobileAdjustParam param, Long userId) {
+ BasDevp basDevp = basDevpService.selectById(param.getStaNo());
+ if (null == basDevp || basDevp.getWrkNo() == null) {
+ throw new CoolException(param.getStaNo() + "鐩樼偣绔欐棤鏁�");
+ }
+ if (!param.getWrkNo().equals(basDevp.getWrkNo())) {
+ throw new CoolException(param.getStaNo() + "鐩樼偣绔欐洿鏂帮紝璇烽噸鏂版绱�");
+ }
+ WrkMast wrkMast = wrkMastService.selectById(param.getWrkNo());
+ if (wrkMast.getWrkSts() < 10) {
+ throw new CoolException("鐩樼偣鏃犳晥锛屼换鍔″凡鐩樼偣鍐嶅叆搴�");
+ }
+ Date now = new Date();
+ List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
+
+ List<WrkDetl> list = param.getWrkDetls();
+
+ // 淇敼鏁伴噺
+ Iterator<WrkDetl> iterator = wrkDetls.iterator();
+ while (iterator.hasNext()) {
+ WrkDetl wrkDetl = iterator.next();
+ Iterator<WrkDetl> iterator1 = list.iterator();
+ while (iterator1.hasNext()) {
+ WrkDetl wrkDetl1 = iterator1.next();
+ if (wrkDetl1.getAnfme() == 0) {
+ iterator1.remove();
+ }
+ if (wrkDetl.getMatnr().equals(wrkDetl1.getMatnr()) && Cools.eq(wrkDetl.getBatch(), wrkDetl1.getBatch())) {
+ if (!wrkDetl.getAnfme().equals(wrkDetl1.getAnfme())) {
+ // todo 鐩樼偣璁板綍銆佷繚瀛樿皟鏁磋褰�
+ // 淇敼鏄庣粏
+ if (!wrkDetlService.updateAnfme(wrkDetl1.getAnfme(), wrkMast.getWrkNo(), wrkDetl.getMatnr(), wrkDetl.getBatch())) {
+ throw new CoolException(wrkMast.getWrkNo() + "鐩樼偣浠诲姟锛�" + wrkDetl.getMatnr() + "鍟嗗搧锛�" + wrkDetl.getBatch() + "鎵瑰彿淇敼鏁伴噺澶辫触");
+ }
+ }
+ iterator.remove();
+ iterator1.remove();
}
}
}
+ // 鍒犻櫎鏄庣粏
+ for (WrkDetl wrkDetl : wrkDetls) {
+ // todo 鐩樼偣璁板綍銆佷繚瀛樿皟鏁磋褰�
+ if (!wrkDetlService.updateAnfme(-1.0D, wrkMast.getWrkNo(), wrkDetl.getMatnr(), wrkDetl.getBatch())) {
+ throw new CoolException("鍒犻櫎" + wrkMast.getWrkNo() + "鐩樼偣浠诲姟锛�" + wrkDetl.getMatnr() + "鍟嗗搧锛�" + wrkDetl.getBatch() + "鎵瑰彿浠诲姟鏄庣粏澶辫触");
+ }
+ }
+
+ // 娣诲姞鏄庣粏
+ for (WrkDetl wrkDetl : list) {
+ if (wrkDetl.getAnfme() == 0.0D) { continue; }
+ // todo 鐩樼偣璁板綍銆佷繚瀛樿皟鏁磋褰�
+ String orderNo = wrkDetl.getOrderNo();
+ Mat mat = matService.selectByMatnr(wrkDetl.getMatnr());
+ wrkDetl.sync(mat);
+ wrkDetl.setOrderNo(orderNo);
+ wrkDetl.setModiTime(now);
+ wrkDetl.setModiUser(userId);
+ wrkDetl.setAppeTime(now);
+ wrkDetl.setAppeUser(userId);
+ if (!wrkDetlService.insert(wrkDetl)) {
+ throw new CoolException("娣诲姞" + wrkMast.getWrkNo() + "鐩樼偣浠诲姟锛�" + wrkDetl.getMatnr() + "鍟嗗搧锛�" + wrkDetl.getBatch() + "鎵瑰彿浠诲姟鏄庣粏澶辫触");
+ }
+ }
+
+ // 淇敼鐩樼偣浠诲姟涓绘。鐘舵��
+ wrkMast.setFullPlt(wrkDetlService.selectByWrkNo(wrkMast.getWrkNo()).size() != 0?"Y":"N");
+ wrkMast.setModiTime(now);
+ wrkMast.setModiUser(userId);
+ if (!wrkMastService.updateById(wrkMast)) {
+ throw new CoolException("淇敼鐩樼偣浠诲姟涓绘。澶辫触");
+ }
+
+ }
+
+ @Override
+ public void packComb(CombParam param, Long userId) {
+ if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {
+ throw new CoolException(BaseRes.PARAM);
+ }
+ // 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
+ if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
+ eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
+ throw new CoolException(param.getBarcode() + "鏁版嵁姝ｅ湪杩涜鍏ュ簱");
+ }
+ Date now = new Date();
+
+ boolean packDown = Parameter.get().getPackDown().equals("true");
+
+ // 鏃犲崟缁勬墭
+ if (Cools.isEmpty(param.getOrderNo())) {
+
+ // 鐢熸垚鍏ュ簱閫氱煡妗�
+ List<DetlDto> detlDtos = new ArrayList<>();
+ param.getCombMats().forEach(elem -> {
+ // 鎵撳寘涓婄嚎鏁版嵁鏍￠獙
+ if (packDown) {
+ Pack pack = packService.selectByBarcode(elem.getMatnr());
+ if (pack == null) {
+ throw new CoolException(elem.getMatnr() + "鏉＄爜鍐椾綑锛岃妫�鏌ワ紒");
+ }
+ if (pack.getSettle() != 1) {
+ throw new CoolException(elem.getMatnr() + "鏉＄爜宸蹭笅绾匡紝璇锋鏌ワ紒");
+ }
+ }
+ 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);
+ }
+ });
+
+ if (packDown) {
+ // 鏁版嵁涓婃姤 todo
+ }
+
+ for (DetlDto detlDto : detlDtos) {
+ Mat mat = matService.selectByMatnr(detlDto.getMatnr());
+ if (Cools.isEmpty(mat)) {
+ throw new CoolException(detlDto.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
+ }
+ WaitPakin waitPakin = new WaitPakin();
+ waitPakin.sync(mat);
+ waitPakin.setBatch(detlDto.getBatch());
+ waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
+ waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
+ waitPakin.setAnfme(detlDto.getAnfme()); // 鏁伴噺
+ waitPakin.setStatus("Y"); // 鐘舵��
+ waitPakin.setAppeUser(userId);
+ waitPakin.setAppeTime(now);
+ waitPakin.setModiUser(userId);
+ waitPakin.setModiTime(now);
+ if (!waitPakinService.insert(waitPakin)) {
+ throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
+ }
+ // 淇敼鎵撳寘鏁版嵁鐘舵��
+ Pack pack = packService.selectByBarcode(detlDto.getMatnr());
+ pack.setSettle(2L);
+ pack.setUpdateTime(now);
+ pack.setUpdateBy(userId);
+ if (!packService.updateById(pack)) {
+ throw new CoolException("淇敼鎵撳寘鏁版嵁寮傚父");
+ }
+ }
+ }
}
}
--
Gitblit v1.9.1