productDev/dmvisit.git

			@@ -13,6 +13,9 @@
			import com.doumee.core.model.LoginUserInfo;
			import com.doumee.core.model.PageData;
			import com.doumee.core.model.PageWrap;
			import com.doumee.core.tms.model.request.TmsLockStatusQueryRequest;
			import com.doumee.core.tms.model.response.TmsBaseResponse;
			import com.doumee.core.tms.model.response.TmsLockStatusQueryResponse;
			import com.doumee.core.utils.*;
			import com.doumee.dao.business.*;
			import com.doumee.dao.business.join.PlatformJobJoinMapper;
			@@ -34,6 +37,7 @@
			import com.doumee.service.business.impl.hksync.HkSyncPushServiceImpl;
			import com.doumee.service.business.impl.thrid.WmsServiceImpl;
			import com.doumee.service.business.third.EmayService;
			import com.doumee.service.business.third.TmsService;
			import com.doumee.service.business.third.WmsService;
			import com.github.yulichang.wrapper.MPJLambdaWrapper;
			import lombok.extern.slf4j.Slf4j;
			@@ -63,6 +67,8 @@

			@Autowired
			private PlatformJobMapper platformJobMapper;
			@Autowired
			private TmsService tmsService;

			@Autowired
			private PlatformDeviceMapper platformDeviceMapper;
			@@ -191,10 +197,12 @@
			.selectAs(PlatformWmsJob::getCarrierName,PlatformJob::getCarrierName)
			.selectAs(PlatformWmsJob::getIoCreatedate,PlatformJob::getIoCreatedate)
			.selectAs(SystemUser::getRealname,PlatformJob::getOutUserName)
			.selectAs(PlatformBooks::getId,PlatformJob::getBookId)
			.leftJoin(Platform.class,Platform::getId,PlatformJob::getPlatformId)
			.leftJoin(PlatformGroup.class,PlatformGroup::getId,Platform::getGroupId)
			.leftJoin(PlatformWmsJob.class,PlatformWmsJob::getCarryBillCode,PlatformJob::getBillCode)
			.leftJoin(SystemUser.class,SystemUser::getId,PlatformJob::getOutUserId)
			.leftJoin(PlatformBooks.class,PlatformBooks::getJobId,PlatformJob::getId)
			.eq(pageWrap.getModel().getId() != null, PlatformJob::getId, pageWrap.getModel().getId())
			.eq(pageWrap.getModel().getCreator() != null, PlatformJob::getCreator, pageWrap.getModel().getCreator())
			.ge(pageWrap.getModel().getCreateDate() != null, PlatformJob::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()))
			@@ -275,11 +283,13 @@
			.apply(pageWrap.getModel().getQueryType() != null, " find_in_set(t.TYPE,'"+pageWrap.getModel().getQueryType()+"')")
			.ge(pageWrap.getModel().getBeginWorkDateStart() != null, PlatformJob::getStartDate, Utils.Date.getStart(pageWrap.getModel().getBeginWorkDateStart()))
			.le(pageWrap.getModel().getBeginWorkDateEnd() != null, PlatformJob::getStartDate, Utils.Date.getEnd(pageWrap.getModel().getBeginWorkDateEnd()))
			.ge(pageWrap.getModel().getBeginDoneDateStart() != null, PlatformJob::getDoneDate, Utils.Date.getStart(pageWrap.getModel().getBeginDoneDateStart()))
			.le(pageWrap.getModel().getBeginDoneDateEnd() != null, PlatformJob::getDoneDate, Utils.Date.getEnd(pageWrap.getModel().getBeginDoneDateEnd()))

			.ge(pageWrap.getModel().getCreateDateStart() != null, PlatformWmsJob::getIoCreatedate, Utils.Date.getStart(pageWrap.getModel().getCreateDateStart()))
			.le(pageWrap.getModel().getCreateDateEnd() != null, PlatformWmsJob::getIoCreatedate, Utils.Date.getEnd(pageWrap.getModel().getCreateDateEnd()))
			.eq(pageWrap.getModel().getJobType() != null && Constants.equalsInteger(Constants.ONE,pageWrap.getModel().getJobType()), PlatformJob::getType, Constants.platformJobType.sgscxh)
			.ne(pageWrap.getModel().getJobType() != null && Constants.equalsInteger(Constants.ZERO,pageWrap.getModel().getJobType()), PlatformJob::getType, Constants.platformJobType.sgscxh)
			.isNotNull(pageWrap.getModel().getJobType() != null && Constants.equalsInteger(Constants.ONE,pageWrap.getModel().getJobType()), PlatformJob::getContractNum)
			.isNull(pageWrap.getModel().getJobType() != null && Constants.equalsInteger(Constants.ZERO,pageWrap.getModel().getJobType()), PlatformJob::getContractNum)
			;

			for(PageWrap.SortData sortData: pageWrap.getSorts()) {
			@@ -332,7 +342,7 @@
			" ( " +
			" ( t.`STATUS` = "+Constants.PlatformJobStatus.WAIT_CALL.getKey()+" and t.PLATFORM_GROUP_ID = ( SELECT p.group_id FROM platform p WHERE p.id = "+pageWrap.getModel().getPlatformId()+" LIMIT 1 ) )" +
			" or " +
			" (t.`STATUS` = "+Constants.PlatformJobStatus.IN_WAIT.getKey()+" and t.PLATFORM_ID = "+pageWrap.getModel().getPlatformId()+" )" +
			" (t.`STATUS` = "+Constants.PlatformJobStatus.IN_WAIT.getKey()+" )" +
			" or " +
			" (t.`STATUS` = "+Constants.PlatformJobStatus.TRANSFERING.getKey()+" and t.PLATFORM_ID = "+pageWrap.getModel().getPlatformId()+" ) " +
			") "
			@@ -1343,14 +1353,42 @@
			savePlatformLog(Constants.PlatformJobLogType.DONE.getKey(),oldPlatformJob,platformJob ,
			Constants.PlatformJobLogType.DONE.getInfo());

			if(Constants.equalsInteger(platformJob.getType(),Constants.TWO)){
			//TODO 外协车装货查询TMS 电子锁情况
			if(Constants.equalsInteger(platformJob.getType(),Constants.THREE)){
			// 外协车装货查询TMS 电子锁情况
			List<PlatformWmsDetail> details = platformWmsDetailMapper.selectList(new QueryWrapper<PlatformWmsDetail>().lambda()
			.eq(PlatformWmsDetail::getJobId,platformJob.getId())
			.eq(PlatformWmsDetail::getIsdeleted,Constants.ZERO)
			);
			if(details!=null && details.size()>0){
			Date date = new Date();
			List<String> codeList =new ArrayList<>();
			for(PlatformWmsDetail d : details){
			codeList.add(d.getIocode());
			}
			TmsLockStatusQueryRequest tmsLock = new TmsLockStatusQueryRequest();
			tmsLock.setContractNumbers(codeList);
			TmsBaseResponse<List<TmsLockStatusQueryResponse>> lockResult = tmsService.lockStatusQuery(tmsLock);
			if(lockResult!=null && lockResult.isSuccess()&& lockResult.getData()!=null ){
			for(TmsLockStatusQueryResponse s : lockResult.getData()){
			platformWmsDetailMapper.update(null,new UpdateWrapper<PlatformWmsDetail>().lambda()
			.eq(PlatformWmsDetail::getIocode,s.getContractNumber())
			.set(PlatformWmsDetail::getEditDate,date)
			.set(PlatformWmsDetail::getLockDate,s.getOutDate())
			.set(PlatformWmsDetail::getLockStatus,Constants.ONE)
			.eq(PlatformWmsDetail::getJobId,platformJob.getId())
			.eq(PlatformWmsDetail::getIsdeleted,Constants.ZERO));
			}
			}
			}

			}else if(Constants.equalsInteger(platformJob.getType(),Constants.ONE) \|\| Constants.equalsInteger(platformJob.getType(),Constants.FOUR)){
			//TODO 外协车卸货或者市公司车卸货则根据任务情况

			}





			//发送短信信息
			SmsEmailServiceImpl.sendPlatformJobSms(systemDictDataBiz,
			emayService,smsEmailMapper,smsConfigMapper,platformJobMapper,platformJob.getId(),
			@@ -1359,7 +1397,7 @@

			//广播 led通知
			platformJob.setPlatformName(platform.getName());
			this.broadcastAndLEed(platformJob,null,
			this.broadcastAndLEed(platformJob,Constants.PlatformLedContent.DONE.getInfo(),
			Constants.PlatformBroadcastContent.DONE.getInfo());
			return platformJob;
			}
			@@ -2045,4 +2083,6 @@
			}




			}