From 08b4403ec8d6b69528d161cfcad80b5d64dea76c Mon Sep 17 00:00:00 2001 From: Administrator <876263681@qq.com> Date: 星期三, 02 七月 2025 15:12:43 +0800 Subject: [PATCH] #优化库位检索 --- src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 301 +++++++++++++++++++++++++------------------------- 1 files changed, 151 insertions(+), 150 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java index 7b91bcb..37ff2a8 100644 --- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java @@ -3,11 +3,15 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.core.common.Cools; import com.core.common.DateUtils; +import com.core.common.R; import com.core.common.SnowflakeIdWorker; import com.core.exception.CoolException; import com.zy.asrs.entity.*; -import com.zy.asrs.entity.param.*; -import com.zy.asrs.entity.result.OpenOrderCompeteResult; +import com.zy.asrs.entity.param.MatSyncParam; +import com.zy.asrs.entity.param.OpenOrderPakinParam; +import com.zy.asrs.entity.param.OpenOrderPakoutParam; +import com.zy.asrs.entity.param.PackParam; +import com.zy.asrs.entity.result.InOutCountDto; import com.zy.asrs.entity.result.StockVo; import com.zy.asrs.mapper.TagMapper; import com.zy.asrs.service.*; @@ -48,6 +52,14 @@ private TagService tagService; @Autowired private TagMapper tagMapper; + @Autowired + private WrkMastService wrkMastService; + @Autowired + private NodeService nodeService; + @Autowired + private ManLocDetlService manLocDetlService; + @Autowired + private MatV2Service matV2Service; @Override @Transactional @@ -113,16 +125,21 @@ } for (DetlDto detlDto : list) { Mat mat = matService.selectByMatnr(detlDto.getMatnr()); - if (Cools.isEmpty(mat)) { - throw new CoolException(detlDto.getMatnr() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧"); - } OrderDetl orderDetl = new OrderDetl(); - orderDetl.sync(mat); + if (Cools.isEmpty(mat)) { + MatV2 matV2 = matV2Service.selectOne(new EntityWrapper<MatV2>().eq("matnr", detlDto.getMatnr())); + if(Cools.isEmpty(matV2)){ + throw new CoolException(detlDto.getMatnr() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧"); + } + orderDetl.sync(matV2); + } else { + orderDetl.sync(mat); + } //鎵瑰彿涓虹┖浼氬嚭鐜伴棶棰橈紝璁剧疆涓�涓粯璁ゅ�� if (detlDto.getBatch() == null) { orderDetl.setBatch(""); - }else { + } else { orderDetl.setBatch(detlDto.getBatch()); } @@ -141,51 +158,51 @@ } } - @Override - @Transactional - public List<OpenOrderCompeteResult> pakinOrderComplete(OpenOrderCompleteParam param) { - List<OpenOrderCompeteResult> results = new ArrayList<>(); - if (!Cools.isEmpty(param) && !Cools.isEmpty(param.getOrderNo())) { - // 鎸囧畾璁㈠崟 - Order order = orderService.selectByNo(param.getOrderNo()); - if (null != order) { - OpenOrderCompeteResult result = new OpenOrderCompeteResult(); - results.add(result); - result.setOrderNo(order.getOrderNo()); - result.setOrderTime(order.getOrderTime()); - result.setOrderType(order.getDocType$()); - List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId()); - for (OrderDetl orderDetl : orderDetls) { - result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty())); - } - if (order.getSettle() == 4L) { - // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶� - if (!orderService.updateSettle(order.getId(), 6L, null)) { - throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳"); - } - } - } - } else { - // 鎵�鏈夎鍗� - List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L)); - for (Order order : orders) { - OpenOrderCompeteResult result = new OpenOrderCompeteResult(); - results.add(result); - result.setOrderNo(order.getOrderNo()); - result.setOrderTime(order.getOrderTime()); - result.setOrderType(order.getDocType$()); - List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId()); - for (OrderDetl orderDetl : orderDetls) { - result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty())); - } - // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶� - if (!orderService.updateSettle(order.getId(), 6L, null)) { - throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳"); - } - } - } - return results; - } +// @Override +// @Transactional +// public List<OpenOrderCompeteResult> pakinOrderComplete(OpenOrderCompleteParam param) { +// List<OpenOrderCompeteResult> results = new ArrayList<>(); +// if (!Cools.isEmpty(param) && !Cools.isEmpty(param.getOrderNo())) { +// // 鎸囧畾璁㈠崟 +// Order order = orderService.selectByNo(param.getOrderNo()); +// if (null != order) { +// OpenOrderCompeteResult result = new OpenOrderCompeteResult(); +// results.add(result); +// result.setOrderNo(order.getOrderNo()); +// result.setOrderTime(order.getOrderTime()); +// result.setOrderType(order.getDocType$()); +// List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId()); +// for (OrderDetl orderDetl : orderDetls) { +// result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty())); +// } +// if (order.getSettle() == 4L) { +// // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶� +// if (!orderService.updateSettle(order.getId(), 6L, null)) { +// throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳"); +// } +// } +// } +// } else { +// // 鎵�鏈夎鍗� +// List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L)); +// for (Order order : orders) { +// OpenOrderCompeteResult result = new OpenOrderCompeteResult(); +// results.add(result); +// result.setOrderNo(order.getOrderNo()); +// result.setOrderTime(order.getOrderTime()); +// result.setOrderType(order.getDocType$()); +// List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId()); +// for (OrderDetl orderDetl : orderDetls) { +// result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty())); +// } +// // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶� +// if (!orderService.updateSettle(order.getId(), 6L, null)) { +// throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳"); +// } +// } +// } +// return results; +// } @Override @Transactional @@ -255,12 +272,17 @@ } for (DetlDto detlDto : list) { Mat mat = matService.selectByMatnr(detlDto.getMatnr()); - if (Cools.isEmpty(mat)) { - throw new CoolException(detlDto.getMatnr() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧"); - } OrderDetl orderDetl = new OrderDetl(); - orderDetl.sync(mat); - orderDetl.setBatch(detlDto.getBatch()); + if (Cools.isEmpty(mat)) { + MatV2 matV2 = matV2Service.selectOne(new EntityWrapper<MatV2>().eq("matnr", detlDto.getMatnr())); + if(Cools.isEmpty(matV2)){ + throw new CoolException(detlDto.getMatnr() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧"); + } + orderDetl.sync(matV2); + } else { + orderDetl.sync(mat); + } + orderDetl.setBatch(detlDto.getBatch() == null ? "" : detlDto.getBatch()); orderDetl.setAnfme(detlDto.getAnfme()); orderDetl.setOrderId(order.getId()); orderDetl.setOrderNo(order.getOrderNo()); @@ -276,50 +298,50 @@ } } - @Override - public List<OpenOrderCompeteResult> pakoutOrderComplete(OpenOrderCompleteParam param) { - List<OpenOrderCompeteResult> results = new ArrayList<>(); - if (!Cools.isEmpty(param) && !Cools.isEmpty(param.getOrderNo())) { - // 鎸囧畾璁㈠崟 - Order order = orderService.selectByNo(param.getOrderNo()); - if (null != order) { - OpenOrderCompeteResult result = new OpenOrderCompeteResult(); - results.add(result); - result.setOrderNo(order.getOrderNo()); - result.setOrderTime(order.getOrderTime()); - result.setOrderType(order.getDocType$()); - List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId()); - for (OrderDetl orderDetl : orderDetls) { - result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty())); - } - if (order.getSettle() == 4L) { - // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶� - if (!orderService.updateSettle(order.getId(), 6L, null)) { - throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳"); - } - } - } - } else { - // 鎵�鏈夎鍗� - List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L)); - for (Order order : orders) { - OpenOrderCompeteResult result = new OpenOrderCompeteResult(); - results.add(result); - result.setOrderNo(order.getOrderNo()); - result.setOrderTime(order.getOrderTime()); - result.setOrderType(order.getDocType$()); - List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId()); - for (OrderDetl orderDetl : orderDetls) { - result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty())); - } - // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶� - if (!orderService.updateSettle(order.getId(), 6L, null)) { - throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳"); - } - } - } - return results; - } +// @Override +// public List<OpenOrderCompeteResult> pakoutOrderComplete(OpenOrderCompleteParam param) { +// List<OpenOrderCompeteResult> results = new ArrayList<>(); +// if (!Cools.isEmpty(param) && !Cools.isEmpty(param.getOrderNo())) { +// // 鎸囧畾璁㈠崟 +// Order order = orderService.selectByNo(param.getOrderNo()); +// if (null != order) { +// OpenOrderCompeteResult result = new OpenOrderCompeteResult(); +// results.add(result); +// result.setOrderNo(order.getOrderNo()); +// result.setOrderTime(order.getOrderTime()); +// result.setOrderType(order.getDocType$()); +// List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId()); +// for (OrderDetl orderDetl : orderDetls) { +// result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty())); +// } +// if (order.getSettle() == 4L) { +// // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶� +// if (!orderService.updateSettle(order.getId(), 6L, null)) { +// throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳"); +// } +// } +// } +// } else { +// // 鎵�鏈夎鍗� +// List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L)); +// for (Order order : orders) { +// OpenOrderCompeteResult result = new OpenOrderCompeteResult(); +// results.add(result); +// result.setOrderNo(order.getOrderNo()); +// result.setOrderTime(order.getOrderTime()); +// result.setOrderType(order.getDocType$()); +// List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId()); +// for (OrderDetl orderDetl : orderDetls) { +// result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty())); +// } +// // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶� +// if (!orderService.updateSettle(order.getId(), 6L, null)) { +// throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳"); +// } +// } +// } +// return results; +// } @Override @Transactional @@ -341,7 +363,7 @@ Date now = new Date(); pack = new Pack( param.getBarcode(), // 鏉$爜[闈炵┖] - analyse.getMatnr(), // 鍟嗗搧缂栧彿 + analyse.getMatnr(), // 鍝佸彿 analyse.getBarcode(), // 搴忓垪鐮� 1L, // 璁㈠崟鐘舵�� 1, // 鐘舵�� @@ -437,7 +459,7 @@ if (!matService.insert(mat)) { throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳"); } else { - log.info("鎵撳寘涓婄嚎娣诲姞鏂扮墿鏂橻鍟嗗搧缂栧彿锛歿}]", mat.getMatnr()); + log.info("鎵撳寘涓婄嚎娣诲姞鏂扮墿鏂橻鍝佸彿锛歿}]", mat.getMatnr()); } } } @@ -445,13 +467,13 @@ @Override @Transactional public void syncMat(MatSyncParam param) { - if (Cools.isEmpty(param.getMatDetails()) || param.getMatDetails().size() <=0 ) { + if (Cools.isEmpty(param.getMatDetails()) || param.getMatDetails().size() <= 0) { throw new CoolException("鍟嗗搧鏁版嵁涓虹┖"); } - for(MatSyncParam.MatParam matParam : param.getMatDetails()){ - if(Cools.isEmpty(matParam.getMatnr())){ - throw new CoolException("鍟嗗搧缂栫爜涓嶈兘涓虹┖"); + for (MatSyncParam.MatParam matParam : param.getMatDetails()) { + if (Cools.isEmpty(matParam.getMatnr())) { + throw new CoolException("鍝佸彿涓嶈兘涓虹┖"); } Date now = new Date(); @@ -461,49 +483,17 @@ // 鍒嗙被 Long tagId; // 涓�绾у垎绫� - if (!Cools.isEmpty(matParam.getGroupCode()) && !Cools.isEmpty(matParam.getGroupName())) { - Tag priTag = tagService.selectByName(matParam.getGroupCode(), 2); - if (priTag == null) { - Tag top = tagService.getTop(); - NodeUtils nodeUtils = new NodeUtils(); - nodeUtils.executePath(top.getId()); - priTag = new Tag( - null, // 缂栧彿 - matParam.getGroupCode(), // 鍚嶇О - top.getId(), // 鐖剁骇 - top.getName(), // 鐖剁骇鍚嶇О - nodeUtils.path.toString(), // 鍏宠仈璺緞 - nodeUtils.pathName.toString(), // 鍏宠仈璺緞鍚� - 0, // 绫诲瀷 - null, // 璐熻矗浜� - null, // 鍥剧墖 - null, // 绠�瑕佹弿杩� - null, // 鏁伴噺 - 2, // 绛夌骇 - null, // 鎺掑簭 - 1, // 鐘舵�� - now, // 娣诲姞鏃堕棿 - null, // 娣诲姞浜哄憳 - now, // 淇敼鏃堕棿 - null, // 淇敼浜哄憳 - null // 澶囨敞 - ); - if (tagMapper.insert(priTag) == 0) { - throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳"); - } - } + if (!Cools.isEmpty(matParam.getGroupName())) { // 浜岀骇鍒嗙被 Tag secTag = tagService.selectByName(matParam.getGroupName(), 3); if (secTag == null) { - NodeUtils nodeUtils = new NodeUtils(); - nodeUtils.executePath(priTag.getId()); secTag = new Tag( null, // 缂栧彿 matParam.getGroupName(), // 鍚嶇О - priTag.getId(), // 鐖剁骇 - priTag.getName(), // 鐖剁骇鍚嶇О - nodeUtils.path.toString(), // 鍏宠仈璺緞 - nodeUtils.pathName.toString(), // 鍏宠仈璺緞鍚� + 10010L, // 鐖剁骇 + "鍏ㄩ儴", // 鐖剁骇鍚嶇О + "10009,10010", // 鍏宠仈璺緞 + "鍏ㄩ儴,鍏ㄩ儴", // 鍏宠仈璺緞鍚� 0, // 绫诲瀷 null, // 璐熻矗浜� null, // 鍥剧墖 @@ -521,17 +511,20 @@ if (tagMapper.insert(secTag) == 0) { throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳"); } + Tag tag = tagService.selectByName(matParam.getGroupName(), 3); + tagId = tag.getId(); + } else { + tagId = secTag.getId(); } - tagId = secTag.getId(); } else { - tagId = tagService.getTop().getId(); + throw new CoolException("鍟嗗搧鍒嗙被涓嶈兘涓虹┖"); +// tagId = tagService.getTop().getId(); } mat.sync(matParam); // mat.setMatnr(para); // mat.setMaktx(param.getMaktx()); // mat.setSpecs(param.getSpecs()); // mat.setModel(param.getModel()); - mat.setTagId(tagId); mat.setStatus(1); mat.setCreateTime(now); @@ -539,11 +532,13 @@ if (!matService.insert(mat)) { throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳"); } else { - log.info("鍚屾鏂扮墿鏂橻鍟嗗搧缂栧彿锛歿}]", mat.getMatnr()); + log.info("鍚屾鏂扮墿鏂橻鍝佸彿锛歿}]", mat.getMatnr()); } } else { - mat.sync(param); - if (!matService.update(mat, new EntityWrapper<Mat>().eq("matnr",matParam.getMatnr()))) { +// mat.sync(param); + mat.setMaktx(matParam.getMaktx()); + mat.setSpecs(matParam.getSpecs()); + if (!matService.update(mat, new EntityWrapper<Mat>().eq("matnr", matParam.getMatnr()))) { throw new CoolException("鏇存柊宸插瓨鍦ㄥ晢鍝佷俊鎭け璐ワ紝璇疯仈绯荤鐞嗗憳"); } } @@ -551,4 +546,10 @@ } + @Override + public R getInOutDetl() { + List<InOutCountDto> top100 = wrkMastService.selectTop100(); + return R.ok().add(top100); + } + } -- Gitblit v1.9.1