diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/accounting/controller/AccountingController.java b/SC-boot/linkage-scm/src/main/java/jnpf/accounting/controller/AccountingController.java index c932f0ca..15c2f418 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/accounting/controller/AccountingController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/accounting/controller/AccountingController.java @@ -344,7 +344,7 @@ public class AccountingController { /** - * 开启 + * 开启账期 * * @param id * @return @@ -357,7 +357,7 @@ public class AccountingController { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.lambda().eq(AccountingEntity::getId,entity.getId()); if(entity!=null){ - entity.setStatus("1"); + entity.setStatus("0"); accountingService.update(id, entity); return ActionResult.success("更新成功"); }else{ @@ -366,7 +366,7 @@ public class AccountingController { } /** - * 关闭 + * 关闭账期 * * @param id * @return @@ -379,7 +379,7 @@ public class AccountingController { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.lambda().eq(AccountingEntity::getId,entity.getId()); if(entity!=null){ - entity.setStatus("0"); + entity.setStatus("1"); accountingService.update(id, entity); return ActionResult.success("更新成功"); }else{ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/payment/controller/PaymentController.java b/SC-boot/linkage-scm/src/main/java/jnpf/payment/controller/PaymentController.java index ecc21794..152ce58c 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/payment/controller/PaymentController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/payment/controller/PaymentController.java @@ -660,6 +660,7 @@ public class PaymentController { paymentdocEntity.setIsSubmit("0"); } + //删除修改付款申请单状态 paymentdocService.updateBatchById(paymentdocList); paymentService.delete(entity); diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/controller/TradeuploadController.java b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/controller/TradeuploadController.java index c2559cd3..46b4b710 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/controller/TradeuploadController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/controller/TradeuploadController.java @@ -490,7 +490,7 @@ public class TradeuploadController { customerQueryWrapper.lambda().eq(CustomerEntity::getSupplierNm, tradeuploadCrForm.getCustomerId()); CustomerEntity customerEntity = customerService.getOne(customerQueryWrapper); tradeuploadCrForm.setClientId(customerEntity.getId()); - + //查询合同 QueryWrapper 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 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 { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/controller/VehicleController.java b/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/controller/VehicleController.java index 53400bf8..23410459 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/controller/VehicleController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/controller/VehicleController.java @@ -145,6 +145,7 @@ public class VehicleController { detpartment = userProvider.getDepartmentId(userId); vehicleQueryWrapper.lambda().eq(VehicleEntity::getDepartmentId,detpartment); } + //查询车辆和司机 List vehicleEntityList = vehicleService.list(vehicleQueryWrapper); if (vehicleEntityList.size()>0){ return ActionResult.fail("已经存在该车辆信息"); diff --git a/SC-web/src/views/scm/basicInformation/contractfile/Detail.vue b/SC-web/src/views/scm/basicInformation/contractfile/Detail.vue index 77f4f9c4..777a99d1 100644 --- a/SC-web/src/views/scm/basicInformation/contractfile/Detail.vue +++ b/SC-web/src/views/scm/basicInformation/contractfile/Detail.vue @@ -347,15 +347,15 @@ statusOptions: [ { fullName: "进行中", - id: "0", + id: "1", }, { fullName: "审批中", - id: "1", + id: "2", }, { fullName: "审批结束", - id: "2", + id: "3", }, ], classificationOptions: [ diff --git a/SC-web/src/views/scm/basicInformation/contractfile/index.vue b/SC-web/src/views/scm/basicInformation/contractfile/index.vue index fa06baf1..be8bb8e7 100644 --- a/SC-web/src/views/scm/basicInformation/contractfile/index.vue +++ b/SC-web/src/views/scm/basicInformation/contractfile/index.vue @@ -445,15 +445,15 @@ export default { statusOptions: [ { fullName: "进行中", - id: "0", + id: "1", }, { fullName: "审批中", - id: "1", + id: "2", }, { fullName: "审批结束", - id: "2", + id: "3", }, ], diff --git a/SC-web/src/views/scm/basicInformation/poundlist/VechicleForm.vue b/SC-web/src/views/scm/basicInformation/poundlist/VechicleForm.vue index 78006984..df2a8a24 100644 --- a/SC-web/src/views/scm/basicInformation/poundlist/VechicleForm.vue +++ b/SC-web/src/views/scm/basicInformation/poundlist/VechicleForm.vue @@ -108,7 +108,7 @@ -