From ee2e593c5736c27dad7d93f9fca98290f578b5da Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 21 五月 2025 21:36:25 +0800
Subject: [PATCH] 接口编写
---
src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java | 81 +++++++++++++++++++++++++++++-----------
1 files changed, 59 insertions(+), 22 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 07cb971..7160b6a 100644
--- a/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java
+++ b/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java
@@ -16,14 +16,8 @@
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
import com.zy.common.model.DetlDto;
-import com.zy.nc.entity.NccCgCgdhdWms;
-import com.zy.nc.entity.NccCkPddWms;
-import com.zy.nc.entity.NccSaleXsfhmxWms;
-import com.zy.nc.entity.NccScZkmxbWms;
-import com.zy.nc.service.NccCgCgdhdWmsService;
-import com.zy.nc.service.NccCkPddWmsService;
-import com.zy.nc.service.NccSaleXsfhmxWmsService;
-import com.zy.nc.service.NccScZkmxbWmsService;
+import com.zy.nc.entity.*;
+import com.zy.nc.service.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -44,6 +38,9 @@
@Autowired
private NccCgCgdhdWmsService nccCgCgdhdWmsService;
+
+ @Autowired
+ private NccSaleDbddWmsService nccSaleDbddWmsService;
@Autowired
private NccCkPddWmsService nccCkPddWmsService;
@@ -98,25 +95,26 @@
}
/**
- * 杞簱
+ * 杞簱锛屽寘鍚骇鎴愬搧鍏ュ簱鍗�
*
* @return
*/
public ReturnT<String> start2(List<NccScZkmxbWms> wmsFlag) {
try {
- OpenOrderPakoutParam param = new OpenOrderPakoutParam();
+ OpenOrderPakinParam param = new OpenOrderPakinParam();
param.setOrderType("杞簱");
DetlDto detlDto;
List<DetlDto> orderDetails = new ArrayList<>();
long i = 1;
for (NccScZkmxbWms nccScZkmxbWms : wmsFlag) {
log.info("NccScZkmxbWms鏁版嵁:{}", JSONObject.toJSON(nccScZkmxbWms));
- if (nccScZkmxbWms.getDjzt() == 2 && nccScZkmxbWms.getBdr() == 0 && nccScZkmxbWms.getDr() == 0) {
+ 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++;
}
@@ -124,7 +122,7 @@
param.setOrderNo(nccScZkmxbWms.getVbillcode());
}
param.setOrderDetails(orderDetails);
- openService.pakoutOrderCreate(param);
+ openService.pakinOrderCreate(param);
nccScZkmxbWmsService.updateBatchById(wmsFlag);
} catch (Exception e) {
e.printStackTrace();
@@ -147,18 +145,19 @@
DetlDto detlDto;
List<DetlDto> orderDetails = new ArrayList<>();
long i = 1;
- for (NccCgCgdhdWms nccScZkmxbWms : wmsFlag) {
- log.info("NccCgCgdhdWms鏁版嵁:{}", JSONObject.toJSON(nccScZkmxbWms));
- if (nccScZkmxbWms.getBdr() == 0 && nccScZkmxbWms.getHdr() == 0) {
+ for (NccCgCgdhdWms nccCgCgdhdWms : wmsFlag) {
+ log.info("nccCgCgdhdWms鏁版嵁:{}", JSONObject.toJSON(nccCgCgdhdWms));
+ if (nccCgCgdhdWms.getBdr() == 0 && nccCgCgdhdWms.getHdr() == 0) {
detlDto = new DetlDto();
- detlDto.setMatnr(nccScZkmxbWms.getWlbm());
- detlDto.setAnfme(nccScZkmxbWms.getYdzsl().doubleValue());
+ detlDto.setMatnr(nccCgCgdhdWms.getWlbm());
+ detlDto.setAnfme(nccCgCgdhdWms.getYdzsl().doubleValue());
detlDto.setLineNumber(i);
+ detlDto.setRemark(JSONObject.toJSONString(nccCgCgdhdWms));
orderDetails.add(detlDto);
i++;
}
- nccScZkmxbWms.setWmsFlag(1);
- param.setOrderNo(nccScZkmxbWms.getVbillcode());
+ nccCgCgdhdWms.setWmsFlag(1);
+ param.setOrderNo(nccCgCgdhdWms.getVbillcode());
}
param.setOrderDetails(orderDetails);
openService.pakinOrderCreate(param);
@@ -188,13 +187,13 @@
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()));
- if (checkOrderDetls == null || checkOrderDetls.isEmpty()) {
+ 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.getMatnr());
+ checkOrderDetl.setMaktx(mat.getMaktx());
checkOrderDetl.setOrderNo(nccScZkmxbWms.getVbillcode());
checkOrderDetl.setAnfme(nccScZkmxbWms.getZmzsl().doubleValue());
checkOrderDetl.setBatch(nccScZkmxbWms.getVbatchcode());
@@ -215,4 +214,42 @@
}
+
+ /**
+ * 璋冩嫧鍗�
+ *
+ * @return
+ */
+ 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));
+ 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++;
+ }
+ nccCgCgdhdWms.setWmsFlag(1);
+ param.setOrderNo(nccCgCgdhdWms.getVbillcode());
+ }
+ param.setOrderDetails(orderDetails);
+ openService.pakoutOrderCreate(param);
+ nccSaleDbddWmsService.updateBatchById(wmsFlag);
+ } catch (Exception e) {
+ e.printStackTrace();
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg(e.getMessage());
+ }
+ return SUCCESS;
+ }
}
--
Gitblit v1.9.1