From 05e0d3af6b31300b9ef06a1214e921b8817c9c18 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期六, 17 五月 2025 08:54:51 +0800
Subject: [PATCH] 接口编写
---
src/main/resources/mapper/nc/NccCgCgdhdWmsMapper.xml | 6 ++++++
src/main/resources/mapper/nc/NccCkPddWmsMapper.xml | 6 ++++++
src/main/java/com/zy/nc/mapper/NccCkPddWmsMapper.java | 3 +++
src/main/java/com/zy/nc/mapper/NccCgCgdhdWmsMapper.java | 4 +++-
src/main/java/com/zy/nc/service/impl/NccCgCgdhdWmsServiceImpl.java | 2 +-
src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java | 22 ++++++++++------------
src/main/java/com/zy/nc/service/impl/NccCkPddWmsServiceImpl.java | 7 +++++++
pom.xml | 2 +-
src/main/java/com/zy/nc/service/NccCkPddWmsService.java | 2 +-
9 files changed, 38 insertions(+), 16 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2697c69..33d1527 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
- <scope>provided</scope>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
diff --git a/src/main/java/com/zy/nc/mapper/NccCgCgdhdWmsMapper.java b/src/main/java/com/zy/nc/mapper/NccCgCgdhdWmsMapper.java
index cfddb3b..47f25ce 100644
--- a/src/main/java/com/zy/nc/mapper/NccCgCgdhdWmsMapper.java
+++ b/src/main/java/com/zy/nc/mapper/NccCgCgdhdWmsMapper.java
@@ -3,6 +3,8 @@
import com.zy.nc.entity.NccCgCgdhdWms;
import com.baomidou.mybatisplus.mapper.BaseMapper;
+import java.util.List;
+
/**
* @author ZY
* @description 閽堝琛ㄣ�恘cc_cg_cgdhd_wms銆戠殑鏁版嵁搴撴搷浣淢apper
@@ -11,5 +13,5 @@
*/
public interface NccCgCgdhdWmsMapper extends BaseMapper<NccCgCgdhdWms> {
-
+ List<String> selectCg();
}
diff --git a/src/main/java/com/zy/nc/mapper/NccCkPddWmsMapper.java b/src/main/java/com/zy/nc/mapper/NccCkPddWmsMapper.java
index 38ab2c7..6120f36 100644
--- a/src/main/java/com/zy/nc/mapper/NccCkPddWmsMapper.java
+++ b/src/main/java/com/zy/nc/mapper/NccCkPddWmsMapper.java
@@ -3,6 +3,8 @@
import com.zy.nc.entity.NccCkPddWms;
import com.baomidou.mybatisplus.mapper.BaseMapper;
+import java.util.List;
+
/**
* @author ZY
* @description 閽堝琛ㄣ�恘cc_ck_pdd_wms銆戠殑鏁版嵁搴撴搷浣淢apper
@@ -12,4 +14,5 @@
public interface NccCkPddWmsMapper extends BaseMapper<NccCkPddWms> {
+ List<String> selectPdd();
}
diff --git a/src/main/java/com/zy/nc/service/NccCkPddWmsService.java b/src/main/java/com/zy/nc/service/NccCkPddWmsService.java
index 4fd2299..bb90248 100644
--- a/src/main/java/com/zy/nc/service/NccCkPddWmsService.java
+++ b/src/main/java/com/zy/nc/service/NccCkPddWmsService.java
@@ -12,5 +12,5 @@
*/
public interface NccCkPddWmsService extends IService<NccCkPddWms> {
- List<String> selectCg();
+ List<String> selectPdd();
}
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 22b67d2..ca49846 100644
--- a/src/main/java/com/zy/nc/service/impl/NccCgCgdhdWmsServiceImpl.java
+++ b/src/main/java/com/zy/nc/service/impl/NccCgCgdhdWmsServiceImpl.java
@@ -20,6 +20,6 @@
@Override
public List<String> selectCg() {
- return Collections.emptyList();
+ return this.baseMapper.selectCg();
}
}
diff --git a/src/main/java/com/zy/nc/service/impl/NccCkPddWmsServiceImpl.java b/src/main/java/com/zy/nc/service/impl/NccCkPddWmsServiceImpl.java
index dc53ac3..186fabb 100644
--- a/src/main/java/com/zy/nc/service/impl/NccCkPddWmsServiceImpl.java
+++ b/src/main/java/com/zy/nc/service/impl/NccCkPddWmsServiceImpl.java
@@ -6,6 +6,9 @@
import com.zy.nc.mapper.NccCkPddWmsMapper;
import org.springframework.stereotype.Service;
+import java.util.Collections;
+import java.util.List;
+
/**
* @author ZY
* @description 閽堝琛ㄣ�恘cc_ck_pdd_wms銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
@@ -15,4 +18,8 @@
public class NccCkPddWmsServiceImpl extends ServiceImpl<NccCkPddWmsMapper, NccCkPddWms>
implements NccCkPddWmsService{
+ @Override
+ public List<String> selectPdd() {
+ return this.baseMapper.selectPdd();
+ }
}
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 2e218e7..1df8981 100644
--- a/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java
+++ b/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java
@@ -129,15 +129,14 @@
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.getBdr() == 0 && nccScZkmxbWms.getHdr() == 0) {
+ detlDto = new DetlDto();
+ detlDto.setMatnr(nccScZkmxbWms.getWlbm());
+ detlDto.setAnfme(nccScZkmxbWms.getYdzsl().doubleValue());
+ detlDto.setLineNumber(i);
+ orderDetails.add(detlDto);
+ i++;
+ }
nccScZkmxbWms.setWmsFlag(1);
}
param.setOrderNo(string);
@@ -149,14 +148,13 @@
}
-
/**
* 鐩樼偣鍗�
*
* @return
*/
public ReturnT<String> start4() {
- List<String> strings = nccCkPddWmsService.selectCg();
+ List<String> strings = nccCkPddWmsService.selectPdd();
for (String string : strings) {
OpenOrderPakoutParam param = new OpenOrderPakoutParam();
param.setOrderType("閲囪喘鍒拌揣");
@@ -179,7 +177,7 @@
}
param.setOrderNo(string);
param.setOrderDetails(orderDetails);
- openService.pakoutOrderCreate(param);
+ //openService.pakoutOrderCreate(param);
nccCkPddWmsService.updateBatchById(wmsFlag);
}
return SUCCESS;
diff --git a/src/main/resources/mapper/nc/NccCgCgdhdWmsMapper.xml b/src/main/resources/mapper/nc/NccCgCgdhdWmsMapper.xml
index fde8567..df39e17 100644
--- a/src/main/resources/mapper/nc/NccCgCgdhdWmsMapper.xml
+++ b/src/main/resources/mapper/nc/NccCgCgdhdWmsMapper.xml
@@ -46,4 +46,10 @@
VMEMO,WLBM,WLMC,NNUM,NASTNUM,
YDZSL,YDSL,HTS,BTS,wms_flag
</sql>
+
+ <select id="selectCg" resultType="java.lang.String">
+ select distinct VBILLCODE
+ from ncc_cg_cgdhd_wms
+ where wms_flag != 1 and FBILLSTATUS = 2 limit 100
+ </select>
</mapper>
diff --git a/src/main/resources/mapper/nc/NccCkPddWmsMapper.xml b/src/main/resources/mapper/nc/NccCkPddWmsMapper.xml
index 190c5f2..d3e6f6e 100644
--- a/src/main/resources/mapper/nc/NccCkPddWmsMapper.xml
+++ b/src/main/resources/mapper/nc/NccCkPddWmsMapper.xml
@@ -45,4 +45,10 @@
TMSL,ZMZSL,PDSL,SPZSL,HWBM,
HWMC,HTS,BTS,wms_flag
</sql>
+
+ <select id="selectPdd" resultType="java.lang.String">
+ select distinct VBILLCODE
+ from ncc_ck_pdd_wms
+ where wms_flag != 1 and FBILLFLAG = 2 limit 100
+ </select>
</mapper>
--
Gitblit v1.9.1