From ff580fa1e1cb7664159823135f7486048c768615 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 30 六月 2025 15:59:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java
index d6a0c87..dc508bd 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java
@@ -322,7 +322,7 @@
entity.setWmsJobId(job.getId());
entity.setStatus(Constants.ZERO);
entity.setIoQty(Constants.formatBigdecimal(d.getIoQty()).multiply(Constants.formatBigdecimal( d.getRate())));
- entity.setRate(Constants.formatBigdecimal(d.getRate()).doubleValue()+"");
+ entity.setRate(Objects.nonNull(d.getRate())?Constants.formatBigdecimal(d.getRate()).doubleValue()+"":"1");
entity.setMaterialName(d.getMaterialName());
entity.setInRepertotyCode(d.getInRepertotyCode());
iocodeList.add(d.getIoCode());
@@ -555,11 +555,11 @@
entity.setJobId(job.getJobId());
entity.setWmsJobId(job.getId());
entity.setContractNum(param.getContractNum());
- entity.setRepertotyAddress(job.getRepertotyAddress());
+ entity.setRepertotyAddress(param.getRepertotyAddress());
entity.setWmsJobId(job.getId());
entity.setStatus(Constants.ZERO);
entity.setIoQty(Constants.formatBigdecimal(d.getIoQty()).multiply(Constants.formatBigdecimal( d.getRate())));
- entity.setRate(Constants.formatBigdecimal(d.getRate()).doubleValue()+"");
+ entity.setRate(Objects.nonNull(d.getRate())?Constants.formatBigdecimal(d.getRate()).doubleValue()+"":"1");
// entity.setIoQty(d.getIoQty());
// entity.setRate(d.getRate());
entity.setMaterialName(d.getMaterialName());
--
Gitblit v1.9.3