From 03b5b8a480fb201e288486299eb385a00d2aac66 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期一, 13 十月 2025 09:25:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ycawdasrs-2' into ycawdasrs-2
---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 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 f857ea4..b156340 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -2,7 +2,6 @@
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;
@@ -444,7 +443,11 @@
private void write(WrkMast wrkMast, List<WrkDetl> wrkDetls) {
ExdInstockTarget exdInstockTarge;
+ int i = -1;
for (WrkDetl wrkDetl : wrkDetls) {
+ if (Cools.isEmpty(wrkDetl.getOrderNo()) && !Cools.isEmpty(wrkDetl.getInspect()) && wrkDetl.getInspect() == 1) {
+ continue;
+ }
ExdvYanbu bacode = exdMaterialMapper.getBacode(wrkDetl.getBatch());
exdInstockTarge = new ExdInstockTarget();
exdInstockTarge.setFtrantype(21);
@@ -454,6 +457,17 @@
exdInstockTarge.setFqty(wrkDetl.getAnfme());
exdInstockTarge.setFbatchno(bacode.getBatchno());
exdInstockTarge.setFsourcebillno(bacode.getIcmono());
+ exdInstockTarge.setFsourcetrantype(85);
+
+ exdInstockTarge.setFentryid(i);
+ exdInstockTarge.setFsmanagerid(Integer.valueOf(wrkDetl.getColor()));
+ exdInstockTarge.setFfmanagerid(Integer.valueOf(wrkDetl.getColor()));
+ exdInstockTarge.setFbillerid(Integer.valueOf(wrkDetl.getColor()));
+ exdInstockTarge.setFitemid(Integer.parseInt(wrkDetl.getSku()));
+
+ exdInstockTarge.setFsourceentryid(i);
+ exdInstockTarge.setFdcspid(wrkMast.getLocNo());
+ exdInstockTarge.setFdcstockid(wrkDetl.getBrand());
exdInstockTarge.setBarcode(wrkDetl.getBatch());
exdInstockTarge.setGross(bacode.getGross());
@@ -464,6 +478,7 @@
exdInstockTarge.setWritor("WMS");
exdInstockTarge.setStatus(0);
exdInstockTargetService.insert(exdInstockTarge);
+ i++;
}
}
--
Gitblit v1.9.1