From 97c6071eaf01a3ce1a706cb0114dcb27d255aa3d Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期三, 25 十二月 2024 13:03:26 +0800
Subject: [PATCH] 优化订单同步逻辑及库位查找
---
src/main/java/com/zy/asrs/controller/MobileController.java | 242 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 228 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index d3b2e9f..f26bbf8 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -8,10 +8,14 @@
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.ModifyPakoutParam;
+import com.zy.asrs.entity.param.NodePakoutParam;
import com.zy.asrs.entity.result.MobileAdjustResult;
import com.zy.asrs.service.*;
import com.zy.common.model.WrkDto;
import com.zy.common.web.BaseController;
+import com.zy.system.entity.User;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestBody;
@@ -47,6 +51,16 @@
private BasDevpService basDevpService;
@Autowired
private PackService packService;
+ @Autowired
+ private ManLocDetlTempService manLocDetlTempService;
+ @Autowired
+ private MatService matService;
+ @Autowired
+ private WaitPakinService waitPakinService;
+ @Autowired
+ private LocRuleService locRuleService;
+ @Autowired
+ private NodeService nodeService;
// 缁勬墭 ----------------------------------------------------------------------------------------------------
@@ -57,22 +71,48 @@
@RequestMapping("/order/search/orderNo/auth")
@ManagerAuth
public R orderSearchByBarcode(@RequestParam String orderNo){
- Order order = orderService.selectByNo(orderNo);
- if (order == null) {
+ if (Cools.isEmpty(orderNo)){
+ orderNo=null;
+ }
+ List<Order> orders = orderService.selectorderNoL(orderNo);
+ if (Cools.isEmpty(orders)){
return R.ok();
}
- DocType docType = docTypeService.selectById(order.getDocType());
- if (docType.getPakin() == null || docType.getPakin() != 1) {
- return R.ok();
+ LinkedList<CombParam> combParams = new LinkedList<>();
+ if (!Cools.isEmpty(orders)){
+ for (Order order:orders){
+ CombParam combParam=new CombParam();
+ if (order == null) {
+ continue;
+ }
+ DocType docType = docTypeService.selectById(order.getDocType());
+ if (docType.getPakin() == null || docType.getPakin() != 1) {
+ continue;
+ }
+ if (order.getSettle() > 2) {
+ continue;
+ }
+ List<OrderDetl> orderDetls = orderService.selectWorkingDetls(order.getId());
+ if (!Cools.isEmpty(orderDetls)) {
+ LinkedList<CombParam.CombMat> combMats = new LinkedList<>();
+ for (OrderDetl orderDetl:orderDetls){
+ CombParam.CombMat combMat = new CombParam.CombMat();
+ combMat.setMatnr(orderDetl.getMatnr());
+ combMat.setBatch(orderDetl.getBatch());
+ combMat.setAnfme(orderDetl.getAnfme()-orderDetl.getQty());
+ combMat.setMaktx(orderDetl.getMaktx());
+ combMat.setSpecs(orderDetl.getSpecs());
+ combMat.setCsocode(orderDetl.getThreeCode());
+ combMat.setIsoseq(orderDetl.getDeadTime());
+ combMats.add(combMat);
+ }
+ combParam.setCombMats(combMats);
+ }
+ combParam.setOrderNo(order.getOrderNo());
+ combParams.add(combParam);
+ }
}
- if (order.getSettle() > 2) {
- return R.ok();
- }
- List<OrderDetl> orderDetls = orderService.selectWorkingDetls(order.getId());
- if (Cools.isEmpty(orderDetls)) {
- return R.ok();
- }
- return R.ok().add(orderDetls);
+ return R.ok().add(combParams);
}
@RequestMapping("/comb/auth")
@@ -128,7 +168,7 @@
}
/**
- * 鍑哄簱纭 - 鎵墭鐩樼爜
+ * 鍑哄簱纭 - 鎵揣鏋剁爜
* 1.鍏ㄦ澘 杩斿洖 101
* 2.鎷ｆ枡 杩斿洖 103
*/
@@ -294,5 +334,179 @@
return R.ok("鐩樼偣鎴愬姛");
}
+ /*
+ 骞冲簱 搴撲綅鎺ㄨ崘
+ */
+ @RequestMapping("/node/recommend/loc")
+ //@ManagerAuth(memo = "搴撲綅鎺ㄨ崘")
+ public R recommendNodeLoc(@RequestBody HashMap<String,String> param){
+ String zpallet = param.get("zpallet");
+ List<WaitPakin> waitPakinList = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", zpallet));
+ for (WaitPakin waitPakin : waitPakinList){
+ List<LocRule> locRules = locRuleService.find(waitPakin.getMatnr());
+ if(!Cools.isEmpty(locRules)){
+ if(!Cools.isEmpty(findNodeLoc(locRules))){
+ return R.ok(findNodeLoc(locRules)).add(waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet",zpallet)));
+ }
+ }
+
+ if(!Cools.isEmpty(waitPakin.getBrand())){
+ List<LocRule> locCodeRules = locRuleService.find(waitPakin.getBrand().substring(0, 4));
+ if(!Cools.isEmpty(locRules)){
+ if(!Cools.isEmpty(findNodeLoc(locRules))){
+ return R.ok(findNodeLoc(locRules)).add(waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet",zpallet)));
+ }
+ }
+ }
+ }
+
+ return R.ok("").add(waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet",zpallet)));
+ }
+
+
+ /*
+ 骞冲簱 璁㈠崟涓婃灦
+ */
+ @RequestMapping("/node/puttway")
+ //@ManagerAuth(memo = "璁㈠崟涓婃灦")
+ public R putway(@RequestBody HashMap<String,String> params){
+ String zpallet = params.get("zpallet");
+ String locNo = params.get("locNo");
+
+ mobileService.nodePutway(zpallet,locNo,new User());
+
+ return R.ok("璁㈠崟涓婃灦鎴愬姛");
+ }
+
+ /*
+ 骞冲簱 璁㈠崟涓嬫灦
+ */
+ @RequestMapping("/node/pakout")
+ public R nodePakout(@RequestBody NodePakoutParam param){
+
+
+ mobileService.nodePakout(param,new User());
+
+ return R.ok("璁㈠崟涓嬫灦鎴愬姛");
+ }
+
+ /*
+ 骞冲簱涓存椂涓婃灦
+ */
+ @RequestMapping("/node/putway1")
+ public R putway1(@RequestBody CombParam combParam){
+ Date now = new Date();
+ List<CombParam.CombMat> combMats = combParam.getCombMats();
+ combMats.forEach(combMat -> {
+ if(Cools.isEmpty(combMat.getBatch())){
+ combMat.setBatch("-1");
+ }
+ ManLocDetlTemp manLocDetlTemp = manLocDetlTempService.selectOne(new EntityWrapper<ManLocDetlTemp>()
+ .eq("matnr", combMat.getMatnr())
+ .eq("batch",combMat.getBatch()));
+ if(Cools.isEmpty(manLocDetlTemp)){
+ manLocDetlTemp = new ManLocDetlTemp();
+ Mat mat = matService.selectByMatnr(combMat.getMatnr());
+ BeanUtils.copyProperties(mat,manLocDetlTemp);
+ manLocDetlTemp.setLocNo("A-010101");
+ manLocDetlTemp.setAnfme(combMat.getAnfme());
+ manLocDetlTemp.setBatch(combMat.getBatch());
+ manLocDetlTemp.setCreateTime(now);
+ manLocDetlTemp.setModiTime(now);
+ manLocDetlTempService.insert(manLocDetlTemp);
+ }else {
+ manLocDetlTemp.setAnfme(manLocDetlTemp.getAnfme()+combMat.getAnfme());
+ manLocDetlTempService.update(manLocDetlTemp,new EntityWrapper<ManLocDetlTemp>()
+ .eq("matnr", combMat.getMatnr())
+ .eq("batch",combMat.getBatch()));
+ }
+
+ });
+
+ return R.ok("涓婃灦鎴愬姛");
+ }
+
+ @RequestMapping("/check/waitPakin/auth")
+ @ManagerAuth(memo = "鏌ヨ璐ф灦鏄惁缁勬墭")
+ public R waitPakins(@RequestBody String barcode){
+ return R.ok().add(waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", barcode)));
+ }
+
+ @RequestMapping("/untie/auth")
+ @ManagerAuth(memo = "瑙ｇ粦")
+ public R untie(@RequestBody String barcode){
+ List<WaitPakin> waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", barcode));
+ for (WaitPakin waitPakin : waitPakins) {
+ if (!waitPakinService.delete(new EntityWrapper<WaitPakin>().eq("zpallet", barcode))) {
+ return R.error("瑙ｇ粦澶辫触");
+ }
+ }
+ return R.ok().add(waitPakins);
+ }
+
+ @RequestMapping("/wrkdetl/auth")
+ //@ManagerAuth(memo = "鎷ｆ枡淇℃伅")
+ public R checkWrkDetl(@RequestBody String barcode){
+ WrkMast wrkMast = wrkMastService.selectByBarcode(barcode);
+ if(Cools.isEmpty(wrkMast)){
+ return R.error("璇ヨ揣鏋舵病鏈夊伐浣滄。");
+ }
+ List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
+ return R.ok().add(wrkDetls);
+ }
+
+ @RequestMapping("/modify/wrkdetl/auth")
+ //@ManagerAuth(memo = "淇敼鎷ｆ枡淇℃伅")
+ public R modifyWrkDetl(@RequestBody ModifyPakoutParam param){
+
+ String barcode = param.getBarcode();
+ WrkMast wrkMast = wrkMastService.selectByBarcode(barcode);
+ List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
+
+ Double allPakoutAnfme = 0.0;
+ Double allModifyPakoutAnfme = 0.0;
+ for (WrkDetl wrkDetl : wrkDetls){
+ allPakoutAnfme += wrkDetl.getAnfme();
+ }
+ for (ModifyPakoutParam.CA ca : param.getParams()){
+ allModifyPakoutAnfme += ca.getAnfme();
+ }
+
+ if(!allPakoutAnfme.equals(allModifyPakoutAnfme)){
+ return R.error("淇敼鍚庢嫞鏂欑殑鏁伴噺涓庡師鏁伴噺涓嶇鍚堬紝璇烽噸鏂版牳瀵规嫞鏂欐暟閲�");
+ }
+
+ mobileService.modifyWrkDetl(wrkDetls,param.getParams(),getUserId());
+ return R.ok();
+
+ }
+
+ //骞冲簱涓婃灦(鏃犵粍鎵樹笂鏋�)
+ @RequestMapping("/node/pakin/v1")
+ public R nodePakinNoComb(@RequestBody CombParam param){
+ mobileService.nodePakinNoComb(param);
+ return R.ok();
+ }
+
+ private String findNodeLoc(List<LocRule> locRules){
+ for (LocRule locRule : locRules) {
+ if (Cools.isEmpty(locRule.getOther())) {
+ continue;
+ }
+ EntityWrapper<Node> wrapper = new EntityWrapper<>();
+ wrapper.between("row1", locRule.getRowBeg(), locRule.getRowEnd())
+ .between("bay1", locRule.getBayBeg(), locRule.getBayEnd())
+ .between("lev1", locRule.getLevBeg(), locRule.getLevEnd())
+ .eq("parent_name", locRule.getOther())
+ .eq("status", "1");
+
+ Node node = nodeService.selectOne(wrapper);
+ if (Cools.isEmpty(node)) {
+ continue;
+ }
+ return node.getName();
+ }
+ return null;
+ }
}
--
Gitblit v1.9.1