From d3c7820992ccfb3296ec031a7c019a4300347b83 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 28 十月 2025 15:30:25 +0800
Subject: [PATCH] 完善erp对接2.0
---
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 76 ++++++++++++++++++++++++--------------
1 files changed, 48 insertions(+), 28 deletions(-)
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 fdf3095..7abf1e0 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -1,5 +1,6 @@
package com.zy.asrs.task.handler;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.exception.CoolException;
@@ -8,12 +9,14 @@
import com.zy.asrs.service.impl.OrderDetl1ServiceImpl;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
-import com.zy.third.entity.ExdInstockTarget;
-import com.zy.third.entity.ExdOutstockTarget;
-import com.zy.third.entity.ExdvYanbu;
+import com.zy.system.entity.User;
+import com.zy.system.service.UserService;
+import com.zy.third.entity.*;
import com.zy.third.mapper.ExdMaterialMapper;
import com.zy.third.service.ExdInstockTargetService;
+import com.zy.third.service.ExdOutstockSourceService;
import com.zy.third.service.ExdOutstockTargetService;
+import com.zy.third.service.ExdStockService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -53,6 +56,12 @@
private ExdMaterialMapper exdMaterialMapper;
@Autowired
private Order1Service order1Service;
+ @Autowired
+ private ExdOutstockSourceService exdOutstockSourceService;
+ @Autowired
+ private UserService userService;
+ @Autowired
+ private ExdStockService exdStockService;
@Transactional
public ReturnT<String> start(Order order) {
@@ -125,9 +134,9 @@
for (OrderDetl1 orderDetl : orderDetls) {
- ExdvYanbu bacode = exdMaterialMapper.getBacode(orderDetl.getThreeCode());
+ ExdvYanbu bacode = exdMaterialMapper.getBacode(orderDetl.getBatch());
//鑾峰彇涓昏〃鏄庣粏
- OrderDetl orderDetl1 = orderDetlService.selectItem(orderDetl.getOrderNo(), orderDetl.getMatnr(), null);
+ OrderDetl orderDetl1 = orderDetlService.selectItem(orderDetl.getOrderNo().split("-")[0], orderDetl.getMatnr(), null);
//涓婃姤鏁伴噺
BigDecimal anfme = new BigDecimal(orderDetl1.getAnfme());
BigDecimal Units = new BigDecimal((Cools.isEmpty(orderDetl1.getUnits()) ? 0.0 : orderDetl1.getUnits()));
@@ -147,12 +156,23 @@
//鍗曞彿 = erp璁㈠崟鍙�+鐗╂枡缂栧彿+涓婃姤娆℃暟
exdOutstockTarget.setFbillno(order.getOrderNo());
+ //鍗曟嵁绫诲瀷
+ exdOutstockTarget.setFtrantype(21);
+
+ //鍗曟嵁鏃ユ湡
+ exdOutstockTarget.setFdate(DateUtils.convert(order.getOrderTime()));
+ //绾㈣摑瀛�
+ exdOutstockTarget.setFrob(1);
+ //鎿嶄綔鐢ㄦ埛
+ User id = userService.selectOne(new EntityWrapper<User>().eq("id", orderDetl.getCreateBy()));
+ exdOutstockTarget.setFuserid(Integer.valueOf(id.getEmail()));
+
//閮ㄩ棬ID
exdOutstockTarget.setFdeptid(7502);
//渚涘簲鍟�/瀹㈡埛ID
exdOutstockTarget.setFsupplyid(0);
//鍒跺崟鐢ㄦ埛ID
- exdOutstockTarget.setFbillerid(Math.toIntExact(orderDetl.getUpdateBy()));
+ exdOutstockTarget.setFbillerid(Integer.valueOf(id.getEmail()));
//缁嗚〃ID
Integer c = Integer.valueOf(order.getOrderNo().split("-")[1]);
exdOutstockTarget.setFentryid(c);
@@ -170,35 +190,35 @@
//鍗曚綅ID
exdOutstockTarget.setFunitid(0);
//婧愬崟鍙�
- exdOutstockTarget.setFsourcebillno(orderDetl.getOrderNo());
- //婧愬崟缁嗚〃ID 鏆傚畾
- exdOutstockTarget.setFsourceentryid(0);
- //婧愬崟鍐呯爜 鏆傚畾
- exdOutstockTarget.setFsourceinterid(0);
+ exdOutstockTarget.setFsourcebillno(orderDetl.getOrderNo().split("-")[0]);
+ ExdOutstockSource exdOutstockSource = exdOutstockSourceService.selectOne(new EntityWrapper<ExdOutstockSource>()
+ .eq("FBillNo", orderDetl.getOrderNo().split("-")[0])
+ .eq("FItemID", mat.getUuid()));
+ //婧愬崟缁嗚〃ID
+ exdOutstockTarget.setFsourceentryid(exdOutstockSource.getFentryid());
+ //婧愬崟鍐呯爜
+ exdOutstockTarget.setFsourceinterid(exdOutstockSource.getFinterid());
//婧愬崟鍗曟嵁绫诲瀷
- exdOutstockTarget.setFsourcetrantype(0);
+ exdOutstockTarget.setFsourcetrantype(81);
//搴撲綅ID
exdOutstockTarget.setFdcspid(0);
- //浠撳簱ID 鏆傚畾
- exdOutstockTarget.setFdcstockid(0);
+ //浠撳簱ID
+ Integer Fdcstockid = 19382;
+ if(!Cools.isEmpty(bacode.getProdinkind())){
+ ExdStock fname = exdStockService.selectOne(new EntityWrapper<ExdStock>().eq("Fname", bacode.getProdinkind()));
+ Fdcstockid = Integer.valueOf(fname.getId());
+ }
+ exdOutstockTarget.setFdcstockid(Fdcstockid);
//閿�鍞鍗曞崟鍙� 鏆傚畾
- exdOutstockTarget.setForderbillno(orderDetl.getOrderNo());
+ exdOutstockTarget.setForderbillno(exdOutstockSource.getForderbillno());
//閿�鍞鍗曠粏琛↖D 鏆傚畾
- exdOutstockTarget.setForderentryid(0);
+ exdOutstockTarget.setForderentryid(exdOutstockSource.getForderentryid());
//閿�鍞鍗曞唴鐮� 鏆傚畾
- exdOutstockTarget.setForderinterid(0);
+ exdOutstockTarget.setForderinterid(exdOutstockSource.getForderinterid());
//璁″垝妯″紡
exdOutstockTarget.setFplanmode(0);
- //鍗曟嵁绫诲瀷
- exdOutstockTarget.setFtrantype(21);
- //鍗曟嵁鏃ユ湡
- exdOutstockTarget.setFdate(DateUtils.convert(order.getOrderTime()));
- //绾㈣摑瀛�
- exdOutstockTarget.setFrob(orderDetl.getBeBatch());
- //鎿嶄綔鐢ㄦ埛
- exdOutstockTarget.setFuserid(Integer.getInteger(orderDetl.getColor()));
exdOutstockTarget.setBarcode(orderDetl.getBatch());
exdOutstockTarget.setGross(BigDecimal.valueOf(bacode.getGross()));
@@ -225,10 +245,10 @@
}
}
for (OrderDetl1 orderDetl : orderDetls) {
- OrderDetl orderDetl1 = orderDetlService.selectItem(orderDetl.getOrderNo(), orderDetl.getMatnr(), null);
- orderDetl1.setUnits(orderDetl.getAnfme() + (Cools.isEmpty(orderDetl.getUnits()) ? 0.0 : orderDetl.getUnits()));
+ OrderDetl orderDetl1 = orderDetlService.selectItem(orderDetl.getOrderNo().split("-")[0], orderDetl.getMatnr(), null);
+ orderDetl1.setUnits(orderDetl.getAnfme() + (Cools.isEmpty(orderDetl1.getUnits()) ? 0.0 : orderDetl1.getUnits()));
orderDetl1.setUpdateTime(new Date());
- orderDetl1Service.updateById(orderDetl);
+ orderDetlService.updateById(orderDetl1);
}
return SUCCESS;
}
--
Gitblit v1.9.1