From 2e0d98030100f7c201c50a94073f33c22082f24c Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 23 五月 2025 12:43:03 +0800
Subject: [PATCH] 接口编写
---
/dev/null | 1
src/main/java/com/zy/common/config/ds/SecondaryDataSourceConfig.java | 6 +
src/main/resources/mapper/nc/NccCkPddWmsMapper.xml | 2
src/main/java/com/zy/nc/task/PlanOrderTask.java | 10 +-
src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java | 102 +++++++++++++++------------------
src/main/resources/mapper/nc/NccScZkmxbWmsMapper.xml | 4
src/main/java/com/zy/common/config/ds/PrimaryDataSourceConfig.java | 5 +
7 files changed, 63 insertions(+), 67 deletions(-)
diff --git a/src/main/java/com/zy/common/config/ds/PrimaryDataSourceConfig.java b/src/main/java/com/zy/common/config/ds/PrimaryDataSourceConfig.java
index baa99b0..16b482c 100644
--- a/src/main/java/com/zy/common/config/ds/PrimaryDataSourceConfig.java
+++ b/src/main/java/com/zy/common/config/ds/PrimaryDataSourceConfig.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.plugins.PaginationInterceptor;
import com.baomidou.mybatisplus.spring.MybatisSqlSessionFactoryBean;
+import org.apache.ibatis.plugin.Interceptor;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Bean;
@@ -18,12 +19,14 @@
@Bean(name = "primarySqlSessionFactory")
@Primary
- public MybatisSqlSessionFactoryBean primarySqlSessionFactory(@Qualifier("dataSource") DataSource dataSource) throws Exception {
+ public MybatisSqlSessionFactoryBean primarySqlSessionFactory(@Qualifier("dataSource") DataSource dataSource, PaginationInterceptor paginationInterceptor) throws Exception {
MybatisSqlSessionFactoryBean sessionFactory = new MybatisSqlSessionFactoryBean();
sessionFactory.setDataSource(dataSource);
// 璁剧疆MyBatis鐨凪apper XML鏂囦欢璺緞
sessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver()
.getResources("classpath:mapper/asrs/*.xml"));
+ Interceptor[] interceptors = new Interceptor[]{paginationInterceptor};
+ sessionFactory.setPlugins(interceptors);
return sessionFactory;
}
diff --git a/src/main/java/com/zy/common/config/ds/SecondaryDataSourceConfig.java b/src/main/java/com/zy/common/config/ds/SecondaryDataSourceConfig.java
index 59e9afa..48ed557 100644
--- a/src/main/java/com/zy/common/config/ds/SecondaryDataSourceConfig.java
+++ b/src/main/java/com/zy/common/config/ds/SecondaryDataSourceConfig.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.plugins.PaginationInterceptor;
import com.baomidou.mybatisplus.spring.MybatisSqlSessionFactoryBean;
+import org.apache.ibatis.plugin.Interceptor;
import org.apache.ibatis.session.SqlSessionFactory;
import org.mybatis.spring.SqlSessionFactoryBean;
import org.mybatis.spring.annotation.MapperScan;
@@ -18,12 +19,15 @@
public class SecondaryDataSourceConfig {
@Bean(name = "secondarySqlSessionFactory")
- public MybatisSqlSessionFactoryBean secondarySqlSessionFactory(@Qualifier("slaveDataSource") DataSource dataSource) throws Exception {
+ public MybatisSqlSessionFactoryBean secondarySqlSessionFactory(@Qualifier("slaveDataSource") DataSource dataSource, PaginationInterceptor paginationInterceptor) throws Exception {
MybatisSqlSessionFactoryBean sessionFactory = new MybatisSqlSessionFactoryBean();
sessionFactory.setDataSource(dataSource);
// 璁剧疆MyBatis鐨凪apper XML鏂囦欢璺緞
sessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver()
.getResources("classpath:mapper/nc/*.xml"));
+ Interceptor[] interceptors = new Interceptor[] { paginationInterceptor };
+ sessionFactory.setPlugins(interceptors);
+
return sessionFactory;
}
diff --git a/src/main/java/com/zy/nc/task/PlanOrderTask.java b/src/main/java/com/zy/nc/task/PlanOrderTask.java
index 5e63857..54ed163 100644
--- a/src/main/java/com/zy/nc/task/PlanOrderTask.java
+++ b/src/main/java/com/zy/nc/task/PlanOrderTask.java
@@ -48,7 +48,7 @@
public void execute1() {
List<String> Ids = nccSaleXsfhmxWmsService.selectXsfh();
for (String id : Ids) {
- List<NccSaleXsfhmxWms> wmsFlag = nccSaleXsfhmxWmsService.selectList(new EntityWrapper<NccSaleXsfhmxWms>().eq("vbillcode", id).ne("wms_flag", 1).eq("fstatusflag", 2));
+ List<NccSaleXsfhmxWms> wmsFlag = nccSaleXsfhmxWmsService.selectList(new EntityWrapper<NccSaleXsfhmxWms>().eq("vbillcode", id).ne("wms_flag", 1).eq("fstatusflag", 2).eq("hdr", 0).eq("bdr", 0).eq("fstatusflag", 2));
if (wmsFlag == null || wmsFlag.isEmpty()) {
return;
}
@@ -76,7 +76,7 @@
//String s = "涓�鏈熸垚鍝佸簱-鍐呰锤(绔嬩綋搴�)銆佷竴鏈熸垚鍝佸簱-绂忚幈鍥介檯澶栬锤(绔嬩綋搴�)銆佷竴鏈熸垚鍝佸簱-澶栬喘(绔嬩綋搴�)銆佷竴鏈熸垚鍝佸簱-绂忚揪/宸ュ巶澶栬锤(绔嬩綋搴�)銆佷竴鏈熻緟鏂欏簱-鍖呮潗(绔嬩綋搴�)";
List<String> strings = nccScZkmxbWmsService.selectZkIn(ids);
for (String string : strings) {
- List<NccScZkmxbWms> wmsFlag = nccScZkmxbWmsService.selectList(new EntityWrapper<NccScZkmxbWms>().eq("vbillcode", string).ne("wms_flag", 1));
+ List<NccScZkmxbWms> wmsFlag = nccScZkmxbWmsService.selectList(new EntityWrapper<NccScZkmxbWms>().eq("vbillcode", string).ne("wms_flag", 1).eq("dr", 0).eq("bdr", 0));
if (wmsFlag == null || wmsFlag.isEmpty()) {
return;
}
@@ -101,7 +101,7 @@
List<Integer> ids = Arrays.asList(6101, 6102, 6106, 6110);
List<String> strings = nccScZkmxbWmsService.selectZkOut(ids);
for (String string : strings) {
- List<NccScZkmxbWms> wmsFlag = nccScZkmxbWmsService.selectList(new EntityWrapper<NccScZkmxbWms>().eq("vbillcode", string).ne("wms_flag", 1));
+ List<NccScZkmxbWms> wmsFlag = nccScZkmxbWmsService.selectList(new EntityWrapper<NccScZkmxbWms>().eq("vbillcode", string).ne("wms_flag", 1).eq("hdr", 0).eq("bdr", 0));
if (wmsFlag == null || wmsFlag.isEmpty()) {
return;
}
@@ -125,7 +125,7 @@
public void execute3() {
List<String> strings = nccCgCgdhdWmsService.selectCg();
for (String string : strings) {
- List<NccCgCgdhdWms> wmsFlag = nccCgCgdhdWmsService.selectList(new EntityWrapper<NccCgCgdhdWms>().eq("vbillcode", string).ne("wms_flag", 1));
+ List<NccCgCgdhdWms> wmsFlag = nccCgCgdhdWmsService.selectList(new EntityWrapper<NccCgCgdhdWms>().eq("vbillcode", string).ne("wms_flag", 1).eq("hdr", 0).eq("bdr", 0));
if (wmsFlag == null || wmsFlag.isEmpty()) {
return;
}
@@ -151,7 +151,7 @@
List<Integer> ids = Arrays.asList(6101, 6102, 6106, 6110);
List<String> strings = nccSaleDbddWmsService.selectDbdd(ids);
for (String string : strings) {
- List<NccSaleDbddWms> wmsFlag = nccSaleDbddWmsService.selectList(new EntityWrapper<NccSaleDbddWms>().eq("vbillcode", string).ne("wms_flag", 1));
+ List<NccSaleDbddWms> wmsFlag = nccSaleDbddWmsService.selectList(new EntityWrapper<NccSaleDbddWms>().eq("vbillcode", string).ne("wms_flag", 1).eq("dr", 0).eq("bdr", 0));
if (wmsFlag == null || wmsFlag.isEmpty()) {
return;
}
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 1e4cd13..6a304ed 100644
--- a/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java
+++ b/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java
@@ -70,16 +70,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());
}
@@ -108,16 +106,14 @@
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));
+ orderDetails.add(detlDto);
+ i++;
nccScZkmxbWms.setWmsFlag(1);
param.setOrderNo(nccScZkmxbWms.getVbillcode());
}
@@ -146,16 +142,14 @@
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));
+ orderDetails.add(detlDto);
+ i++;
nccScZkmxbWms.setWmsFlag(1);
param.setOrderNo(nccScZkmxbWms.getVbillcode());
}
@@ -184,16 +178,14 @@
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.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.getYdzsl().doubleValue());
+ detlDto.setBatch(nccCgCgdhdWms.getVbatchcode());
+ detlDto.setLineNumber(i);
+ detlDto.setRemark(JSONObject.toJSONString(nccCgCgdhdWms));
+ orderDetails.add(detlDto);
+ i++;
nccCgCgdhdWms.setWmsFlag(1);
param.setOrderNo(nccCgCgdhdWms.getVbillcode());
}
@@ -220,23 +212,21 @@
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());
}
diff --git a/src/main/resources/mapper/nc/NccCkPddWmsMapper.xml b/src/main/resources/mapper/nc/NccCkPddWmsMapper.xml
index 8efdaaf..a47f5d6 100644
--- a/src/main/resources/mapper/nc/NccCkPddWmsMapper.xml
+++ b/src/main/resources/mapper/nc/NccCkPddWmsMapper.xml
@@ -50,6 +50,6 @@
<select id="selectPdd" resultType="java.lang.String">
select distinct VBILLCODE
from ncc_ck_pdd_wms
- where wms_flag != 1 and FBILLFLAG = 2 limit 100
+ where wms_flag != 1 and FBILLFLAG = 2 and hdr =0 and bdr =0 limit 100
</select>
</mapper>
diff --git a/src/main/resources/mapper/nc/NccScZkmxbWmsMapper.xml b/src/main/resources/mapper/nc/NccScZkmxbWmsMapper.xml
index dd9f2c1..2cc6d0d 100644
--- a/src/main/resources/mapper/nc/NccScZkmxbWmsMapper.xml
+++ b/src/main/resources/mapper/nc/NccScZkmxbWmsMapper.xml
@@ -79,7 +79,7 @@
<select id="selectZkIn" resultType="java.lang.String">
select distinct VBILLCODE
from ncc_sc_zkmxb_wms
- where wms_flag != 1 and DJZT = 4
+ where wms_flag != 1 and DJZT = 4 and dr =0 and bdr =0
<if test="ids != null">
and RKCKBM in
<foreach item="id" collection="ids" separator="," open="(" close=")" index="">
@@ -92,7 +92,7 @@
<select id="selectZkOut" resultType="java.lang.String">
select distinct VBILLCODE
from ncc_sc_zkmxb_wms
- where wms_flag != 1 and DJZT = 4
+ where wms_flag != 1 and DJZT = 4 and dr =0 and bdr =0
<if test="ids != null">
and CKCKBM in
<foreach item="id" collection="ids" separator="," open="(" close=")" index="">
diff --git a/src/main/resources/spring.factories b/src/main/resources/spring.factories
deleted file mode 100644
index da631fc..0000000
--- a/src/main/resources/spring.factories
+++ /dev/null
@@ -1 +0,0 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=com.core.config.CoolBaseConfig
--
Gitblit v1.9.1