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/WorkMastHandler.java | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
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 d0c7df7..39619b7 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -2,12 +2,15 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
+import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
import com.zy.asrs.service.impl.MatServiceImpl;
import com.zy.asrs.service.impl.OrderDetl1ServiceImpl;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
+import com.zy.system.entity.User;
+import com.zy.system.service.impl.UserServiceImpl;
import com.zy.third.entity.ExdInstockTarget;
import com.zy.third.entity.ExdStock;
import com.zy.third.entity.ExdvYanbu;
@@ -55,6 +58,8 @@
private MatServiceImpl matServiceImpl;
@Autowired
private OrderDetl1ServiceImpl orderDetl1Service;
+ @Autowired
+ private UserServiceImpl userService;
@Transactional
public ReturnT<String> start(WrkMast wrkMast) {
@@ -516,7 +521,7 @@
private void write(WrkMast wrkMast, List<WrkDetl> wrkDetls) {
ExdInstockTarget exdInstockTarge;
- int i = -1;
+ int i = 1;
for (WrkDetl wrkDetl : wrkDetls) {
if (Cools.isEmpty(wrkDetl.getOrderNo()) && !Cools.isEmpty(wrkDetl.getInspect()) && wrkDetl.getInspect() == 1) {
ExdvYanbu bacode = exdMaterialMapper.getBacode(wrkDetl.getThreeCode());
@@ -525,16 +530,17 @@
return;
}
exdInstockTarge = new ExdInstockTarget();
- exdInstockTarge.setFtrantype(21);
+ exdInstockTarge.setFtrantype(2);
exdInstockTarge.setFdate(new Date());
exdInstockTarge.setFrob(1);
exdInstockTarge.setFdeptid(7502);
//渚涘簲鍟�/瀹㈡埛ID
exdInstockTarge.setFsupplyid(0);
//wms鎿嶄綔鍛�
- exdInstockTarge.setFbillerid(Integer.valueOf(wrkDetl.getColor()));
- exdInstockTarge.setFfmanagerid(Integer.valueOf(wrkDetl.getColor()));
- exdInstockTarge.setFsmanagerid(Integer.valueOf(wrkDetl.getColor()));
+ User id = userService.selectOne(new EntityWrapper<User>().eq("id", wrkDetl.getColor()));
+ exdInstockTarge.setFbillerid(Integer.valueOf(id.getEmail()));
+ exdInstockTarge.setFfmanagerid(17938);
+ exdInstockTarge.setFsmanagerid(17938);
exdInstockTarge.setFentryid(i);
//鐗╂枡ID
Mat mat = matServiceImpl.selectByMatnr(wrkDetl.getMatnr());
@@ -554,8 +560,13 @@
//搴撲綅ID
exdInstockTarge.setFdcspid(0);
//浠撳簱ID
- ExdStock fname = exdStockService.selectOne(new EntityWrapper<ExdStock>().eq("Fname", wrkDetl.getBrand()));
- exdInstockTarge.setFdcstockid(Integer.valueOf(fname.getId()));
+ Integer Fdcstockid = 19382;
+ if(!Cools.isEmpty(bacode.getProdinkind())){
+ ExdStock fname = exdStockService.selectOne(new EntityWrapper<ExdStock>().eq("Fname", bacode.getProdinkind()));
+ Fdcstockid = Integer.valueOf(fname.getId());
+ }
+
+ exdInstockTarge.setFdcstockid(Integer.valueOf(Fdcstockid));
//exdInstockTarge.setFdcspid(wrkMast.getLocNo());
@@ -571,7 +582,9 @@
//浠撳簱
exdInstockTarge.setProdinkind(bacode.getProdinkind());
//exdInstockTarge.setProdInKind("鐗归噰搴�");
- exdInstockTargetService.insert(exdInstockTarge);
+ if(!exdInstockTargetService.insert(exdInstockTarge)){
+ throw new CoolException("楠屽竷鍏ュ簱瀹屾垚鎻掑叆鍏ュ簱琛ㄥけ璐�");
+ }
i++;
}
}
--
Gitblit v1.9.1