From 568e38a95cb6fb20fe16b53d17f610aefc6f744f Mon Sep 17 00:00:00 2001 From: rk <94314517@qq.com> Date: 星期四, 09 十月 2025 18:29:29 +0800 Subject: [PATCH] 钉钉通知 与钥匙柜开发 --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 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 3883422..e93d5ea 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()); @@ -413,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() @@ -444,6 +444,7 @@ } } PlatformGroup group = platformGroupMapper.selectOne(new QueryWrapper<PlatformGroup>().lambda() + .eq(PlatformGroup::getIsVirtual,Constants.ZERO)//闈炶櫄鎷熸湀鍙� .eq(PlatformGroup::getIsdeleted,Constants.ZERO) .eq(PlatformGroup::getType,type==0?Constants.ZERO:Constants.ONE) .last("limit 1") );//鏌ヨ鍗歌揣鏈堝彴缁勭紪鐮� @@ -555,11 +556,13 @@ entity.setJobId(job.getJobId()); entity.setWmsJobId(job.getId()); entity.setContractNum(param.getContractNum()); - entity.setIoQty(d.getIoQty()); - entity.setRepertotyAddress(job.getRepertotyAddress()); + entity.setRepertotyAddress(param.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); -- Gitblit v1.9.3