|
|
@ -601,6 +601,12 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution |
|
|
|
} |
|
|
|
} |
|
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS"); |
|
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS"); |
|
|
|
DistributionSignforEntity distributionSignfor = this.getById(distributionSignforDTO.getId()); |
|
|
|
DistributionSignforEntity distributionSignfor = this.getById(distributionSignforDTO.getId()); |
|
|
|
|
|
|
|
Integer loadingNum = distributionSignfor.getLoadedNumber() + distributionSignfor.getLoadedinNumber(); |
|
|
|
|
|
|
|
Integer signNum = distributionSignfor.getReceivedQuantity() + distributionSignfor.getReceivedinQuantity(); |
|
|
|
|
|
|
|
if (Func.equals(loadingNum,signNum)){ |
|
|
|
|
|
|
|
log.error("复核签收装车数和签收数不一致,装车数:{},签收数:{}", loadingNum,signNum); |
|
|
|
|
|
|
|
return R.fail("请维护计划后进行复核!!!"); |
|
|
|
|
|
|
|
} |
|
|
|
BladeUser user = AuthUtil.getUser(); |
|
|
|
BladeUser user = AuthUtil.getUser(); |
|
|
|
distributionSignfor.setExamineUserId(user.getUserId()); |
|
|
|
distributionSignfor.setExamineUserId(user.getUserId()); |
|
|
|
distributionSignfor.setSigningStatus(SignforStatusConstant.yiqianshou.getValue()); |
|
|
|
distributionSignfor.setSigningStatus(SignforStatusConstant.yiqianshou.getValue()); |
|
|
|