|
|
|
@ -490,7 +490,7 @@ public class TradeuploadController {
|
|
|
|
|
customerQueryWrapper.lambda().eq(CustomerEntity::getSupplierNm, tradeuploadCrForm.getCustomerId());
|
|
|
|
|
CustomerEntity customerEntity = customerService.getOne(customerQueryWrapper);
|
|
|
|
|
tradeuploadCrForm.setClientId(customerEntity.getId());
|
|
|
|
|
|
|
|
|
|
//查询合同
|
|
|
|
|
QueryWrapper<ContractFileEntity> queryWrapper = new QueryWrapper<>();
|
|
|
|
|
queryWrapper.lambda().eq(ContractFileEntity::getCode, customerEntity.getId());
|
|
|
|
|
queryWrapper.lambda().eq(ContractFileEntity::getContractType, "1");
|
|
|
|
@ -509,7 +509,7 @@ public class TradeuploadController {
|
|
|
|
|
detpartment = userProvider.getDepartmentId(userId);
|
|
|
|
|
vehicleQueryWrapper.lambda().eq(VehicleEntity::getDepartmentId, detpartment);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//查询车辆然后获取净重等
|
|
|
|
|
VehicleEntity vehicleEntity = vehicleService.getOne(vehicleQueryWrapper);
|
|
|
|
|
if (vehicleEntity != null) {
|
|
|
|
|
tradeuploadCrForm.setVehiclePictures(vehicleEntity.getVehiclephotos());
|
|
|
|
@ -978,6 +978,7 @@ public class TradeuploadController {
|
|
|
|
|
PurchaseorderqueryWrapper.lambda().eq(PurchaseorderEntity::getId, entity.getPurchaseorderId());
|
|
|
|
|
PurchaseorderqueryWrapper.lambda().eq(PurchaseorderEntity::getDeleteMark, 0);
|
|
|
|
|
List<PurchaseorderEntity> Pur = purchaseorderService.list(PurchaseorderqueryWrapper);
|
|
|
|
|
//查询有无付款申请,有不能修改
|
|
|
|
|
if (Pur.size() > 0) {
|
|
|
|
|
int paymenttime = Integer.valueOf(Pur.get(0).getPaymentTime());
|
|
|
|
|
if (list != null && list.get(0).getPurchaseorderId() != null && paymenttime > 0) {
|
|
|
|
@ -993,7 +994,6 @@ public class TradeuploadController {
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
tradeuploadService.update(id, subentity);
|
|
|
|
|
return ActionResult.success("更新成功");
|
|
|
|
|
} else {
|
|
|
|
|