From f116ffb8abf668cdd5a8d33bd2f85363fd1ef28d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 26 六月 2025 16:51:58 +0800
Subject: [PATCH] 最新版本541200007

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 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 06f8197..9ede393 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
@@ -84,7 +84,6 @@
     @Override
     public  WmsBaseResponse<WmsBaseDataResponse> orderPlatformBind(PlatformJob job) {
         if(StringUtils.isBlank(job.getBillCode()) || StringUtils.isBlank(job.getPlatformWmsCode())){
-
             return null;
         }
         int type = 0;
@@ -321,9 +320,9 @@
                         entity.setJobId(job.getJobId());
                         entity.setContractNum(param.getContractNum());
                         entity.setWmsJobId(job.getId());
-                        entity.setIoQty(d.getIoQty());
                         entity.setStatus(Constants.ZERO);
-                        entity.setRate(d.getRate());
+                        entity.setIoQty(Constants.formatBigdecimal(d.getIoQty()).multiply(Constants.formatBigdecimal( d.getRate())));
+                        entity.setRate(Objects.nonNull(d.getRate())?Constants.formatBigdecimal(d.getRate()).doubleValue()+"":"1");
                         entity.setMaterialName(d.getMaterialName());
                         entity.setInRepertotyCode(d.getInRepertotyCode());
                         iocodeList.add(d.getIoCode());
@@ -376,7 +375,6 @@
                         wxPlatNotice.sendWmsTemplateNotice(systemDictDataBiz,
                                 wxNoticeConfigMapper,job,
                                 WxPlatConstants.platformJobContent.platformJobNewJob,
-                                systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
                                 Arrays.asList(driver.getOpenid().split(","))
                         );
                     }
@@ -414,6 +412,7 @@
                         Constants.PlatformJobStatus.IN_WAIT.getKey()+","+
                         Constants.PlatformJobStatus.CALLED.getKey()+","+
                         Constants.PlatformJobStatus.TRANSFERING.getKey()+","+
+                        Constants.PlatformJobStatus.OVER_NUMBER.getKey()+","+
                         Constants.PlatformJobStatus.EXCEPTION.getKey()+","+
                         Constants.PlatformJobStatus.WORKING.getKey()+")) as jobNum")
                 .lambda()
@@ -556,11 +555,13 @@
                         entity.setJobId(job.getJobId());
                         entity.setWmsJobId(job.getId());
                         entity.setContractNum(param.getContractNum());
-                        entity.setIoQty(d.getIoQty());
                         entity.setRepertotyAddress(job.getRepertotyAddress());
                         entity.setWmsJobId(job.getId());
                         entity.setStatus(Constants.ZERO);
-                        entity.setRate(d.getRate());
+                        entity.setIoQty(Constants.formatBigdecimal(d.getIoQty()).multiply(Constants.formatBigdecimal( d.getRate())));
+                        entity.setRate(Objects.nonNull(d.getRate())?Constants.formatBigdecimal(d.getRate()).doubleValue()+"":"1");
+//                        entity.setIoQty(d.getIoQty());
+//                        entity.setRate(d.getRate());
                         entity.setMaterialName(d.getMaterialName());
                         iocodeList.add(d.getIoCode());
                         details.add(entity);
@@ -657,8 +658,7 @@
                                 WxPlatNotice wxPlatNotice = new WxPlatNotice();
                                 wxPlatNotice.sendWmsCancelTemplateNotice(systemDictDataBiz,
                                         wxNoticeConfigMapper,job,
-                                        WxPlatConstants.platformJobContent.platformJobCancel,
-                                        systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
+                                        WxPlatConstants.platformJobContent.platformJobCancel, 
                                         Arrays.asList(driver.getOpenid().split(","))
                                 );
                             }
@@ -738,7 +738,6 @@
                                 wxPlatNotice.sendWmsCancelTemplateNotice(systemDictDataBiz,
                                         wxNoticeConfigMapper,job,
                                         WxPlatConstants.platformJobContent.platformJobCancel,
-                                        systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
                                         Arrays.asList(driver.getOpenid().split(","))
                                 );
                             }

--
Gitblit v1.9.3