From b5749e71ad98172f5a128557ff20386cba2029db Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 28 二月 2024 16:21:59 +0800
Subject: [PATCH] 拣货单管理新增客户名称展示
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 79 +++++++++++++++++++++++++++++----------
1 files changed, 58 insertions(+), 21 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 9bf7fa4..a26480e 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -10,17 +10,16 @@
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
-import com.zy.asrs.entity.param.CombParam;
-import com.zy.asrs.entity.param.MobileAdjustNewParam;
-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.asrs.utils.SaasUtils;
+import com.zy.asrs.utils.Utils;
import com.zy.common.model.DetlDto;
import com.zy.common.service.CommonService;
import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
+import com.zy.system.service.SaasLogService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -100,6 +99,10 @@
private LocOwnerService locOwnerService;
@Autowired
private PlaService plaService;
+ @Autowired
+ private PlaQtyService plaQtyService;
+ @Autowired
+ private SaasLogService saasLogService;
@@ -660,7 +663,7 @@
}
orderService.checkComplete(order.getOrderNo());
- SaasUtils.insertLog(0,jsonLocNo,jsonOrderDetl.getMatnr(), jsonOrderDetl.getAnfme(),user.getUsername());
+ SaasUtils.insertLog(0,jsonLocNo,jsonOrderDetl.getMatnr(), jsonOrderDetl.getAnfme(),user.getUsername(),null,null,null);
}
@@ -801,7 +804,7 @@
return R.error("鏇存柊骞冲簱搴撳瓨鐘舵�佸け璐�");
}
}
- SaasUtils.insertLog(1,jsonLocNo,jsonOrderDetl.getMatnr(), jsonOrderDetl.getAnfme(),user.getUsername());
+ SaasUtils.insertLog(1,jsonLocNo,jsonOrderDetl.getMatnr(), jsonOrderDetl.getAnfme(),user.getUsername(),null,null,null);
}
return R.ok("涓嬫灦瀹屾垚");
@@ -1202,27 +1205,47 @@
}
@Override
- public void plaPakin(String locNo, String batch, String packageNo) {
+ public void plaPakin(String locNo, String batch, Integer packageNo,User user) {
Pla pla = plaService.selectByBatchAndPackageNo(batch, packageNo);
- if("宸插叆搴�".equals(pla.getStatus())){
- throw new CoolException("璇ョ墿鏂欏凡鍏ュ簱");
+ if(Cools.isEmpty(pla)){
+ throw new CoolException("绯荤粺鏈娴嬪埌璇ュ寘鐗╂枡淇℃伅锛岃閲嶆柊褰曞叆");
}
- pla.setStatus("宸插叆搴�");
+
+ if(!pla.getStatus().equals(GlobleParameter.PLA_STATUS_0)){
+ throw new CoolException("璇ョ墿鏂欑姸鎬佷笉涓哄緟鍏ュ簱锛屾棤娉曞叆搴�");
+ }
+
+ pla.setStatus(GlobleParameter.PLA_STATUS_1);
pla.setModifyTime(new Date());
+ pla.setPakinTime(new Date());
+
+ Node node = nodeService.selectByUuid(locNo);
+ if(Cools.isEmpty(node)){
+ throw new CoolException("搴撲綅淇℃伅涓嶆纭�");
+ }
+
+ pla.setStash(node.getParentName());
+ pla.setLocNo(node.getUuid());
+
plaService.updateById(pla);
+ SaasUtils.insertLog(0,locNo,pla.getBrand(),pla.getWeightAnfme(),user.getUsername(),null,pla.getBatch(),pla.getPackageNo());
}
@Override
@Transactional
- public void plaPakout(String locNo, String batch, String packageNo, String orderNo, String orderDetlId, String wrkNo, Double anfme) {
+ public void plaPakout(String locNo, String batch, Integer packageNo, String orderNo, String orderDetlId, String wrkNo, Double anfme) {
Pla pla = plaService.selectByBatchAndPackageNo(batch, packageNo);
- //Order order = orderService.selectByNo(orderNo);
- OrderDetl orderDetl = orderDetlService.selectById(orderDetlId);
+
ManPakOut manPakOut = manPakOutService.selectById(wrkNo);
+
+ PlaQty plaQty = plaQtyService.selectById(orderDetlId);
//鏇存柊鎷ｈ揣鍗曚俊鎭�
if(manPakOut.getCount() + anfme > manPakOut.getAnfme()){
throw new CoolException("鎷ｈ揣閲嶉噺澶т簬鎷ｈ揣鍗曟墍闇�鎷ｈ揣閲嶉噺锛岃閲嶆柊鍒嗛厤鎷ｈ揣閲嶉噺");
+ }
+ if(manPakOut.getStatus() == 1){
+ throw new CoolException("璇ユ嫞鏂欏崟宸插嚭搴�");
}
manPakOut.setCount(manPakOut.getCount() + anfme);
if (manPakOut.getAnfme().equals(manPakOut.getCount())){
@@ -1230,21 +1253,35 @@
manPakOutService.updateById(manPakOut);
}
- //鏇存柊鍗曟嵁鏄庣粏
- orderDetl.setQty(orderDetl.getQty() + anfme);
- orderDetlService.updateById(orderDetl);
-
- //鏇存柊鍗曟嵁淇℃伅
- orderService.checkComplete(orderNo);
+ //鏇存柊plaQty淇℃伅
+ plaQty.setPakoutTime(Utils.getDateStr(new Date()));
+ plaQtyService.updateById(plaQty);
//鏇存柊pla鏄庣粏
pla.setWeightAnfme(pla.getWeightAnfme() - anfme);
+ pla.setQtyAnfme(pla.getQtyAnfme() - anfme);
+ pla.setModifyTime(new Date());
if(pla.getWeightAnfme() <= 0){
- pla.setStatus("鍏ㄩ儴鍑哄簱");
+ pla.setStatus(GlobleParameter.PLA_STATUS_4);
}else {
- pla.setStatus("閮ㄥ垎鍑哄簱");
+ pla.setStatus(GlobleParameter.PLA_STATUS_3);
}
plaService.updateById(pla);
+ SaasUtils.insertLog(1,locNo,pla.getBrand(),anfme,null,null,pla.getBatch(),pla.getPackageNo());
+ //鏇存柊璁㈠崟鏄庣粏
+ Order order = orderService.selectByNo(orderNo);
+ OrderDetl orderDetl = orderDetlService.selectById(plaQty.getOrderDetlId());
+
+ orderDetl.setQty(orderDetl.getQty() + anfme);
+ orderDetlService.updateById(orderDetl);
+
+ orderService.checkComplete(orderNo);
+
+ }
+
+ @Override
+ public List<ManPakOut> getManPakoutByOrderNo(String orderNo) {
+ return manPakOutService.selectList(new EntityWrapper<ManPakOut>().eq("doc_num",orderNo).eq("status",0));
}
}
--
Gitblit v1.9.1