From 833abe347c2bc71bd98abc7cfa4b29ae1f6fd564 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期三, 19 三月 2025 16:43:10 +0800 Subject: [PATCH] 最新版本541200007 --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java | 61 ++++++++++++++++++++++-------- 1 files changed, 45 insertions(+), 16 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 6ad06ee..5e7173a 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 @@ -73,6 +73,8 @@ private RetentionMapper retentionMapper; @Autowired private WxNoticeConfigMapper wxNoticeConfigMapper; + @Autowired + private PlatformLogMapper platformLogMapper; /** * 鍏ュ簱閫氱煡浠诲姟涓氬姟澶勭悊 * @param job 鍙傛暟 @@ -131,7 +133,7 @@ && response.getData().size()>0 && StringUtils.equals(response.getData().get(0).getSuccess(),WmsBaseResponse.CODE_SUCCESS)){ //濡傛灉鎴愬姛 update.setWmsSendStatus(Constants.ONE); - update.setWmsSendInfo("閫氱煡WMS浣滀笟鍗曞垎閰嶆湀鍙版垚鍔�"); + update.setWmsSendInfo("閫氱煡WMS浣滀笟鍗曞垎閰嶆湀鍙版垚鍔�"+response.getData().get(0).getMsgDescr()); }else{ //濡傛灉澶辫触 update.setWmsSendStatus(Constants.TWO); @@ -266,6 +268,7 @@ job.setIsdeleted(Constants.ZERO); job.setIsNew(Constants.ONE); job.setStatus(Constants.ONE); + job.setContractNum(param.getContractNum()); job.setCarryBillCode(param.getCarrierBillCode()); job.setIocode(param.getIoCode()); job.setCarrierName(param.getCarrierName()); @@ -279,7 +282,7 @@ platformWmsJobMapper.insert(job); jobList.add(model); } - jobIdList.add(job.getId()); + jobIdList.add(job.getJobId()); if(param.getDetails()!=null && param.getDetails().size()>0){ for(WmsInboundDetailRequest d :param.getDetails()){ PlatformWmsDetail entity = new PlatformWmsDetail(); @@ -287,6 +290,7 @@ entity.setIsdeleted(Constants.ZERO); entity.setIocode(d.getIoCode()); entity.setJobId(job.getJobId()); + entity.setContractNum(param.getContractNum()); entity.setWmsJobId(job.getId()); entity.setIoQty(d.getIoQty()); entity.setStatus(Constants.ZERO); @@ -310,8 +314,8 @@ if(details.size()>0){ platformWmsDetailMapper.insert(details); } + list.setJobIdList(jobIdList); if(jobList.size()>0){ - list.setJobIdList(jobIdList); startEndNoticeToDriver(jobList); } }catch (Exception e){ @@ -373,8 +377,16 @@ private void dealCarPlatformAndDriverInfo(PlatformJob job,int type) { //鏌ヨ杞﹁締鏄惁鑷湁杞︼紝浠ュ強jobNum琛ㄧず浣嗘眰浣滀笟鏁伴噺锛堥潪宸茬鍥殑浣滀笟鏁�) Cars car = carsMapper.selectOne(new QueryWrapper<Cars>() - .select("*,(select count(1) from platform_job b where b.plate_num='"+job.getCarCodeFront()+"' and b.status in("+ - Constants.PlatformJobStatus.LEAVED.getKey()+")) as jobNum") + .select("*,(select count(1) from platform_job b where b.plate_num='"+job.getCarCodeFront()+"' " + + "and b.status in("+ + Constants.PlatformJobStatus.WART_SIGN_IN.getKey()+","+ + Constants.PlatformJobStatus.WART_SIGN_IN.getKey()+","+ + Constants.PlatformJobStatus.WAIT_CALL.getKey()+","+ + Constants.PlatformJobStatus.IN_WAIT.getKey()+","+ + Constants.PlatformJobStatus.CALLED.getKey()+","+ + Constants.PlatformJobStatus.TRANSFERING.getKey()+","+ + Constants.PlatformJobStatus.EXCEPTION.getKey()+","+ + Constants.PlatformJobStatus.WORKING.getKey()+")) as jobNum") .lambda() .eq(Cars::getIsdeleted,Constants.ZERO) .eq(Cars::getType,Constants.ONE) @@ -383,8 +395,10 @@ //濡傛灉鏄嚜鏈夌墿娴佽溅 job.setType(type==0?Constants.platformJobType.zycxh:Constants.platformJobType.zyczh);//鑷湁杞﹀嵏璐�/瑁呰揣 job.setCarCodeBack(job.getCarCodeFront());//鑷湁杞﹂粯璁ゅ墠鍚庤溅鐗屼竴鏍� - if(retentionMapper.selectCount(new QueryWrapper<Retention>().lambda().eq(Retention::getType,Constants.THREE) - .eq(Retention::getCarNo,car.getCode()))>Constants.ZERO && car.getJobNum() == 0){ + if(job.getType() ==Constants.platformJobType.zyczh + && retentionMapper.selectCount(new QueryWrapper<Retention>().lambda().eq(Retention::getType,Constants.THREE) + .eq(Retention::getCarNo,car.getCode()))>Constants.ZERO + && car.getJobNum() == 0){ //濡傛灉杞﹁締鍦ㄥ洯 job.setStatus(Constants.PlatformJobStatus.WAIT_CALL.getKey());//鍦ㄥ洯鏃犱綔涓氱姸鎬侊紝鍒欒嚜鍔ㄣ�愬凡绛惧埌銆戝鐞� job.setArriveDate(new Date()); @@ -419,6 +433,22 @@ job.setCompanyNamePath(driver.getCompanyNamePath()); } platformJobMapper.insert(job); + if(car !=null){ + //瀛樺偍鎿嶄綔鏃ュ織 + PlatformLog platformLog = new PlatformLog(); + platformLog.setIsdeleted(Constants.ZERO); + platformLog.setCreateDate(new Date()); + platformLog.setJobId(job.getId()); + platformLog.setObjType(Constants.PlatformJobLogType.SIGN.getKey()); + platformLog.setContent("鑷姩绛惧埌"); + platformLog.setParam4(job.getCarCodeFront()); + platformLog.setAfterContent(JSONObject.toJSONString(job)); + platformLog.setObjId(job.getId().toString()); + platformLog.setParam3("0"); + platformLogMapper.insert(platformLog); + } + + } private PlatformJob dealJobBizOutbound(WmsOutboundNoticeRequest param) { @@ -485,10 +515,9 @@ job.setContractNum(param.getContractNum()); job.setDriverPhone(param.getDriverPhone()); job.setDriverName(param.getDriverName()); -// job.setOrigin(Constants.ONE); platformWmsJobMapper.insert(job); } - jobIdList.add(job.getId()); + jobIdList.add(job.getJobId()); if(param.getDetails()!=null && param.getDetails().size()>0){ for(WmsOutboundDetailRequest d :param.getDetails()){ PlatformWmsDetail entity = new PlatformWmsDetail(); @@ -497,6 +526,7 @@ entity.setIocode(d.getIoCode()); entity.setJobId(job.getJobId()); entity.setWmsJobId(job.getId()); + entity.setContractNum(param.getContractNum()); entity.setIoQty(d.getIoQty()); entity.setRepertotyAddress(job.getRepertotyAddress()); entity.setWmsJobId(job.getId()); @@ -521,8 +551,8 @@ if(details.size()>0){ platformWmsDetailMapper.insert(details); } + list.setJobIdList(jobIdList); if(jobList.size()>0){ - list.setJobIdList(jobIdList); startEndNoticeToDriver(jobList); } }catch (Exception e){ @@ -712,14 +742,13 @@ .eq(PlatformWmsDetail::getIsdeleted, Constants.ZERO)); if(details!=null && details.size()>0){ for(PlatformWmsDetail d :details){ - num.add(Constants.formatBigdecimal(d.getIoQty())); + num = num.add(Constants.formatBigdecimal(d.getIoQty())); } - platformJobMapper.update(null,new UpdateWrapper<PlatformJob>().lambda() - .set(PlatformJob::getTotalNum,num) - .eq(PlatformJob::getOrigin, Constants.ZERO) - .eq(PlatformJob::getId, jobId)); } - + platformJobMapper.update(null,new UpdateWrapper<PlatformJob>().lambda() + .set(PlatformJob::getTotalNum,num) + .eq(PlatformJob::getOrigin, Constants.ONE) + .eq(PlatformJob::getId, jobId)); } } /** -- Gitblit v1.9.3