From b9d80dfdb1cef36c9edb8bf6b2fdf9e6e1708d2b Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 26 五月 2025 16:18:24 +0800
Subject: [PATCH] 13
---
src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java | 149 ++++++++++++++++++++++++++++++-------------------
1 files changed, 90 insertions(+), 59 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 7160b6a..fa91563 100644
--- a/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java
+++ b/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java
@@ -24,6 +24,7 @@
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
@Service
@@ -70,16 +71,14 @@
List<DetlDto> orderDetails = new ArrayList<>();
long i = 1;
for (NccSaleXsfhmxWms nccSaleXsfhmxWms : wmsFlag) {
- if (nccSaleXsfhmxWms.getFstatusflag() == 2 && nccSaleXsfhmxWms.getBdr() == 0 && nccSaleXsfhmxWms.getHdr() == 0) {
- detlDto = new DetlDto();
- detlDto.setMatnr(nccSaleXsfhmxWms.getWlbm());
- detlDto.setAnfme(nccSaleXsfhmxWms.getNastnum().doubleValue());
- detlDto.setLineNumber(i);
- detlDto.setRemark(JSONObject.toJSONString(nccSaleXsfhmxWms));
- orderDetails.add(detlDto);
- log.info("NccSaleXsfhmxWms鏁版嵁:{}", JSONObject.toJSON(nccSaleXsfhmxWms));
- i++;
- }
+ detlDto = new DetlDto();
+ detlDto.setMatnr(nccSaleXsfhmxWms.getWlbm());
+ detlDto.setAnfme(nccSaleXsfhmxWms.getNastnum().doubleValue());
+ 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());
}
@@ -88,7 +87,7 @@
nccSaleXsfhmxWmsService.updateBatchById(wmsFlag);
} catch (Exception e) {
e.printStackTrace();
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ TransactionAspectSupport. currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg(e.getMessage());
}
return SUCCESS;
@@ -99,25 +98,24 @@
*
* @return
*/
- public ReturnT<String> start2(List<NccScZkmxbWms> wmsFlag) {
+ public ReturnT<String> start2In(List<NccScZkmxbWms> wmsFlag) {
try {
OpenOrderPakinParam param = new OpenOrderPakinParam();
- param.setOrderType("杞簱");
+ param.setOrderType("杞簱-鍏ュ簱");
DetlDto detlDto;
List<DetlDto> orderDetails = new ArrayList<>();
long i = 1;
for (NccScZkmxbWms nccScZkmxbWms : wmsFlag) {
log.info("NccScZkmxbWms鏁版嵁:{}", JSONObject.toJSON(nccScZkmxbWms));
- if ( nccScZkmxbWms.getBdr() == 0 && nccScZkmxbWms.getDr() == 0) {
- detlDto = new DetlDto();
- detlDto.setMatnr(nccScZkmxbWms.getWlbm());
- detlDto.setAnfme(nccScZkmxbWms.getYingzzsl().doubleValue());
- detlDto.setBatch(nccScZkmxbWms.getVbatchcode());
- detlDto.setLineNumber(i);
- detlDto.setRemark(JSONObject.toJSONString(nccScZkmxbWms));
- orderDetails.add(detlDto);
- i++;
- }
+ detlDto = new DetlDto();
+ detlDto.setMatnr(nccScZkmxbWms.getWlbm());
+ detlDto.setAnfme(nccScZkmxbWms.getYingzzsl().doubleValue());
+ detlDto.setBatch(nccScZkmxbWms.getVbatchcode());
+ detlDto.setLineNumber(i);
+ detlDto.setRemark(JSONObject.toJSONString(nccScZkmxbWms));
+ detlDto.setStandby1(nccScZkmxbWms.getRkckbm());
+ orderDetails.add(detlDto);
+ i++;
nccScZkmxbWms.setWmsFlag(1);
param.setOrderNo(nccScZkmxbWms.getVbillcode());
}
@@ -132,6 +130,41 @@
return SUCCESS;
}
+ /**
+ * 杞簱锛屽寘鍚嚭搴�
+ *
+ * @return
+ */
+ public ReturnT<String> start2Out(List<NccScZkmxbWms> wmsFlag) {
+ try {
+ OpenOrderPakoutParam param = new OpenOrderPakoutParam();
+ param.setOrderType("杞簱-鍑哄簱");
+ DetlDto detlDto;
+ List<DetlDto> orderDetails = new ArrayList<>();
+ long i = 1;
+ for (NccScZkmxbWms nccScZkmxbWms : wmsFlag) {
+ log.info("NccScZkmxbWms鏁版嵁:{}", JSONObject.toJSON(nccScZkmxbWms));
+ detlDto = new DetlDto();
+ detlDto.setMatnr(nccScZkmxbWms.getWlbm());
+ detlDto.setAnfme(nccScZkmxbWms.getYingzzsl().doubleValue());
+ detlDto.setBatch(nccScZkmxbWms.getVbatchcode());
+ detlDto.setLineNumber(i);
+ detlDto.setRemark(JSONObject.toJSONString(nccScZkmxbWms));
+ orderDetails.add(detlDto);
+ i++;
+ nccScZkmxbWms.setWmsFlag(1);
+ param.setOrderNo(nccScZkmxbWms.getVbillcode());
+ }
+ param.setOrderDetails(orderDetails);
+ openService.pakoutOrderCreate(param);
+ nccScZkmxbWmsService.updateBatchById(wmsFlag);
+ } catch (Exception e) {
+ e.printStackTrace();
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg(e.getMessage());
+ }
+ return SUCCESS;
+ }
/**
* 閲囪喘鍒拌揣
@@ -147,15 +180,15 @@
long i = 1;
for (NccCgCgdhdWms nccCgCgdhdWms : wmsFlag) {
log.info("nccCgCgdhdWms鏁版嵁:{}", JSONObject.toJSON(nccCgCgdhdWms));
- if (nccCgCgdhdWms.getBdr() == 0 && nccCgCgdhdWms.getHdr() == 0) {
- detlDto = new DetlDto();
- detlDto.setMatnr(nccCgCgdhdWms.getWlbm());
- detlDto.setAnfme(nccCgCgdhdWms.getYdzsl().doubleValue());
- detlDto.setLineNumber(i);
- detlDto.setRemark(JSONObject.toJSONString(nccCgCgdhdWms));
- orderDetails.add(detlDto);
- i++;
- }
+ detlDto = new DetlDto();
+ detlDto.setMatnr(nccCgCgdhdWms.getWlbm());
+ detlDto.setAnfme(nccCgCgdhdWms.getYdzsl().doubleValue());
+ detlDto.setBatch(nccCgCgdhdWms.getVbatchcode());
+ detlDto.setLineNumber(i);
+ detlDto.setRemark(JSONObject.toJSONString(nccCgCgdhdWms));
+ detlDto.setStandby1(nccCgCgdhdWms.getCkbm());
+ orderDetails.add(detlDto);
+ i++;
nccCgCgdhdWms.setWmsFlag(1);
param.setOrderNo(nccCgCgdhdWms.getVbillcode());
}
@@ -182,26 +215,27 @@
InventoryCheckOrderDetl checkOrderDetl = null;
for (NccCkPddWms nccScZkmxbWms : wmsFlag) {
log.info("NccCkPddWms鏁版嵁:{}", JSONObject.toJSON(nccScZkmxbWms));
- if (nccScZkmxbWms.getBdr() == 0 && nccScZkmxbWms.getHdr() == 0) {
- Mat mat = matService.selectByMatnr(nccScZkmxbWms.getWlbm());
- if (Cools.isEmpty(mat)) {
- throw new CoolException(nccScZkmxbWms.getWlbm() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
- }
- List<InventoryCheckOrderDetl> checkOrderDetls = inventoryCheckOrderDetlService.selectList(new EntityWrapper<InventoryCheckOrderDetl>().eq("order_no", nccScZkmxbWms.getVbillcode()).eq("matnr", mat.getMatnr()).eq("batch", nccScZkmxbWms.getVbatchcode()));
- if (checkOrderDetls != null && !checkOrderDetls.isEmpty()) {
- 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);
+ Mat mat = matService.selectByMatnr(nccScZkmxbWms.getWlbm());
+ if (Cools.isEmpty(mat)) {
+ throw new CoolException(nccScZkmxbWms.getWlbm() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
}
+ List<InventoryCheckOrderDetl> checkOrderDetls = inventoryCheckOrderDetlService.selectList(new EntityWrapper<InventoryCheckOrderDetl>().eq("order_no", nccScZkmxbWms.getVbillcode()).eq("matnr", mat.getMatnr()).eq("batch", nccScZkmxbWms.getVbatchcode()));
+ if (checkOrderDetls != null && !checkOrderDetls.isEmpty()) {
+ //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);
@@ -212,7 +246,6 @@
}
return SUCCESS;
}
-
/**
@@ -229,16 +262,14 @@
long i = 1;
for (NccSaleDbddWms nccCgCgdhdWms : wmsFlag) {
log.info("nccCgCgdhdWms鏁版嵁:{}", JSONObject.toJSON(nccCgCgdhdWms));
- if (nccCgCgdhdWms.getDr() == 0 ) {
- 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++;
- }
+ 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());
}
--
Gitblit v1.9.1