From 9220d57a83cc527cac2a33625fe518b5a03f0def Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 23 五月 2025 10:40:48 +0800
Subject: [PATCH] 接口编写
---
src/main/java/com/zy/asrs/controller/OrderController.java | 97 ++++++++++++-----------
src/main/java/com/zy/common/config/ds/SecondaryDataSourceConfig.java | 3
src/main/java/com/zy/common/config/ds/DataSourceConfig.java | 1
src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java | 95 ++++++++++++++++++++---
src/main/java/com/zy/nc/entity/NccScZkmxbWms.java | 4 +
src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java | 2
src/main/resources/spring.factories | 1
pom.xml | 7 +
src/main/java/com/zy/common/config/ds/PrimaryDataSourceConfig.java | 3
9 files changed, 150 insertions(+), 63 deletions(-)
diff --git a/pom.xml b/pom.xml
index 33d1527..31b2187 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,6 +61,13 @@
<artifactId>mybatis-plus-boot-starter</artifactId>
<version>${mybatis-plus.version}</version>
</dependency>
+ <!-- jdk 8+ 寮曞叆鍙�夋ā鍧� -->
+<!-- <dependency>-->
+<!-- <groupId>com.baomidou</groupId>-->
+<!-- <artifactId>mybatis-plus-jsqlparser-4.9</artifactId>-->
+<!-- <version>3.5.9</version>-->
+<!-- </dependency>-->
+
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 4c1bd74..8a9ffd2 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -9,7 +9,6 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.OrderDomainParam;
-
import com.zy.asrs.entity.result.WrkTraceVo;
import com.zy.asrs.service.*;
import com.zy.common.model.DetlDto;
@@ -45,7 +44,7 @@
@RequestMapping(value = "/order/nav/list/auth")
@ManagerAuth
- public R navList(@RequestParam(required = false) String orderNo){
+ public R navList(@RequestParam(required = false) String orderNo) {
EntityWrapper<Order> wrapper = new EntityWrapper<>();
if (!Cools.isEmpty(orderNo)) {
wrapper.like("order_no", orderNo);
@@ -73,15 +72,17 @@
@RequestMapping(value = "/order/head/page/auth")
@ManagerAuth
- public R head(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R head(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<Order> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ } else {
wrapper.orderBy("settle").orderBy("create_time", false);
}
wrapper.eq("status", 1);
@@ -90,27 +91,27 @@
@RequestMapping(value = "/order/detl/all/auth")
@ManagerAuth
- public R head(@RequestParam Long orderId){
+ public R head(@RequestParam Long orderId) {
return R.ok().add(orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_id", orderId)));
}
@RequestMapping(value = "/order/form/add/auth")
@ManagerAuth(memo = "鎵嬪姩娣诲姞璁㈠崟")
@Transactional
- public R formAdd(@RequestBody OrderDomainParam param){
+ public R formAdd(@RequestBody OrderDomainParam param) {
int status = 0;
- if(Cools.isEmpty(param.getOrderNo())){
+ if (Cools.isEmpty(param.getOrderNo())) {
String prefix = "";
DocType docType = docTypeService.selectById(param.getDocType());
- if(!Cools.isEmpty(docType)){
+ if (!Cools.isEmpty(docType)) {
prefix = docType.getPakin() == 1 ? "RK" : "CK";
status = (prefix.equals("RK") ? 1 : (prefix.equals("CK") ? 2 : 0));
}
param.setOrderNo(prefix + snowflakeIdWorker.nextId());
} else {
DocType docType = docTypeService.selectById(param.getDocType());
- if(!Cools.isEmpty(docType)){
- status = (docType.getPakin() == 1 ? 1 : 2 );
+ if (!Cools.isEmpty(docType)) {
+ status = (docType.getPakin() == 1 ? 1 : 2);
}
}
@@ -162,11 +163,11 @@
List<DetlDto> list = new ArrayList<>();
for (OrderDetl orderDetl : param.getOrderDetlList()) {
DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getBrand(),
- orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),
- orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3());
+ orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(),
+ orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3());
if (DetlDto.has(list, dto)) {
- OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getBrand(),orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),
- orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3());
+ OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getBrand(), orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(),
+ orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3());
item.setAnfme(item.getAnfme() + orderDetl.getAnfme());
if (!orderDetlService.updateById(item)) {
throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
@@ -193,7 +194,7 @@
@RequestMapping(value = "/order/form/modify/auth")
@ManagerAuth(memo = "鎵嬪姩淇敼璁㈠崟")
@Transactional
- public R formModify(@RequestBody OrderDomainParam param){
+ public R formModify(@RequestBody OrderDomainParam param) {
Order order = orderService.selectById(param.getOrderId());
if (order == null || order.getStatus() == 0) {
return R.error("璁㈠崟涓嶅瓨鍦�");
@@ -218,13 +219,13 @@
// 2.閲嶇粍鏁版嵁
List<DetlDto> list = new ArrayList<>();
for (OrderDetl orderDetl : param.getOrderDetlList()) {
- DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getBrand(),
- orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),
- orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3());
+ DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getBrand(),
+ orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(),
+ orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3());
if (DetlDto.has(list, dto)) {
- OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getBrand(),
- orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),
- orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3());
+ OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getBrand(),
+ orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(),
+ orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3());
item.setAnfme(item.getAnfme() + orderDetl.getAnfme());
if (!orderDetlService.updateById(item)) {
throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
@@ -286,8 +287,8 @@
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", wrkDetl.getWrkNo()).eq("io_time", wrkDetl.getIoTime()));
if (wrkMast == null) {
WrkMastLog wrkMastLog = wrkMastLogService.selectOne(new EntityWrapper<WrkMastLog>().eq("wrk_no", wrkDetl.getWrkNo()).eq("io_time", wrkDetl.getIoTime()));
- if (wrkMastLog.getIoType()==103){
- wrkMastLog = wrkMastLogService.selectOne(new EntityWrapper<WrkMastLog>().eq("wrk_no", wrkDetl.getWrkNo()).eq("io_time", wrkDetl.getIoTime()).eq("io_type",53));
+ if (wrkMastLog.getIoType() == 103) {
+ wrkMastLog = wrkMastLogService.selectOne(new EntityWrapper<WrkMastLog>().eq("wrk_no", wrkDetl.getWrkNo()).eq("io_time", wrkDetl.getIoTime()).eq("io_type", 53));
}
if (wrkMastLog != null) {
wrkMast = new WrkMast();
@@ -315,9 +316,9 @@
.add("list", wrkTraceVos)
.add("orderNo", order.getOrderNo())
.add("totalQty", totalQty)
- .add("wrkQty", wrkQty+endQty)
+ .add("wrkQty", wrkQty + endQty)
.add("lackQty", lackQty)
- .add("endQty",endQty)
+ .add("endQty", endQty)
);
}
@@ -332,22 +333,24 @@
@RequestMapping(value = "/order/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<Order> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.ok(orderService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -359,15 +362,15 @@
@RequestMapping(value = "/order/update/auth")
@ManagerAuth
- public R update(Order order){
- if (Cools.isEmpty(order) || null == order.getId()){
+ public R update(Order order) {
+ if (Cools.isEmpty(order) || null == order.getId()) {
return R.error();
}
//璁㈠崟瀹岀粨鍓嶏紝鍒ゆ柇鏄惁瀛樺湪浣滀笟涓暟鎹紝瀛樺湪鍒欎笉鑳藉畬缁�
- if(order.getSettle() == 4){
- int wrkCount = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("order_no",order.getOrderNo()));
- int pakinCount = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("order_no",order.getOrderNo()));
+ if (order.getSettle() == 4) {
+ int wrkCount = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("order_no", order.getOrderNo()));
+ int pakinCount = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("order_no", order.getOrderNo()));
if (wrkCount > 0 || pakinCount > 0) {
throw new CoolException("瀛樺湪浣滀笟涓暟鎹紝涓嶈兘瀹岀粨銆傝妫�鏌ュ叆搴撻�氱煡妗ｅ拰宸ヤ綔妗�");
}
@@ -384,7 +387,7 @@
@RequestMapping(value = "/order/delete/auth")
@ManagerAuth(memo = "鎵嬪姩鍒犻櫎璁㈠崟")
@Transactional
- public R delete(@RequestParam Long orderId){
+ public R delete(@RequestParam Long orderId) {
orderService.remove(orderId);
// Order order = orderService.selectById(orderId);
// if (order != null) {
@@ -399,7 +402,7 @@
@RequestMapping(value = "/order/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<Order> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("order"));
@@ -415,7 +418,7 @@
wrapper.like("id", condition);
Page<Order> page = orderService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (Order order : page.getRecords()){
+ for (Order order : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", order.getId());
map.put("value", order.getOrderNo());
@@ -428,7 +431,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<Order> wrapper = new EntityWrapper<Order>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != orderService.selectOne(wrapper)){
+ if (null != orderService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(Order.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java
index dcafd85..d492cfa 100644
--- a/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java
@@ -67,6 +67,7 @@
int step = (Cools.isEmpty(order.getStep()) || order.getStep() == 0) ? 0 : order.getStep();
NcResultMessage response = null;
Object process1 = null;
+ Object process2 = null;
try {
switch (order.getDocType$().toString()) {
case "閿�鍞彂璐�":
@@ -99,13 +100,23 @@
}
break;
case "杞簱-鍑哄簱":
- process1 = processGENERALOUT(orderDetls);
- List<Object> zkck = new ArrayList<>();
- zkck.add(process1);
+ process1 = processZKCK(orderDetls);
+ List<Object> zkck1 = new ArrayList<>();
+ zkck1.add(process1);
//鍙戦�佽姹�
- response = SendUtil.sendDataToNc(SendUtil.token, nyncIp + ":" + port, generalout, JSONObject.toJSONString(zkck));
+ response = SendUtil.sendDataToNc(SendUtil.token, nyncIp + ":" + port, whstrans, JSONObject.toJSONString(zkck1));
if (!Cools.isEmpty(response) && response.isSuccess()) {
- log.info("杞簱-鍑哄簱response:{}", response);
+ log.info("杞簱-鍑哄簱1response:{}", response);
+ step = 1;
+ }
+
+ process2 = processGENERALOUT2(orderDetls);
+ List<Object> zkck2 = new ArrayList<>();
+ zkck2.add(process2);
+ //鍙戦�佽姹�
+ response = SendUtil.sendDataToNc(SendUtil.token, nyncIp + ":" + port, generalout, JSONObject.toJSONString(zkck2));
+ if (!Cools.isEmpty(response) && response.isSuccess()) {
+ log.info("杞簱-鍑哄簱2response:{}", response);
step = 10;
}
break;
@@ -191,12 +202,11 @@
if (!Cools.isEmpty(remark)) {
NccScZkmxbWms nccScZkmxbWms = JSONObject.parseObject(remark, NccScZkmxbWms.class);
generalInBodyVO.setCsourcebillbid(nccScZkmxbWms.getCspecialbid());
- //generalInBodyVO.setCsourcebillhid(nccScZkmxbWms.getCdeliveryid());
+ generalInBodyVO.setCsourcebillhid(nccScZkmxbWms.getCspecialhid());
- //generalInBodyVO.setCmaterialvid(orderDetl.getMatnr());
generalInBodyVO.setNnum(orderDetl.getQty());
generalInBodyVO.setNshouldnum(orderDetl.getAnfme());
- generalInBodyVO.setVbatchcode(orderDetl.getBatch());
+ generalInBodyVO.setCsourcetype(nccScZkmxbWms.getZklxbm());
}
generalInBodyVOS.add(generalInBodyVO);
}
@@ -204,8 +214,6 @@
data.put("GeneralInBodyVO", generalInBodyVOS);
return data;
}
-
-
private Object processDBDD(List<OrderDetl> orderDetls) {
@@ -234,7 +242,33 @@
return data;
}
-
+ private Object processZKCK(List<OrderDetl> orderDetls) {
+ //缁勮瀵硅薄鏁版嵁
+ Map<String, Object> data = new HashMap<String, Object>();
+ WhsTransBillHeaderVO whsTransBillHeaderVO = new WhsTransBillHeaderVO();
+ whsTransBillHeaderVO.setPk_org("FYT");
+ whsTransBillHeaderVO.setCwarehouseid("6101");
+ WhsTransBillBodyVO whsTransBillBodyVO = null;
+ List<WhsTransBillBodyVO> whsTransBillBodyVOS = new ArrayList<>();
+ for (OrderDetl orderDetl : orderDetls) {
+ whsTransBillBodyVO = new WhsTransBillBodyVO();
+ String remark = orderDetl.getRemark();
+ if (!Cools.isEmpty(remark)) {
+ NccSaleXsfhmxWms nccSaleXsfhmxWms = JSONObject.parseObject(remark, NccSaleXsfhmxWms.class);
+ whsTransBillBodyVO.setCsourcetype("4331");
+ whsTransBillBodyVO.setClocationid("610101");
+ whsTransBillBodyVO.setCsourcebillbid(nccSaleXsfhmxWms.getCdeliverybid());
+ whsTransBillBodyVO.setCsourcebillhid(nccSaleXsfhmxWms.getCdeliveryid());
+ whsTransBillBodyVO.setNnum(orderDetl.getQty());
+ whsTransBillBodyVO.setVbatchcode(orderDetl.getBatch());
+ whsTransBillBodyVO.setCmaterialoid(orderDetl.getMatnr());
+ }
+ whsTransBillBodyVOS.add(whsTransBillBodyVO);
+ }
+ data.put("WhsTransBillHeaderVO", whsTransBillHeaderVO);
+ data.put("WhsTransBillBodyVO", whsTransBillBodyVOS);
+ return data;
+ }
private Object processCGDH(List<OrderDetl> orderDetls) {
@@ -242,7 +276,8 @@
Map<String, Object> data = new HashMap<String, Object>();
ic_purchasein_h ic_purchasein_h = new ic_purchasein_h();
ic_purchasein_h.setPk_org("FYT");
- ic_purchasein_h.setCwarehouseid("6101");
+ ic_purchasein_h.setCwarehouseid("6301");
+ ic_purchasein_h.setCfanaceorgoid("FYT");
ic_purchasein_b ic_purchasein_b = null;
List<ic_purchasein_b> ic_purchasein_bs = new ArrayList<>();
for (OrderDetl orderDetl : orderDetls) {
@@ -251,11 +286,14 @@
if (!Cools.isEmpty(remark)) {
NccCgCgdhdWms nccCgCgdhdWms = JSONObject.parseObject(remark, NccCgCgdhdWms.class);
ic_purchasein_h.setCvendorid(nccCgCgdhdWms.getGysbm());
- ic_purchasein_h.setCbizid(nccCgCgdhdWms.getDhlxbm());
+ ic_purchasein_h.setCtrantypeid(nccCgCgdhdWms.getDhlxbm());
+
+ ic_purchasein_b.setCsourcebillbid(nccCgCgdhdWms.getPkArriveorderB());
+ ic_purchasein_b.setCsourcebillhid(nccCgCgdhdWms.getPkArriveorder());
ic_purchasein_b.setCmaterialvid(orderDetl.getMatnr());
ic_purchasein_b.setNnum(orderDetl.getQty());
- //ic_purchasein_b.setNshouldassistnum(orderDetl.getQty());
+ ic_purchasein_b.setCsourcetype(nccCgCgdhdWms.getDhlxbm());
ic_purchasein_b.setVbatchcode(orderDetl.getBatch());
}
ic_purchasein_bs.add(ic_purchasein_b);
@@ -294,6 +332,35 @@
}
+ /**
+ * @param orderDetls
+ * @return
+ */
+ private Object processGENERALOUT2(List<OrderDetl> orderDetls) {
+ //缁勮瀵硅薄鏁版嵁
+ Map<String, Object> data = new HashMap<String, Object>();
+ ic_generalout_h generalout_h = new ic_generalout_h();
+ generalout_h.setPk_org("FYT");
+ generalout_h.setCwarehouseid("6101");
+ ic_generalout_b generalout_b = null;
+ List<ic_generalout_b> ic_purchasein_bs = new ArrayList<>();
+ for (OrderDetl orderDetl : orderDetls) {
+ generalout_b = new ic_generalout_b();
+ String remark = orderDetl.getRemark();
+ if (!Cools.isEmpty(remark)) {
+ NccSaleXsfhmxWms nccSaleXsfhmxWms = JSONObject.parseObject(remark, NccSaleXsfhmxWms.class);
+ generalout_b.setMaterialvid(orderDetl.getMatnr());
+ generalout_b.setNshouldassistnum(orderDetl.getQty());
+ generalout_b.setVbatchcode(orderDetl.getBatch());
+ }
+ ic_purchasein_bs.add(generalout_b);
+ }
+ data.put("ic_generalout_h", generalout_h);
+ data.put("ic_generalout_b", ic_purchasein_bs);
+ return data;
+ }
+
+
private Boolean reportApiLog(Object data, String docType, String url, String path) {
String response = "";
boolean success = false;
diff --git a/src/main/java/com/zy/common/config/ds/DataSourceConfig.java b/src/main/java/com/zy/common/config/ds/DataSourceConfig.java
index fc406a7..90b1f48 100644
--- a/src/main/java/com/zy/common/config/ds/DataSourceConfig.java
+++ b/src/main/java/com/zy/common/config/ds/DataSourceConfig.java
@@ -36,7 +36,6 @@
// 娆℃暟鎹簮
@Bean(name = "slaveDataSource")
public DataSource secondaryDataSource() {
- System.out.println(driverClassName);
return DataSourceBuilder.create()
.driverClassName(driverClassName)
.url(url)
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 dd4ea64..baa99b0 100644
--- a/src/main/java/com/zy/common/config/ds/PrimaryDataSourceConfig.java
+++ b/src/main/java/com/zy/common/config/ds/PrimaryDataSourceConfig.java
@@ -1,5 +1,6 @@
package com.zy.common.config.ds;
+import com.baomidou.mybatisplus.plugins.PaginationInterceptor;
import com.baomidou.mybatisplus.spring.MybatisSqlSessionFactoryBean;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.beans.factory.annotation.Qualifier;
@@ -31,4 +32,6 @@
public DataSourceTransactionManager primaryTransactionManager(@Qualifier("dataSource") DataSource dataSource) {
return new DataSourceTransactionManager(dataSource);
}
+
+
}
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 da48db4..59e9afa 100644
--- a/src/main/java/com/zy/common/config/ds/SecondaryDataSourceConfig.java
+++ b/src/main/java/com/zy/common/config/ds/SecondaryDataSourceConfig.java
@@ -1,5 +1,6 @@
package com.zy.common.config.ds;
+import com.baomidou.mybatisplus.plugins.PaginationInterceptor;
import com.baomidou.mybatisplus.spring.MybatisSqlSessionFactoryBean;
import org.apache.ibatis.session.SqlSessionFactory;
import org.mybatis.spring.SqlSessionFactoryBean;
@@ -30,4 +31,6 @@
public DataSourceTransactionManager secondaryTransactionManager(@Qualifier("slaveDataSource") DataSource dataSource) {
return new DataSourceTransactionManager(dataSource);
}
+
+
}
diff --git a/src/main/java/com/zy/nc/entity/NccScZkmxbWms.java b/src/main/java/com/zy/nc/entity/NccScZkmxbWms.java
index 5a9ac0b..7a1497e 100644
--- a/src/main/java/com/zy/nc/entity/NccScZkmxbWms.java
+++ b/src/main/java/com/zy/nc/entity/NccScZkmxbWms.java
@@ -20,6 +20,10 @@
@TableId
private String cspecialbid;
+ private String cspecialhid;
+
+ private String zklxbm;
+
/**
*
*/
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 e70d467..1e4cd13 100644
--- a/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java
+++ b/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java
@@ -227,7 +227,7 @@
}
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() + "鐩樼偣鍗曠殑鏄庣粏閲嶅浜�");
+ //throw new CoolException(nccScZkmxbWms.getWlbm() + "鐩樼偣鍗曠殑鏄庣粏閲嶅浜�");
}
checkOrderDetl = new InventoryCheckOrderDetl();
checkOrderDetl.setMatnr(nccScZkmxbWms.getWlbm());
diff --git a/src/main/resources/spring.factories b/src/main/resources/spring.factories
new file mode 100644
index 0000000..da631fc
--- /dev/null
+++ b/src/main/resources/spring.factories
@@ -0,0 +1 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=com.core.config.CoolBaseConfig
--
Gitblit v1.9.1