From 1be7eccdb147f189de05d13777da8c79c5d0b9f2 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 15 七月 2025 15:52:12 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java | 211 +++++++++++++++++++++++++++++++++-------------------
1 files changed, 133 insertions(+), 78 deletions(-)
diff --git a/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java b/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java
index 492455b..04efe68 100644
--- a/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java
+++ b/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java
@@ -8,10 +8,7 @@
import com.zy.asrs.entity.Mat;
import com.zy.asrs.entity.param.OpenOrderPakinParam;
import com.zy.asrs.entity.param.OpenOrderPakoutParam;
-import com.zy.asrs.service.InventoryCheckOrderDetlService;
-import com.zy.asrs.service.InventoryCheckOrderService;
-import com.zy.asrs.service.MatService;
-import com.zy.asrs.service.OpenService;
+import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
import com.zy.common.model.DetlDto;
@@ -25,6 +22,7 @@
import java.util.ArrayList;
import java.util.Date;
+import java.util.HashMap;
import java.util.List;
@Service
@@ -57,6 +55,8 @@
@Autowired
private OpenService openService;
+ @Autowired
+ private StoreTypeService storeTypeService;
/**
* 鍙戣揣
@@ -66,27 +66,53 @@
@Transactional
public ReturnT<String> start1(List<NccSaleXsfhmxWms> wmsFlag) {
try {
- OpenOrderPakoutParam param = new OpenOrderPakoutParam();
- DetlDto detlDto;
- List<DetlDto> orderDetails = new ArrayList<>();
- long i = 1;
- for (NccSaleXsfhmxWms nccSaleXsfhmxWms : wmsFlag) {
- param.setOrderType("閿�鍞彂璐�");
- detlDto = new DetlDto();
- detlDto.setMatnr(nccSaleXsfhmxWms.getWlbm());
- detlDto.setAnfme(nccSaleXsfhmxWms.getNnum().doubleValue());
- detlDto.setStandby1(nccSaleXsfhmxWms.getFhckbm());
- detlDto.setLineNumber(i);
- detlDto.setRemark(JSONObject.toJSONString(nccSaleXsfhmxWms));
- orderDetails.add(detlDto);
- log.info("NccSaleXsfhmxWms鏁版嵁:{}", JSONObject.toJSON(nccSaleXsfhmxWms));
- i++;
- nccSaleXsfhmxWms.setWmsFlag(1);
- param.setOrderNo(nccSaleXsfhmxWms.getVbillcode());
+ List<String> ids = storeTypeService.listOwn();
+ HashMap<String, List<NccSaleXsfhmxWms>> map = new HashMap<>();
+ List<NccSaleXsfhmxWms> fenzu;
+ for (NccSaleXsfhmxWms wms : wmsFlag) {
+ if(!ids.contains(wms.getFhckbm())){
+ continue;
+ }
+
+ if (map.get(wms.getFhckbm()) == null) {
+ fenzu = new ArrayList<>();
+ fenzu.add(wms);
+ map.put(wms.getFhckbm(), fenzu);
+ } else {
+ fenzu = map.get(wms.getFhckbm());
+ fenzu.add(wms);
+ map.put(wms.getFhckbm(), fenzu);
+ }
}
- param.setOrderDetails(orderDetails);
- openService.pakoutOrderCreate(param);
- nccSaleXsfhmxWmsService.updateBatchById(wmsFlag);
+ int size = 1;
+ for (String key : map.keySet()) {
+ OpenOrderPakoutParam param = new OpenOrderPakoutParam();
+ DetlDto detlDto;
+ List<DetlDto> orderDetails = new ArrayList<>();
+ long i = 1;
+ for (NccSaleXsfhmxWms nccSaleXsfhmxWms : map.get(key)) {
+ param.setOrderType("閿�鍞彂璐�");
+ detlDto = new DetlDto();
+ detlDto.setMatnr(nccSaleXsfhmxWms.getWlbm());
+ detlDto.setAnfme(nccSaleXsfhmxWms.getNnum().doubleValue());
+ detlDto.setBatch(nccSaleXsfhmxWms.getVbatchcode());
+ detlDto.setWeight(nccSaleXsfhmxWms.getNastnum().doubleValue());
+ detlDto.setStandby1(nccSaleXsfhmxWms.getFhckbm());
+ detlDto.setLineNumber(i);
+ detlDto.setRemark(JSONObject.toJSONString(nccSaleXsfhmxWms));
+ orderDetails.add(detlDto);
+ log.info("NccSaleXsfhmxWms鏁版嵁:{}", JSONObject.toJSON(nccSaleXsfhmxWms));
+ i++;
+ nccSaleXsfhmxWms.setWmsFlag(1);
+ param.setOrderNo(nccSaleXsfhmxWms.getVbillcode() + "-" + size);
+ param.setCstmrName(nccSaleXsfhmxWms.getKhmc());
+ param.setKpCstmrName(nccSaleXsfhmxWms.getKpkhmc());
+ }
+ param.setOrderDetails(orderDetails);
+ openService.pakoutOrderCreate(param);
+ nccSaleXsfhmxWmsService.updateBatchById(map.get(key));
+ size++;
+ }
} catch (Exception e) {
e.printStackTrace();
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -112,6 +138,7 @@
detlDto = new DetlDto();
detlDto.setMatnr(nccSaleXsfhmxWms.getWlbm());
detlDto.setAnfme(nccSaleXsfhmxWms.getNnum().doubleValue());
+ detlDto.setWeight(nccSaleXsfhmxWms.getNastnum().doubleValue());
detlDto.setStandby1(nccSaleXsfhmxWms.getFhckbm());
detlDto.setLineNumber(i);
detlDto.setRemark(JSONObject.toJSONString(nccSaleXsfhmxWms));
@@ -150,6 +177,7 @@
detlDto = new DetlDto();
detlDto.setMatnr(nccScZkmxbWms.getWlbm());
detlDto.setAnfme(nccScZkmxbWms.getYingzzsl().doubleValue());
+ detlDto.setWeight(nccScZkmxbWms.getYingzsl().doubleValue());
detlDto.setBatch(nccScZkmxbWms.getVbatchcode());
detlDto.setLineNumber(i);
detlDto.setRemark(JSONObject.toJSONString(nccScZkmxbWms));
@@ -188,6 +216,7 @@
detlDto = new DetlDto();
detlDto.setMatnr(nccScZkmxbWms.getWlbm());
detlDto.setAnfme(nccScZkmxbWms.getYingzzsl().doubleValue());
+ detlDto.setWeight(nccScZkmxbWms.getYingzsl().doubleValue());
detlDto.setBatch(nccScZkmxbWms.getVbatchcode());
detlDto.setLineNumber(i);
detlDto.setRemark(JSONObject.toJSONString(nccScZkmxbWms));
@@ -225,6 +254,7 @@
detlDto = new DetlDto();
detlDto.setMatnr(nccCgCgdhdWms.getWlbm());
detlDto.setAnfme(nccCgCgdhdWms.getYdzsl().doubleValue());
+ detlDto.setAnfme(nccCgCgdhdWms.getYdsl().doubleValue());
detlDto.setBatch(nccCgCgdhdWms.getVbatchcode());
detlDto.setLineNumber(i);
detlDto.setRemark(JSONObject.toJSONString(nccCgCgdhdWms));
@@ -251,40 +281,40 @@
*
* @return
*/
- @Transactional
- public ReturnT<String> start4(List<NccCkPddWms> wmsFlag) {
- try {
- InventoryCheckOrder param = new InventoryCheckOrder();
- InventoryCheckOrderDetl checkOrderDetl = null;
- for (NccCkPddWms nccScZkmxbWms : wmsFlag) {
- log.info("NccCkPddWms鏁版嵁:{}", JSONObject.toJSON(nccScZkmxbWms));
- Mat mat = matService.selectByMatnr(nccScZkmxbWms.getWlbm());
- if (Cools.isEmpty(mat)) {
- throw new CoolException(nccScZkmxbWms.getWlbm() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
- }
- checkOrderDetl = new InventoryCheckOrderDetl();
- checkOrderDetl.setMatnr(nccScZkmxbWms.getWlbm());
- checkOrderDetl.setMaktx(mat.getMaktx());
- checkOrderDetl.setOrderNo(nccScZkmxbWms.getVbillcode());
- checkOrderDetl.setAnfme(nccScZkmxbWms.getZmzsl().doubleValue());
- checkOrderDetl.setBatch(nccScZkmxbWms.getVbatchcode());
- inventoryCheckOrderDetlService.insert(checkOrderDetl);
- nccScZkmxbWms.setWmsFlag(1);
- param.setOrderNo(nccScZkmxbWms.getVbillcode());
- param.setCreateBy(nccScZkmxbWms.getPdrmc());
-
- }
- param.setCreateTime(new Date());
- param.setStatus("1");
- inventoryCheckOrderService.insert(param);
- nccCkPddWmsService.updateBatchById(wmsFlag);
- } catch (Exception e) {
- e.printStackTrace();
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg(e.getMessage());
- }
- return SUCCESS;
- }
+// @Transactional
+// public ReturnT<String> start4(List<NccCkPddWms> wmsFlag) {
+// try {
+// InventoryCheckOrder param = new InventoryCheckOrder();
+// InventoryCheckOrderDetl checkOrderDetl = null;
+// for (NccCkPddWms nccScZkmxbWms : wmsFlag) {
+// log.info("NccCkPddWms鏁版嵁:{}", JSONObject.toJSON(nccScZkmxbWms));
+// Mat mat = matService.selectByMatnr(nccScZkmxbWms.getWlbm());
+// if (Cools.isEmpty(mat)) {
+// throw new CoolException(nccScZkmxbWms.getWlbm() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
+// }
+// checkOrderDetl = new InventoryCheckOrderDetl();
+// checkOrderDetl.setMatnr(nccScZkmxbWms.getWlbm());
+// checkOrderDetl.setMaktx(mat.getMaktx());
+// checkOrderDetl.setOrderNo(nccScZkmxbWms.getVbillcode());
+// checkOrderDetl.setAnfme(nccScZkmxbWms.getZmzsl().doubleValue());
+// checkOrderDetl.setBatch(nccScZkmxbWms.getVbatchcode());
+// inventoryCheckOrderDetlService.insert(checkOrderDetl);
+// nccScZkmxbWms.setWmsFlag(1);
+// param.setOrderNo(nccScZkmxbWms.getVbillcode());
+// param.setCreateBy(nccScZkmxbWms.getPdrmc());
+//
+// }
+// param.setCreateTime(new Date());
+// param.setStatus("1");
+// inventoryCheckOrderService.insert(param);
+// nccCkPddWmsService.updateBatchById(wmsFlag);
+// } catch (Exception e) {
+// e.printStackTrace();
+// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+// return FAIL.setMsg(e.getMessage());
+// }
+// return SUCCESS;
+// }
/**
@@ -295,27 +325,52 @@
@Transactional
public ReturnT<String> start5(List<NccSaleDbddWms> wmsFlag) {
try {
- OpenOrderPakoutParam param = new OpenOrderPakoutParam();
- param.setOrderType("闆嗗洟鍐呴儴璋冩嫧");
- DetlDto detlDto;
- List<DetlDto> orderDetails = new ArrayList<>();
- long i = 1;
- for (NccSaleDbddWms nccCgCgdhdWms : wmsFlag) {
- log.info("nccCgCgdhdWms鏁版嵁:{}", JSONObject.toJSON(nccCgCgdhdWms));
- detlDto = new DetlDto();
- detlDto.setMatnr(nccCgCgdhdWms.getWlbm());
- detlDto.setAnfme(nccCgCgdhdWms.getZsl().doubleValue());
- detlDto.setBatch(nccCgCgdhdWms.getVbatchcode());
- detlDto.setLineNumber(i);
- detlDto.setRemark(JSONObject.toJSONString(nccCgCgdhdWms));
- orderDetails.add(detlDto);
- i++;
- nccCgCgdhdWms.setWmsFlag(1);
- param.setOrderNo(nccCgCgdhdWms.getVbillcode());
+ List<String> ids = storeTypeService.listOwn();
+ HashMap<String, List<NccSaleDbddWms>> map = new HashMap<>();
+ List<NccSaleDbddWms> fenzu;
+ for (NccSaleDbddWms wms : wmsFlag) {
+ if(!ids.contains(wms.getDcckbm())){
+ continue;
+ }
+
+ if (map.get(wms.getDcckbm()) == null) {
+ fenzu = new ArrayList<>();
+ fenzu.add(wms);
+ map.put(wms.getDcckbm(), fenzu);
+ } else {
+ fenzu = map.get(wms.getDcckbm());
+ fenzu.add(wms);
+ map.put(wms.getDcckbm(), fenzu);
+ }
}
- param.setOrderDetails(orderDetails);
- openService.pakoutOrderCreate(param);
- nccSaleDbddWmsService.updateBatchById(wmsFlag);
+ int size = 1;
+ for (String key : map.keySet()) {
+ OpenOrderPakoutParam param = new OpenOrderPakoutParam();
+ param.setOrderType("闆嗗洟鍐呴儴璋冩嫧");
+ DetlDto detlDto;
+ List<DetlDto> orderDetails = new ArrayList<>();
+ long i = 1;
+ for (NccSaleDbddWms nccSaleDbddWms : map.get(key)) {
+ log.info("nccSaleDbddWms鏁版嵁:{}", JSONObject.toJSON(nccSaleDbddWms));
+ detlDto = new DetlDto();
+ detlDto.setMatnr(nccSaleDbddWms.getWlbm());
+ detlDto.setAnfme(nccSaleDbddWms.getZsl().doubleValue());
+ detlDto.setWeight(nccSaleDbddWms.getFsl().doubleValue());
+ detlDto.setBatch(nccSaleDbddWms.getVbatchcode());
+ detlDto.setLineNumber(i);
+ detlDto.setRemark(JSONObject.toJSONString(nccSaleDbddWms));
+ detlDto.setStandby1(nccSaleDbddWms.getDcckbm());
+ orderDetails.add(detlDto);
+ i++;
+ param.setOrderNo(nccSaleDbddWms.getVbillcode() + "-" + size);
+ param.setCstmrName(nccSaleDbddWms.getDrkczzmc());
+ nccSaleDbddWms.setWmsFlag(1);
+ }
+ param.setOrderDetails(orderDetails);
+ openService.pakoutOrderCreate(param);
+ nccSaleDbddWmsService.updateBatchById(map.get(key));
+ size++;
+ }
} catch (Exception e) {
e.printStackTrace();
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
--
Gitblit v1.9.1