From 2ca8076932a6e2f6d189457a49cee5fd7f131c4a Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 16 五月 2025 16:48:02 +0800
Subject: [PATCH] 接口编写
---
src/main/java/com/zy/nc/task/PlanOrderTask.java | 13 ++++++
src/main/java/com/zy/nc/service/impl/NccCgCgdhdWmsServiceImpl.java | 7 +++
src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java | 76 ++++++++++++++++++++++++++++++-------
src/main/java/com/zy/nc/service/NccCgCgdhdWmsService.java | 3 +
src/main/java/com/zy/nc/service/NccCkPddWmsService.java | 3 +
5 files changed, 87 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/nc/service/NccCgCgdhdWmsService.java b/src/main/java/com/zy/nc/service/NccCgCgdhdWmsService.java
index 75672fb..023267e 100644
--- a/src/main/java/com/zy/nc/service/NccCgCgdhdWmsService.java
+++ b/src/main/java/com/zy/nc/service/NccCgCgdhdWmsService.java
@@ -3,6 +3,8 @@
import com.zy.nc.entity.NccCgCgdhdWms;
import com.baomidou.mybatisplus.service.IService;
+import java.util.List;
+
/**
* @author ZY
* @description 閽堝琛ㄣ�恘cc_cg_cgdhd_wms銆戠殑鏁版嵁搴撴搷浣淪ervice
@@ -10,4 +12,5 @@
*/
public interface NccCgCgdhdWmsService extends IService<NccCgCgdhdWms> {
+ List<String> selectCg();
}
diff --git a/src/main/java/com/zy/nc/service/NccCkPddWmsService.java b/src/main/java/com/zy/nc/service/NccCkPddWmsService.java
index b3ffb71..4fd2299 100644
--- a/src/main/java/com/zy/nc/service/NccCkPddWmsService.java
+++ b/src/main/java/com/zy/nc/service/NccCkPddWmsService.java
@@ -3,6 +3,8 @@
import com.zy.nc.entity.NccCkPddWms;
import com.baomidou.mybatisplus.service.IService;
+import java.util.List;
+
/**
* @author ZY
* @description 閽堝琛ㄣ�恘cc_ck_pdd_wms銆戠殑鏁版嵁搴撴搷浣淪ervice
@@ -10,4 +12,5 @@
*/
public interface NccCkPddWmsService extends IService<NccCkPddWms> {
+ List<String> selectCg();
}
diff --git a/src/main/java/com/zy/nc/service/impl/NccCgCgdhdWmsServiceImpl.java b/src/main/java/com/zy/nc/service/impl/NccCgCgdhdWmsServiceImpl.java
index 40f93ea..22b67d2 100644
--- a/src/main/java/com/zy/nc/service/impl/NccCgCgdhdWmsServiceImpl.java
+++ b/src/main/java/com/zy/nc/service/impl/NccCgCgdhdWmsServiceImpl.java
@@ -6,6 +6,9 @@
import com.zy.nc.mapper.NccCgCgdhdWmsMapper;
import org.springframework.stereotype.Service;
+import java.util.Collections;
+import java.util.List;
+
/**
* @author ZY
* @description 閽堝琛ㄣ�恘cc_cg_cgdhd_wms銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
@@ -15,4 +18,8 @@
public class NccCgCgdhdWmsServiceImpl extends ServiceImpl<NccCgCgdhdWmsMapper, NccCgCgdhdWms>
implements NccCgCgdhdWmsService{
+ @Override
+ public List<String> selectCg() {
+ return Collections.emptyList();
+ }
}
diff --git a/src/main/java/com/zy/nc/task/PlanOrderTask.java b/src/main/java/com/zy/nc/task/PlanOrderTask.java
index 8d74b80..8f55581 100644
--- a/src/main/java/com/zy/nc/task/PlanOrderTask.java
+++ b/src/main/java/com/zy/nc/task/PlanOrderTask.java
@@ -40,6 +40,7 @@
log.error(returnT.getMsg());
}
}
+
/**
* 閲囪喘鍒拌揣鍗�
*
@@ -53,4 +54,16 @@
}
}
+ /**
+ * 鐩樼偣鍗�
+ *
+ * @return
+ */
+ @Scheduled(cron = "0/3 * * * * ? ")
+ public void execute4() {
+ ReturnT<String> returnT = planOrderHandler.start4();
+ if (!returnT.isSuccess()) {
+ log.error(returnT.getMsg());
+ }
+ }
}
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 20e015d..2e218e7 100644
--- a/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java
+++ b/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java
@@ -2,14 +2,18 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.zy.asrs.entity.param.OpenOrderPakinParam;
import com.zy.asrs.entity.param.OpenOrderPakoutParam;
import com.zy.asrs.service.OpenService;
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 lombok.extern.slf4j.Slf4j;
@@ -31,6 +35,9 @@
@Autowired
private NccCgCgdhdWmsService nccCgCgdhdWmsService;
+
+ @Autowired
+ private NccCkPddWmsService nccCkPddWmsService;
@Autowired
private OpenService openService;
@@ -107,37 +114,76 @@
/**
- * 杞簱
+ * 閲囪喘鍒拌揣
*
* @return
*/
public ReturnT<String> start3() {
List<String> strings = nccCgCgdhdWmsService.selectCg();
for (String string : strings) {
- OpenOrderPakoutParam param = new OpenOrderPakoutParam();
- param.setOrderType("杞簱");
+ OpenOrderPakinParam param = new OpenOrderPakinParam();
+ param.setOrderType("閲囪喘鍒拌揣");
DetlDto detlDto;
List<DetlDto> orderDetails = new ArrayList<>();
long i = 1;
- List<NccScZkmxbWms> wmsFlag = nccScZkmxbWmsService.selectList(new EntityWrapper<NccScZkmxbWms>().eq("vbillcode", string).ne("wms_flag", 1));
- for (NccScZkmxbWms nccScZkmxbWms : wmsFlag) {
+ List<NccCgCgdhdWms> wmsFlag = nccCgCgdhdWmsService.selectList(new EntityWrapper<NccCgCgdhdWms>().eq("vbillcode", string).ne("wms_flag", 1));
+ for (NccCgCgdhdWms nccScZkmxbWms : wmsFlag) {
log.info("NccScZkmxbWms鏁版嵁:{}", JSONObject.toJSON(nccScZkmxbWms));
- if (nccScZkmxbWms.getDjzt() == 2 && 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);
- orderDetails.add(detlDto);
- i++;
- }
+// if (nccScZkmxbWms.getDjzt() == 2 && 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);
+// orderDetails.add(detlDto);
+// i++;
+// }
+ nccScZkmxbWms.setWmsFlag(1);
+ }
+ param.setOrderNo(string);
+ param.setOrderDetails(orderDetails);
+ openService.pakinOrderCreate(param);
+ nccCgCgdhdWmsService.updateBatchById(wmsFlag);
+ }
+ return SUCCESS;
+ }
+
+
+
+ /**
+ * 鐩樼偣鍗�
+ *
+ * @return
+ */
+ public ReturnT<String> start4() {
+ List<String> strings = nccCkPddWmsService.selectCg();
+ for (String string : strings) {
+ OpenOrderPakoutParam param = new OpenOrderPakoutParam();
+ param.setOrderType("閲囪喘鍒拌揣");
+ DetlDto detlDto;
+ List<DetlDto> orderDetails = new ArrayList<>();
+ long i = 1;
+ List<NccCkPddWms> wmsFlag = nccCkPddWmsService.selectList(new EntityWrapper<NccCkPddWms>().eq("vbillcode", string).ne("wms_flag", 1));
+ for (NccCkPddWms nccScZkmxbWms : wmsFlag) {
+ log.info("NccCkPddWms鏁版嵁:{}", JSONObject.toJSON(nccScZkmxbWms));
+// if (nccScZkmxbWms.getDjzt() == 2 && 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);
+// orderDetails.add(detlDto);
+// i++;
+// }
nccScZkmxbWms.setWmsFlag(1);
}
param.setOrderNo(string);
param.setOrderDetails(orderDetails);
openService.pakoutOrderCreate(param);
- nccScZkmxbWmsService.updateBatchById(wmsFlag);
+ nccCkPddWmsService.updateBatchById(wmsFlag);
}
return SUCCESS;
}
+
+
}
--
Gitblit v1.9.1