From dc84bb47fbc3ffc22a6ba36d30a2852432c2d01d Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期六, 10 五月 2025 09:23:50 +0800
Subject: [PATCH] 读取第二数据源
---
src/main/java/com/zy/nc/service/impl/NccScZkmxbWmsServiceImpl.java | 2 +-
src/main/webapp/views/docType/docType.html | 2 +-
src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java | 18 ++++++++++--------
src/main/java/com/zy/nc/task/handler/BaseDataHandler.java | 13 +++++++++++--
src/main/resources/mapper/nc/NccSaleXsfhmxWmsMapper.xml | 6 +++---
src/main/resources/mapper/nc/NccScZkmxbWmsMapper.xml | 6 +++---
src/main/webapp/static/js/docType/docType.js | 4 ++--
7 files changed, 31 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/zy/nc/service/impl/NccScZkmxbWmsServiceImpl.java b/src/main/java/com/zy/nc/service/impl/NccScZkmxbWmsServiceImpl.java
index 47b5819..552cf0d 100644
--- a/src/main/java/com/zy/nc/service/impl/NccScZkmxbWmsServiceImpl.java
+++ b/src/main/java/com/zy/nc/service/impl/NccScZkmxbWmsServiceImpl.java
@@ -20,6 +20,6 @@
@Override
public List<String> selectZk() {
- return Collections.emptyList();
+ return this.baseMapper.selectZk();
}
}
diff --git a/src/main/java/com/zy/nc/task/handler/BaseDataHandler.java b/src/main/java/com/zy/nc/task/handler/BaseDataHandler.java
index fb441a6..3406dbc 100644
--- a/src/main/java/com/zy/nc/task/handler/BaseDataHandler.java
+++ b/src/main/java/com/zy/nc/task/handler/BaseDataHandler.java
@@ -151,17 +151,26 @@
Page<NccJcRyWms> wmsFlag = nccJcRyWmsService.selectPage(page, new EntityWrapper<NccJcRyWms>().ne("wms_flag", 1).eq("sszzmc", "娴欐睙绂忚幈鏂版潗鏂欒偂浠芥湁闄愬叕鍙哥儫鍙板垎鍏徃"));
for (NccJcRyWms nccJcRyWms : wmsFlag.getRecords()) {
User user = userService.selectOne(new EntityWrapper<User>().eq("username", nccJcRyWms.getRybm()));
- nccJcRyWms.setWmsFlag(1);
if (user == null) {
user = new User();
user.setUsername(nccJcRyWms.getRybm());
+ user.setNickname(nccJcRyWms.getRymc());
+ user.setRoleId(12L);
user.setStatus(1);
user.setCreateTime(new Date());
userService.insert(user);
+ }else {
+ user.setUsername(nccJcRyWms.getRybm());
+ user.setNickname(nccJcRyWms.getRymc());
+ user.setRoleId(12L);
+ user.setStatus(1);
+ userService.updateById(user);
}
+ nccJcRyWms.setWmsFlag(1);
+ nccJcRyWmsService.updateById(nccJcRyWms);
log.info("NccJcRyWms鏁版嵁:{}", JSONObject.toJSON(nccJcRyWms));
}
- nccJcRyWmsService.updateBatchById(wmsFlag.getRecords());
+
return SUCCESS;
}
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 3f2c0c3..b45b738 100644
--- a/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java
+++ b/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java
@@ -2,7 +2,7 @@
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;
@@ -40,7 +40,7 @@
List<String> Ids = nccSaleXsfhmxWmsService.selectXsfh();
for (String id : Ids) {
List<NccSaleXsfhmxWms> wmsFlag = nccSaleXsfhmxWmsService.selectList(new EntityWrapper<NccSaleXsfhmxWms>().eq("cdeliveryid", id).ne("wms_flag", 1).eq("fstatusflag", 2));
- OpenOrderPakinParam param = new OpenOrderPakinParam();
+ OpenOrderPakoutParam param = new OpenOrderPakoutParam();
param.setOrderType("閿�鍞彂璐�");
DetlDto detlDto;
List<DetlDto> orderDetails = new ArrayList<>();
@@ -51,14 +51,15 @@
detlDto.setMatnr(nccSaleXsfhmxWms.getWlbm());
detlDto.setAnfme(nccSaleXsfhmxWms.getNastnum());
detlDto.setLineNumber(i);
- nccSaleXsfhmxWms.setWmsFlag(1);
orderDetails.add(detlDto);
log.info("NccSaleXsfhmxWms鏁版嵁:{}", JSONObject.toJSON(nccSaleXsfhmxWms));
i++;
}
+ nccSaleXsfhmxWms.setWmsFlag(1);
}
+ param.setOrderNo(id);
param.setOrderDetails(orderDetails);
- openService.pakinOrderCreate(param);
+ openService.pakoutOrderCreate(param);
nccSaleXsfhmxWmsService.updateBatchById(wmsFlag);
}
return SUCCESS;
@@ -72,12 +73,12 @@
public ReturnT<String> start2() {
List<String> strings = nccScZkmxbWmsService.selectZk();
for (String string : strings) {
- OpenOrderPakinParam param = new OpenOrderPakinParam();
+ OpenOrderPakoutParam param = new OpenOrderPakoutParam();
param.setOrderType("杞簱");
DetlDto detlDto;
List<DetlDto> orderDetails = new ArrayList<>();
long i = 1;
- List<NccScZkmxbWms> wmsFlag = nccScZkmxbWmsService.selectList(new EntityWrapper<NccScZkmxbWms>().eq("cdeliveryid", string).ne("wms_flag", 1));
+ List<NccScZkmxbWms> wmsFlag = nccScZkmxbWmsService.selectList(new EntityWrapper<NccScZkmxbWms>().eq("vbillcode", string).ne("wms_flag", 1));
for (NccScZkmxbWms nccScZkmxbWms : wmsFlag) {
log.info("NccScZkmxbWms鏁版嵁:{}", JSONObject.toJSON(nccScZkmxbWms));
if (nccScZkmxbWms.getDjzt() == 2 && nccScZkmxbWms.getBdr() == 0 && nccScZkmxbWms.getDr() == 0) {
@@ -86,13 +87,14 @@
detlDto.setAnfme(nccScZkmxbWms.getYingzzsl());
detlDto.setBatch(nccScZkmxbWms.getVbatchcode());
detlDto.setLineNumber(i);
- nccScZkmxbWms.setWmsFlag(1);
orderDetails.add(detlDto);
i++;
}
+ nccScZkmxbWms.setWmsFlag(1);
}
+ param.setOrderNo(string);
param.setOrderDetails(orderDetails);
- openService.pakinOrderCreate(param);
+ openService.pakoutOrderCreate(param);
nccScZkmxbWmsService.updateBatchById(wmsFlag);
}
return SUCCESS;
diff --git a/src/main/resources/mapper/nc/NccSaleXsfhmxWmsMapper.xml b/src/main/resources/mapper/nc/NccSaleXsfhmxWmsMapper.xml
index 5f2ad6c..25dcdee 100644
--- a/src/main/resources/mapper/nc/NccSaleXsfhmxWmsMapper.xml
+++ b/src/main/resources/mapper/nc/NccSaleXsfhmxWmsMapper.xml
@@ -101,8 +101,8 @@
<select id="selectXsfh" resultType="java.lang.String">
- select distinct
- CDELIVERYID
- from ncc_sale_xsfhmx_wms where wms_flag != 1 and fstatusflag = 2 limit 100
+ select distinct VBILLCODE
+ from ncc_sale_xsfhmx_wms
+ where wms_flag != 1 and fstatusflag = 2 limit 100
</select>
</mapper>
diff --git a/src/main/resources/mapper/nc/NccScZkmxbWmsMapper.xml b/src/main/resources/mapper/nc/NccScZkmxbWmsMapper.xml
index 4334b14..939895f 100644
--- a/src/main/resources/mapper/nc/NccScZkmxbWmsMapper.xml
+++ b/src/main/resources/mapper/nc/NccScZkmxbWmsMapper.xml
@@ -76,8 +76,8 @@
</sql>
<select id="selectZk" resultType="java.lang.String">
- select distinct
- CDELIVERYID
- from ncc_sale_xsfhmx_wms where wms_flag != 1 and fstatusflag = 2 limit 100
+ select distinct VBILLCODE
+ from ncc_sale_xsfhmx_wms
+ where wms_flag != 1 and fstatusflag = 2 limit 100
</select>
</mapper>
diff --git a/src/main/webapp/static/js/docType/docType.js b/src/main/webapp/static/js/docType/docType.js
index 55a7e40..ff52b86 100644
--- a/src/main/webapp/static/js/docType/docType.js
+++ b/src/main/webapp/static/js/docType/docType.js
@@ -16,8 +16,8 @@
headers: {token: localStorage.getItem('token')},
url: baseUrl+'/docType/list/auth',
page: true,
- limit: 15,
- limits: [15, 30, 50, 100, 200, 500],
+ limit: 100,
+ limits: [ 100, 200, 500],
toolbar: '#toolbar',
cellMinWidth: 50,
height: 'full-120',
diff --git a/src/main/webapp/views/docType/docType.html b/src/main/webapp/views/docType/docType.html
index 597d2f4..b9b98c6 100644
--- a/src/main/webapp/views/docType/docType.html
+++ b/src/main/webapp/views/docType/docType.html
@@ -70,7 +70,7 @@
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/docType/docType.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/docType/docType.js?v=1" charset="utf-8"></script>
</body>
<!-- 琛ㄥ崟寮圭獥 -->
<script type="text/html" id="editDialog">
--
Gitblit v1.9.1