From 7c1af4c63e66754f0868c1a501f4895f9cbc9213 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期五, 15 十一月 2024 09:29:12 +0800
Subject: [PATCH] 双单位
---
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 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 753c6fb..1e47661 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,7 @@
package com.zy.asrs.task.handler;
+import cn.hutool.core.util.NumberUtil;
+import com.alibaba.excel.util.NumberUtils;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.core.common.Cools;
@@ -22,6 +24,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
@@ -150,8 +153,11 @@
if (s.length > 1) {
childInfo.setCBatch(s[0]);
childInfo.setBFree1(s[1]);
- } else {
+ } else if (s.length == 1) {
childInfo.setCBatch(s[0]);
+ childInfo.setBFree1("");
+ } else {
+ childInfo.setCBatch("");
childInfo.setBFree1("");
}
}
@@ -161,7 +167,13 @@
childInfo.setCOrderCode(orderDetl.getOrderNo());
childInfo.setIvouchrowno(orderDetl.getItemNum());
childInfo.setDefine22(orderDetl.getThreeCode());
-
+ if (!Cools.isEmpty(orderDetl.getWeight()) && !Cools.isEmpty(orderDetl.getVolume())) {
+ BigDecimal mul = NumberUtil.div(childInfo.getIQuantity(), orderDetl.getVolume() + "");
+ childInfo.setINum(mul.toString());
+ } else {
+ childInfo.setINum("1");
+ }
+ childInfo.setIinvexchrate(Cools.isEmpty(orderDetl.getVolume()) ? "" : orderDetl.getVolume() + "");
paramChild.add(childInfo);
}
--
Gitblit v1.9.1