From d093cdb0c7a57c09da5eb5d176f9e9e71820fece Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 25 九月 2025 14:01:30 +0800
Subject: [PATCH] 对接
---
src/main/java/com/zy/third/entity/ExdInstockTarget.java | 6 +-
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 95 +++++++++++++++++++++++--------
src/main/resources/mapper/third/ExdMaterialMapper.xml | 7 ++
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 8 ++
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 7 ++
src/main/java/com/zy/third/entity/ExdvYanbu.java | 4
6 files changed, 93 insertions(+), 34 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index 1619b74..3c0c526 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -45,8 +45,12 @@
if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
List<Order> orders = orderService.selectComplete();
for (Order order : orders) {
- ReturnT<String> result = orderSyncHandler.start(order);
- if (!result.isSuccess()) {
+ try {
+ ReturnT<String> result = orderSyncHandler.start(order);
+ if (!result.isSuccess()) {
+ log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
+ }
+ }catch (Exception e){
log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
}
}
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
index ab9ebad..a4e6f86 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -20,6 +20,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.util.Date;
import java.util.List;
/**
@@ -64,6 +65,9 @@
exdInstockTarge.setFdate(DateUtils.convert(order.getOrderTime()));
exdInstockTarge.setFrob(orderDetl.getInspect());
exdInstockTarge.setFuserid(Integer.getInteger(orderDetl.getColor()));
+ exdInstockTarge.setWritetime(new Date());
+ exdInstockTarge.setWritor("WMS");
+ exdInstockTarge.setStatus(0);
exdInstockTargetService.insert(exdInstockTarge);
if (!orderService.updateSettle(order.getId(), 6L, null)) {
throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
@@ -86,6 +90,9 @@
exdOutstockTarget.setFdate(DateUtils.convert(order.getOrderTime()));
exdOutstockTarget.setFrob(orderDetl.getInspect());
exdOutstockTarget.setFuserid(Integer.getInteger(orderDetl.getColor()));
+ exdOutstockTarget.setWritetime(new Date());
+ exdOutstockTarget.setWritor("WMS");
+ exdOutstockTarget.setStatus(0);
exdOutstockTargetService.insert(exdOutstockTarget);
if (!orderService.updateSettle(order.getId(), 6L, null)) {
throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index b575820..f857ea4 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -2,10 +2,15 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
+import com.core.common.DateUtils;
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
+import com.zy.third.entity.ExdInstockTarget;
+import com.zy.third.entity.ExdvYanbu;
+import com.zy.third.mapper.ExdMaterialMapper;
+import com.zy.third.service.ExdInstockTargetService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -36,18 +41,25 @@
@Autowired
private OrderDetlService orderDetlService;
+ @Autowired
+ private ExdInstockTargetService exdInstockTargetService;
+
+ @Autowired
+ private ExdMaterialMapper exdMaterialMapper;
+
+ @Transactional
public ReturnT<String> start(WrkMast wrkMast) {
// 4.鍏ュ簱瀹屾垚
if (wrkMast.getWrkSts() == 4) {
return doIn(wrkMast);
- // 14.鍑哄簱瀹屾垚
- } else if (wrkMast.getWrkSts() == 14) {
+ // 14.鍑哄簱瀹屾垚
+ } else if (wrkMast.getWrkSts() == 14) {
return doOut(wrkMast);
}
return SUCCESS;
}
- private ReturnT<String> doIn(WrkMast wrkMast){
+ private ReturnT<String> doIn(WrkMast wrkMast) {
Date now = new Date();
LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
try {
@@ -116,22 +128,25 @@
// 鏇存柊璁㈠崟瀹屾垚鏁伴噺
OrderDetl orderDetl = orderDetlService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
- if(orderDetl==null){
- orderDetl=orderDetlService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), null);
+ if (orderDetl == null) {
+ orderDetl = orderDetlService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), null);
}
try {
- if(!Cools.isEmpty(orderDetl)){
- if(!orderDetlService.increaseQtyByOrderNo(wrkDetl.getOrderNo(), wrkDetl.getMatnr(),
- orderDetl.getBatch(),wrkDetl.getAnfme())){
+ if (!Cools.isEmpty(orderDetl)) {
+ if (!orderDetlService.increaseQtyByOrderNo(wrkDetl.getOrderNo(), wrkDetl.getMatnr(),
+ orderDetl.getBatch(), wrkDetl.getAnfme())) {
// exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触锛沎workNo={0}],[locNo={1}]",
// wrkMast.getWrkNo(), wrkMast.getLocNo());
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg("鍏ㄦ澘鍏ュ簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
}
}
- } catch (Exception ignore){}
+ } catch (Exception ignore) {
+ }
}
+ // 鍐欏叆涓棿琛ㄦ暟鎹�
+ write(wrkMast, wrkDetls);
// 淇敼搴撲綅鐘舵�� S ====>> F
if (locMast.getLocSts().equals("S")) {
locMast.setLocSts("F");
@@ -167,20 +182,21 @@
// 鏇存柊璁㈠崟瀹屾垚鏁伴噺
OrderDetl orderDetl = orderDetlService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
- if(orderDetl==null){
- orderDetl=orderDetlService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), null);
+ if (orderDetl == null) {
+ orderDetl = orderDetlService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), null);
}
try {
- if(!Cools.isEmpty(orderDetl)){
- if(!orderDetlService.increaseQtyByOrderNo(wrkDetl.getOrderNo(), wrkDetl.getMatnr(),
- orderDetl.getBatch(),wrkDetl.getAnfme())){
+ if (!Cools.isEmpty(orderDetl)) {
+ if (!orderDetlService.increaseQtyByOrderNo(wrkDetl.getOrderNo(), wrkDetl.getMatnr(),
+ orderDetl.getBatch(), wrkDetl.getAnfme())) {
// exceptionHandle("鎷ｆ枡鍏ュ簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触锛沎workNo={0}],[locNo={1}]",
// wrkMast.getWrkNo(), wrkMast.getLocNo());
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg("鎷ｆ枡鍏ュ簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
}
}
- } catch (Exception ignore){}
+ } catch (Exception ignore) {
+ }
}
// 淇敼搴撲綅鐘舵�� Q ====>> F
@@ -206,7 +222,7 @@
return FAIL.setMsg("骞舵澘鍏ュ簱 ===>> 宸ヤ綔鏄庣粏妗ｄ负绌�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
}
// 淇敼搴撳瓨鏄庣粏鏁伴噺锛屽鏃犲簱瀛橈紝鏇炬柊澧�
- for (WrkDetl wrkDetl:wrkDetls54) {
+ for (WrkDetl wrkDetl : wrkDetls54) {
LocDetl locDetl = locDetlService.selectItem(locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
if (null != locDetl) {
@@ -254,7 +270,7 @@
}
// 淇敼搴撲綅鐘舵�� Q ====>> F
if (locMast.getLocSts().equals("Q")) {
- locMast.setLocSts(wrkMast.getFullPlt().equals("Y")?"F":"D");
+ locMast.setLocSts(wrkMast.getFullPlt().equals("Y") ? "F" : "D");
locMast.setBarcode(wrkMast.getBarcode());
locMast.setIoTime(now);
locMast.setModiTime(now);
@@ -323,7 +339,7 @@
return SUCCESS;
}
- private ReturnT<String> doOut(WrkMast wrkMast){
+ private ReturnT<String> doOut(WrkMast wrkMast) {
Date now = new Date();
LocMast locMast = locMastService.selectById(wrkMast.getSourceLocNo());
try {
@@ -350,20 +366,21 @@
for (WrkDetl wrkDetl : wrkDetls101) {
// 鏇存柊璁㈠崟瀹屾垚鏁伴噺
OrderDetl orderDetl = orderDetlService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
- if(orderDetl==null){
- orderDetl=orderDetlService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), null);
+ if (orderDetl == null) {
+ orderDetl = orderDetlService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), null);
}
try {
- if(!Cools.isEmpty(orderDetl)){
- if(!orderDetlService.increaseQtyByOrderNo(wrkDetl.getOrderNo(), wrkDetl.getMatnr(),
- orderDetl.getBatch(),wrkDetl.getAnfme())){
+ if (!Cools.isEmpty(orderDetl)) {
+ if (!orderDetlService.increaseQtyByOrderNo(wrkDetl.getOrderNo(), wrkDetl.getMatnr(),
+ orderDetl.getBatch(), wrkDetl.getAnfme())) {
// exceptionHandle("鍏ㄦ澘鍑哄簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触锛沎workNo={0}],[locNo={1}]",
// wrkMast.getWrkNo(), wrkMast.getLocNo());
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg("鍏ㄦ澘鍑哄簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
}
}
- } catch (Exception ignore){}
+ } catch (Exception ignore) {
+ }
}
// 鍒犻櫎宸ヤ綔妗ｆ簮搴撲綅鐨勫簱瀛樻槑缁�
if (!locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no", wrkMast.getSourceLocNo()))) {
@@ -402,10 +419,10 @@
default:
break;
}
- if(Cools.isEmpty(wrkMast.getMemo())){
+ if (Cools.isEmpty(wrkMast.getMemo())) {
// 淇敼宸ヤ綔涓绘。鐘舵��
wrkMast.setWrkSts(15L);
- }else {
+ } else {
wrkMast.setWrkSts(30L);
}
@@ -424,4 +441,30 @@
return SUCCESS;
}
+
+ private void write(WrkMast wrkMast, List<WrkDetl> wrkDetls) {
+ ExdInstockTarget exdInstockTarge;
+ for (WrkDetl wrkDetl : wrkDetls) {
+ ExdvYanbu bacode = exdMaterialMapper.getBacode(wrkDetl.getBatch());
+ exdInstockTarge = new ExdInstockTarget();
+ exdInstockTarge.setFtrantype(21);
+ exdInstockTarge.setFdate(new Date());
+ exdInstockTarge.setFrob(1);
+
+ exdInstockTarge.setFqty(wrkDetl.getAnfme());
+ exdInstockTarge.setFbatchno(bacode.getBatchno());
+ exdInstockTarge.setFsourcebillno(bacode.getIcmono());
+
+ exdInstockTarge.setBarcode(wrkDetl.getBatch());
+ exdInstockTarge.setGross(bacode.getGross());
+ exdInstockTarge.setWidth(bacode.getWidth());
+ exdInstockTarge.setDefects(bacode.getDefects());
+ exdInstockTarge.setBackcode(bacode.getBackcode());
+ exdInstockTarge.setWritetime(new Date());
+ exdInstockTarge.setWritor("WMS");
+ exdInstockTarge.setStatus(0);
+ exdInstockTargetService.insert(exdInstockTarge);
+ }
+ }
+
}
diff --git a/src/main/java/com/zy/third/entity/ExdInstockTarget.java b/src/main/java/com/zy/third/entity/ExdInstockTarget.java
index 947483e..9debbcc 100644
--- a/src/main/java/com/zy/third/entity/ExdInstockTarget.java
+++ b/src/main/java/com/zy/third/entity/ExdInstockTarget.java
@@ -164,17 +164,17 @@
/**
*
*/
- private BigDecimal gross;
+ private Double gross;
/**
*
*/
- private BigDecimal width;
+ private Double width;
/**
*
*/
- private BigDecimal defects;
+ private Integer defects;
/**
*
diff --git a/src/main/java/com/zy/third/entity/ExdvYanbu.java b/src/main/java/com/zy/third/entity/ExdvYanbu.java
index 2eb6d0e..7028551 100644
--- a/src/main/java/com/zy/third/entity/ExdvYanbu.java
+++ b/src/main/java/com/zy/third/entity/ExdvYanbu.java
@@ -59,12 +59,12 @@
/**
*
*/
- private BigDecimal gross;
+ private Double gross;
/**
*
*/
- private BigDecimal width;
+ private Double width;
/**
*
diff --git a/src/main/resources/mapper/third/ExdMaterialMapper.xml b/src/main/resources/mapper/third/ExdMaterialMapper.xml
index 7b8589b..c0a1ed0 100644
--- a/src/main/resources/mapper/third/ExdMaterialMapper.xml
+++ b/src/main/resources/mapper/third/ExdMaterialMapper.xml
@@ -30,9 +30,14 @@
</select>
<select id="getBacode" resultType="com.zy.third.entity.ExdvYanbu" parameterType="string">
- SELECT top 1 *
+ <!--
+ SELECT top 1 *
FROM [Textile].[trade].[TianfuQcResult]
where Barcode = #{barcode}
+ -->
+ SELECT top 1 *
+ FROM ExdV_Yanbu
+ where Barcode = #{barcode}
</select>
</mapper>
--
Gitblit v1.9.1