From a184ffdb8a61fc232c4e2dc3da2a3afa83efe4cb Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期四, 16 五月 2024 11:03:38 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 287 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 251 insertions(+), 36 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 fd8233c..163d97b 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -3,20 +3,17 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.core.common.BaseRes;
-import com.core.common.Cools;
-import com.core.common.DateUtils;
-import com.core.common.SnowflakeIdWorker;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.core.common.*;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
-import com.zy.asrs.entity.param.CombParam;
-import com.zy.asrs.entity.param.MobileAdjustParam;
-import com.zy.asrs.entity.param.OpenOrderPakinParam;
+import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.*;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.WorkLogHandler;
import com.zy.asrs.utils.MatUtils;
import com.zy.asrs.utils.SaasUtils;
+import com.zy.asrs.utils.Utils;
import com.zy.common.constant.MesConstant;
import com.zy.common.entity.Parameter;
import com.zy.common.model.DetlDto;
@@ -70,18 +67,63 @@
private ManLocDetlService manLocDetlService;
@Autowired
private WaitPakinLogService waitPakinLogService;
+ @Autowired
+ private NodeService nodeService;
+ @Autowired
+ private ManPakOutService manPakOutService;
+ @Autowired
+ private LocDetlService locDetlService;
@Override
@Transactional
public void comb(CombParam param, Long userId) {
- if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {
- throw new CoolException(BaseRes.PARAM);
- }
+// 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() + "鏁版嵁姝ｅ湪杩涜鍏ュ簱");
}
+
+ //鍒ゆ柇鎵樼洏鏄惁宸茬粡鍦ㄥ簱
+ if (locDetlService.selectCount(new EntityWrapper<LocDetl>()
+ .eq("zpallet", param.getBarcode())) > 0) {
+ throw new CoolException(param.getBarcode() + "鏁版嵁宸茬粡鍦ㄥ簱");
+ }
+
+ //鍒ゆ柇鏄惁瀛樺湪鏂欑鐮� => 瀛樺湪鏂欑鐮佸垯瑕佹眰鎻愪氦涓婃潵鐨勭墿鏂檒ist蹇呴』鍏ㄩ儴閮芥湁鏂欑鐮�
+ boolean hasContainerCode = false;
+ int containerCodeCount = 0;//鏂欑鐮佹暟閲�
+ for (CombParam.CombMat combMat : param.getCombMats()) {
+ if (combMat.getContainerCode() != null) {
+ hasContainerCode = true;
+ containerCodeCount++;
+ continue;
+ }
+ }
+
+ //鍒ゆ柇鏂欑鏄惁宸茬粡鍑虹幇鍦ㄥ叆搴撻�氱煡妗ｃ�佸簱瀛樹腑
+ if (hasContainerCode) {
+ if (containerCodeCount != param.getCombMats().size()) {
+ throw new CoolException(param.getBarcode() + "鎵樼洏鏈�" + (param.getCombMats().size()-containerCodeCount) + "涓湭鎵弿鐨勬枡绠�");
+ }
+
+ for (CombParam.CombMat combMat : param.getCombMats()) {
+ //鍒ゆ柇鏂欑鏄惁姝ｅ湪鍏ュ簱
+ if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
+ eq("supp_code", combMat.getContainerCode()).eq("io_status", "N")) > 0) {
+ throw new CoolException(combMat.getContainerCode() + "鏂欑姝ｅ湪杩涜鍏ュ簱");
+ }
+
+ //鍒ゆ柇鏂欑鏄惁宸茬粡鍦ㄥ簱
+ if (locDetlService.selectCount(new EntityWrapper<LocDetl>()
+ .eq("supp_code", combMat.getContainerCode())) > 0) {
+ throw new CoolException(combMat.getContainerCode() + "鏂欑宸茬粡鍦ㄥ簱");
+ }
+ }
+ }
+
// todo: 涓嶄笅绾块噸鏂板叆搴�
WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());
@@ -100,9 +142,7 @@
// 鐢熸垚鍏ュ簱閫氱煡妗�
List<DetlDto> detlDtos = new ArrayList<>();
param.getCombMats().forEach(elem -> {
- DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(), elem.getCsocode(), elem.getIsoseq());
- detlDto.setContainerCode(elem.getContainerCode());
-
+ DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(), elem.getCsocode(), elem.getIsoseq(),elem.getContainerCode());
if (DetlDto.has(detlDtos, detlDto)) {
DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch(),detlDto.getCsocode(),detlDto.getIsoseq(),detlDto.getContainerCode());
assert one != null;
@@ -148,18 +188,16 @@
param.getCombMats().forEach(elem -> {
// 璁㈠崟鏄庣粏鏁伴噺鏍￠獙
- OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), elem.getMatnr(), elem.getBatch());
+ OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), elem.getMatnr(), elem.getBatch(),elem.getCsocode(),elem.getIsoseq());
if (elem.getAnfme() > orderDetl.getEnableQty()) {
throw new CoolException(orderDetl.getMatnr() + "鍏ュ簱鏁伴噺涓嶅悎娉�");
}
// 淇敼璁㈠崟鏄庣粏鏁伴噺
- if (!orderDetlService.increase(order.getId(), elem.getMatnr(), elem.getBatch(), elem.getAnfme())) {
+ if (!orderDetlService.increase(order.getId(), elem.getMatnr(), elem.getBatch(), elem.getAnfme(),elem.getCsocode(),elem.getIsoseq())) {
throw new CoolException("淇敼鍗曟嵁鏄庣粏鏁伴噺澶辫触");
}
- DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),elem.getCsocode(),elem.getIsoseq());
- detlDto.setContainerCode(elem.getContainerCode());
-
+ DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),elem.getCsocode(),elem.getIsoseq(),elem.getContainerCode());
if (DetlDto.has(detlDtos, detlDto)) {
DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch(),detlDto.getCsocode(),detlDto.getIsoseq(),detlDto.getContainerCode());
assert one != null;
@@ -394,12 +432,12 @@
// 淇敼浣滀笟鏁伴噺 ----------------------------------------
// 璁㈠崟鏄庣粏鏁伴噺鏍￠獙
- OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), detlDto.getMatnr(), detlDto.getBatch());
+ OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), detlDto.getMatnr(), detlDto.getBatch(),detlDto.getCsocode(),detlDto.getIsoseq());
if (detlDto.getAnfme() > orderDetl.getEnableQty()) {
throw new CoolException(orderDetl.getMatnr() + "鍏ュ簱鏁伴噺涓嶅悎娉�");
}
// 淇敼璁㈠崟鏄庣粏鏁伴噺
- if (!orderDetlService.increase(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
+ if (!orderDetlService.increase(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme(),detlDto.getCsocode(),detlDto.getIsoseq())) {
throw new CoolException("淇敼鍗曟嵁鏄庣粏鏁伴噺澶辫触");
}
@@ -446,47 +484,224 @@
//澧炲姞骞冲簱搴撳瓨
List<WaitPakin> waitPakinList = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", zpallet));
- waitPakinList.forEach(waitPakin -> {
+ if(Cools.isEmpty(waitPakinList)){
+ throw new CoolException("璇ユ墭鐩樼爜鏈粍鎵�");
+ }
+
+ waitPakinList.forEach(waitPakin -> {
//鏂欐兂鐮�
String containerCode = waitPakin.getSuppCode();
- //濡傛灉褰撳墠鏂欐兂鐮佸凡瀛樺湪锛屽垯淇敼璇ユ枡鎯崇殑鐗╂枡鏁伴噺
- ManLocDetl manLocDetl = manLocDetlService.selectOne(new EntityWrapper<ManLocDetl>().eq("container_code", containerCode));
+ //濡傛灉褰撳墠搴撲綅宸插瓨鍦ㄨ揣鐗�
+ Wrapper<ManLocDetl> wrapper = new EntityWrapper<ManLocDetl>().eq("loc_no", locNo).eq("matnr",waitPakin.getMatnr());
+ Utils.wapperSetCondition(wrapper,"container_code",containerCode);
+ Utils.wapperSetCondition(wrapper,"batch",waitPakin.getBatch());
+ Utils.wapperSetCondition(wrapper,"csocode",waitPakin.getThreeCode());
+ Utils.wapperSetCondition(wrapper,"isoseq",waitPakin.getDeadTime());
+ ManLocDetl manLocDetl = manLocDetlService.selectOne(wrapper);
if(Cools.isEmpty(manLocDetl)){
- saveManlocDetl(manLocDetl,waitPakin,now,locNo);
+ saveManlocDetl(waitPakin,now,locNo);
}else{
- if(Cools.eq(manLocDetl.getMatnr(),waitPakin.getMatnr())
- && Cools.eq(manLocDetl.getCsocode(),waitPakin.getThreeCode())
- && Cools.eq(manLocDetl.getIsoseq(),waitPakin.getDeadTime())){
- manLocDetl.setAnfme(manLocDetl.getAnfme() + waitPakin.getAnfme());
- manLocDetlService.update(manLocDetl,new EntityWrapper<ManLocDetl>()
- .eq("loc_no",manLocDetl.getLocNo())
- .eq("container_code",manLocDetl.getContainerCode()));
- }else{
- saveManlocDetl(manLocDetl,waitPakin,now,locNo);
- }
+ manLocDetl.setAnfme(manLocDetl.getAnfme() + waitPakin.getAnfme());
+ manLocDetlService.update(manLocDetl,wrapper);
+
}
//鐢熸垚骞冲簱鍏ュ嚭搴撴棩蹇�
SaasUtils.insertLog(0,locNo,waitPakin.getMatnr(), waitPakin.getAnfme(),user.getUsername());
});
+ Node node = nodeService.selectByUuid(locNo);
+ node.setStatus(0);
+ nodeService.updateById(node);
+
//鐢熸垚鍏ュ簱閫氱煡鍘嗗彶妗�
waitPakinLogService.save(zpallet);
//鍒犻櫎鍏ュ簱閫氱煡妗�
waitPakinService.delete(new EntityWrapper<WaitPakin>().eq("zpallet", zpallet));
+ orderService.checkComplete(waitPakinList.get(0).getOrderNo());
+
+
}
- private void saveManlocDetl(ManLocDetl manLocDetl, WaitPakin waitPakin, Date now, String locNo){
- manLocDetl = new ManLocDetl();
+ @Transactional
+ public void nodePakout(NodePakoutParam param, User user) {
+ Node node = nodeService.selectOne(new EntityWrapper<Node>().eq("name", param.getLocNo()));
+ Order order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no", param.getOrderNo()));
+ if (Cools.isEmpty(node, order)) {
+ throw new CoolException("鍙傛暟涓虹┖");
+ }
+ //鏌ヨ褰撳墠鐗╂枡鐨勮鍗曡鎯�
+ Wrapper<OrderDetl> orderDetlWrapper = new EntityWrapper<OrderDetl>().eq("order_no", param.getOrderNo()).eq(false, "status", 1);
+ Utils.wapperSetCondition(orderDetlWrapper,"three_code",param.getCsocode());
+ Utils.wapperSetCondition(orderDetlWrapper,"dead_time",param.getIsoseq());
+ Utils.wapperSetCondition(orderDetlWrapper,"matnr",param.getMatnr());
+
+ //Utils.confirmOnlyMat(orderDetlWrapper,param.getMatnr(),param.getCsocode(),param.getIsoseq());
+ OrderDetl orderDetl = orderDetlService.selectOne(orderDetlWrapper);
+ //鏌ヨ褰撳墠鎷ｈ揣鍗曚俊鎭�
+ Wrapper<ManPakOut> manPakOutWrapper = new EntityWrapper<ManPakOut>().eq("wrk_no", param.getWrkNo());
+ ManPakOut manPakOut = manPakOutService.selectOne(manPakOutWrapper);
+ if(Cools.isEmpty(manPakOut) || manPakOut.getStatus() == 1){
+ throw new CoolException("褰撳墠鎷ｈ揣鐮佸凡缁忓畬鎴愭嫞璐�");
+ }
+ //鏌ヨ搴撳瓨淇℃伅
+ Wrapper<ManLocDetl> manLocDetlWrapper = new EntityWrapper<ManLocDetl>().eq("loc_no", param.getLocNo());
+ Utils.confirmOnlyMat(manLocDetlWrapper,param.getMatnr(),param.getCsocode(),param.getIsoseq());
+ ManLocDetl manLocDetl = manLocDetlService.selectOne(manLocDetlWrapper);
+
+ //鏍规嵁瀹為檯鍑哄簱鏁伴噺鎵ｅ噺搴撳瓨
+ if(Double.doubleToLongBits(param.getAnfme()) != Double.doubleToLongBits(manPakOut.getAnfme())){
+ if(param.getAnfme() > manLocDetl.getAnfme() || (param.getAnfme() - manPakOut.getAnfme()) > (orderDetl.getAnfme() - orderDetl.getQty())){
+ throw new CoolException("鍑哄簱鏁伴噺涓嶅緱澶т簬璁㈠崟鏁伴噺鎴栬�呭簱瀛樻暟閲�");
+ }
+ //鏍规嵁瀹為檯鍑哄簱鏁伴噺鍥炲啓鎷ｈ揣鍗�
+ manPakOut.setCount(param.getAnfme());
+ if(manPakOut.getCount() < manPakOut.getAnfme()){
+ manPakOut.setStatus(8);
+ }
+ //鏍规嵁瀹為檯鍑哄簱鏁伴噺鍥炲啓璁㈠崟璇︽儏
+ orderDetl.setQty(orderDetl.getQty() - (param.getAnfme()-manPakOut.getAnfme()));
+ orderDetlService.update(orderDetl,orderDetlWrapper);
+
+ }else {
+ manPakOut.setCount(param.getAnfme());
+ manPakOut.setStatus(1);
+ }
+
+ manPakOutService.update(manPakOut,manPakOutWrapper);
+ //妫�鏌ヨ璁㈠崟涓嬬殑鎷ｈ揣鍗曟槸鍚﹀凡缁忓叏閮ㄥ嚭搴�
+ int status = checkManPakoutByOrder(param.getOrderNo());
+ manPakOutService.updateAllStatus(param.getOrderNo(),status);
+
+
+ //淇敼搴撳瓨
+ manLocDetl.setAnfme(manLocDetl.getAnfme()-manPakOut.getCount());
+ if (manLocDetl.getAnfme() == 0 ){
+ checkNodeStatus(manLocDetl.getLocNo());
+ manLocDetlService.delete(manLocDetlWrapper);
+ }else{
+ manLocDetl.setStatus(1);
+ manLocDetlService.update(manLocDetl,manLocDetlWrapper);
+ }
+ SaasUtils.insertLog(1,manLocDetl.getLocNo(),manLocDetl.getMatnr(), manLocDetl.getAnfme(),user.getUsername());
+ manLocDetl.setStatus(1);
+ manLocDetlService.update(manLocDetl,manLocDetlWrapper);
+
+ //妫�娴嬭鍗曟槸鍚﹀畬鎴�
+ orderService.checkComplete(param.getOrderNo());
+
+ }
+
+ @Transactional
+ public void modifyWrkDetl(List<WrkDetl> wrkDetls, List<ModifyPakoutParam.CA> params, Long userId) {
+
+ wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no",wrkDetls.get(0).getWrkNo()));
+
+ params.forEach(param ->{
+ WrkDetl wrkDetl = new WrkDetl();
+ LocDetl locDetl = locDetlService.selectByContainerCode(param.getContainerCode());
+ BeanUtils.copyProperties(locDetl,wrkDetl);
+ wrkDetl.setWrkNo(wrkDetls.get(0).getWrkNo());
+ if(wrkDetl.getAnfme() < param.getAnfme()){
+ throw new CoolException("鏂欑"+param.getContainerCode()+"鐨勭墿鏂欐暟閲忓皬浜庢嫞鏂欐暟閲忥紝璇烽噸鏂版牳瀵�");
+ }
+ wrkDetl.setAnfme(param.getAnfme());
+ wrkDetl.setModiTime(new Date());
+ wrkDetl.setAppeTime(new Date());
+ wrkDetl.setModiUser(userId);
+ wrkDetlService.insert(wrkDetl);
+
+ });
+ }
+
+ @Override
+ public void nodePakinNoComb(CombParam param) {
+ if(Cools.isEmpty(param.getLocno())){
+ throw new CoolException("搴撲綅鍙锋湭濉啓锛屾棤娉曞叆搴�");
+ }
+ param.getCombMats().forEach(combMat -> {
+ Wrapper<ManLocDetl> wrapper = new EntityWrapper<ManLocDetl>().eq("loc_no", param.getLocno()).eq("matnr",combMat.getMatnr());
+ Utils.wapperSetCondition(wrapper,"container_code",combMat.getContainerCode());
+ Utils.wapperSetCondition(wrapper,"batch",combMat.getBatch());
+ Utils.wapperSetCondition(wrapper,"csocode",combMat.getCsocode());
+ Utils.wapperSetCondition(wrapper,"isoseq",combMat.getIsoseq());
+ ManLocDetl manLocDetl = manLocDetlService.selectOne(wrapper);
+ if(Cools.isEmpty(manLocDetl)){
+ saveManlocDetl(combMat,param.getLocno());
+ }else{
+ manLocDetl.setAnfme(manLocDetl.getAnfme() + combMat.getAnfme());
+ manLocDetlService.update(manLocDetl,wrapper);
+ }
+ //鐢熸垚骞冲簱鍏ュ嚭搴撴棩蹇�
+ SaasUtils.insertLog(0,param.getLocno(),combMat.getMatnr(), combMat.getAnfme(),"");
+ });
+
+ }
+
+ private boolean saveManlocDetl(CombParam.CombMat combMat, String locNo){
+ Node node = nodeService.selectOne(new EntityWrapper<Node>()
+ .eq("name", locNo));
+ Mat mat = matService.selectByMatnr(combMat.getMatnr());
+ ManLocDetl manLocDetl = new ManLocDetl();
+ BeanUtils.copyProperties(mat,manLocDetl);
+ manLocDetl.setAnfme(combMat.getAnfme());
+ manLocDetl.setNodeId(node.getId());
+ manLocDetl.setContainerCode(combMat.getContainerCode());
+ manLocDetl.setCsocode(combMat.getCsocode());
+ manLocDetl.setIsoseq(combMat.getIsoseq());
+ manLocDetl.setCreateTime(new Date());
+ manLocDetl.setModiTime(new Date());
+ manLocDetl.setLocNo(locNo);
+ manLocDetl.setStatus(1);
+ return manLocDetlService.insert(manLocDetl);
+ }
+
+ private void saveManlocDetl(WaitPakin waitPakin, Date now, String locNo){
+
+ Node node = nodeService.selectOne(new EntityWrapper<Node>()
+ .eq("name", locNo));
+
+ ManLocDetl manLocDetl = new ManLocDetl();
BeanUtils.copyProperties(waitPakin,manLocDetl);
+ manLocDetl.setNodeId(node.getId());
manLocDetl.setContainerCode(waitPakin.getSuppCode());
manLocDetl.setCsocode(waitPakin.getThreeCode());
manLocDetl.setIsoseq(waitPakin.getDeadTime());
manLocDetl.setCreateTime(now);
manLocDetl.setModiTime(now);
manLocDetl.setLocNo(locNo);
+ manLocDetl.setStatus(1);
manLocDetlService.insert(manLocDetl);
}
+ private int checkManPakoutByOrder(String orderNo){
+ int status = 0;
+ List<ManPakOut> manPakOutList = manPakOutService.selectList(new EntityWrapper<ManPakOut>().eq("doc_num", orderNo));
+
+ for(int i=0; i<manPakOutList.size(); i++){
+ if(i == 0){
+ status = manPakOutList.get(i).getStatus();
+ }else {
+ if(manPakOutList.get(i).getStatus() != status){
+ status = 8;
+ }
+ }
+ }
+
+ return status;
+
+ }
+
+ private void checkNodeStatus(String locNo){
+ ManLocDetl manLocDetl = manLocDetlService.selectOne(new EntityWrapper<ManLocDetl>().eq("loc_no", locNo));
+ //濡傛灉搴撳瓨淇℃伅涓病鏈夋敼搴撲綅锛屽垯淇敼搴撲綅鐘舵�佷负1
+ if(Cools.isEmpty(manLocDetl)){
+ Node node = nodeService.selectByUuid(locNo);
+ node.setStatus(1);
+ nodeService.updateById(node);
+ }
+ }
+
+
}
--
Gitblit v1.9.1