From 48379345d132a105bce869e4fab01c3a1ab40f88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E4=B8=96=E5=BC=BA?= Date: Fri, 16 Jun 2023 14:07:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8D=95=E6=8D=AE=E7=BC=96?= =?UTF-8?q?=E5=8F=B7=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/jnpf/payment/controller/PaymentController.java | 3 +++ .../jnpf/paymentdoc/controller/PaymentdocController.java | 3 +++ .../jnpf/poundlist/controller/PoundlistController.java | 9 ++++++--- .../controller/PurchaseorderController.java | 3 +++ .../jnpf/receiptin/controller/ReceiptinController.java | 3 +++ .../tradeupload/controller/TradeuploadController.java | 3 +++ SC-web/src/views/scm/basicInformation/payment/Form.vue | 2 +- .../src/views/scm/basicInformation/paymentdoc/Form.vue | 2 +- .../scm/basicInformation/paymentdoc/paymentForm.vue | 2 +- .../scm/basicInformation/poundlist/PurchaseOrderForm.vue | 5 ++--- .../src/views/scm/basicInformation/purchaseback/Form.vue | 2 +- .../scm/basicInformation/purchaseorder/AdvanceForm.vue | 2 +- .../scm/basicInformation/purchaseorder/InvoicesForm.vue | 2 +- .../basicInformation/purchaseorder/PaymentdocForm.vue | 2 +- .../basicInformation/purchaseorder/purchasebackForm.vue | 2 +- .../scm/basicInformation/purchaseorder/receiptinForm.vue | 2 +- SC-web/src/views/scm/basicInformation/saleback/Form.vue | 2 +- SC-web/src/views/scm/basicInformation/saleorder/Form.vue | 2 +- .../scm/basicInformation/saleorder/arinvoicesForm.vue | 2 +- .../scm/basicInformation/saleorder/collectionForm.vue | 2 +- .../scm/basicInformation/saleorder/receiptoutForm.vue | 2 +- .../scm/basicInformation/saleorder/salebackForm.vue | 2 +- 22 files changed, 38 insertions(+), 21 deletions(-) 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 7a7320f3..5c1504eb 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 @@ -266,6 +266,9 @@ public class PaymentController { UserInfo userInfo=userProvider.get(); //paymentCrForm.setDocumentno(generaterSwapUtil.getBillNumber("payment", false)); PaymentEntity entity = JsonUtil.getJsonToBean(paymentCrForm, PaymentEntity.class); + if (ObjectUtils.isNotEmpty(entity) && StringUtils.isBlank(entity.getDocumentno())){ + return ActionResult.fail("单据编号不能为空"); + } entity.setId(mainId); paymentService.save(entity); QueryWrapper paymentdocEntityWrapper = new QueryWrapper<>(); diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/controller/PaymentdocController.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/controller/PaymentdocController.java index ab572e97..4b847d19 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/controller/PaymentdocController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/controller/PaymentdocController.java @@ -208,6 +208,9 @@ public class PaymentdocController { UserInfo userInfo=userProvider.get(); //paymentdocCrForm.setDocumentNo(generaterSwapUtil.getBillNumber("fukuanshenqing", false)); PaymentdocEntity entity = JsonUtil.getJsonToBean(paymentdocCrForm, PaymentdocEntity.class); + if (ObjectUtils.isNotEmpty(entity) && StringUtils.isBlank(entity.getDocumentNo())){ + return ActionResult.fail("单据编号不能为空"); + } entity.setId(mainId); paymentdocService.save(entity); diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/controller/PoundlistController.java b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/controller/PoundlistController.java index 2b52c0d7..044bf37b 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/controller/PoundlistController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/controller/PoundlistController.java @@ -218,9 +218,12 @@ public class PoundlistController { String mainId =RandomUtil.uuId(); UserInfo userInfo=userProvider.get(); PoundlistEntity entity = JsonUtil.getJsonToBean(poundlistCrForm, PoundlistEntity.class); - entity.setId(mainId); - poundlistService.save(entity); - + if (ObjectUtils.isNotEmpty(entity) && StringUtils.isNotBlank(entity.getPoundlistNo())) { + entity.setId(mainId); + poundlistService.save(entity); + }else{ + return ActionResult.fail("磅单号不能为空"); + } return ActionResult.success("创建成功"); } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java index 29b8a59b..b7770c65 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java @@ -289,6 +289,9 @@ public class PurchaseorderController { purchaseorderCrForm.setIsSettle("0");//未结算 purchaseorderCrForm.setIsTransfer("0");//未转销售 PurchaseorderitemEntity entity = JsonUtil.getJsonToBean(purchaseorderCrForm, PurchaseorderitemEntity.class); + if (ObjectUtils.isNotEmpty(entity) && StringUtils.isBlank(entity.getDocumentNo())){ + return ActionResult.fail("单据编号不能为空"); + } entity.setId(mainId); purchaseorderitemService.save(entity); List Purchaseorder_item0List = JsonUtil.getJsonToList(purchaseorderCrForm.getPurchaseorder_item0List(), Purchaseorder_item0Entity.class); diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/controller/ReceiptinController.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/controller/ReceiptinController.java index 723b6ea5..ba84e79a 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/controller/ReceiptinController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/controller/ReceiptinController.java @@ -163,6 +163,9 @@ public class ReceiptinController { receiptinCrForm.setCreatorTime(DateUtil.getNow()); receiptinCrForm.setCreatorUserName(userInfo.getUserId()); ReceiptinEntity entity = JsonUtil.getJsonToBean(receiptinCrForm, ReceiptinEntity.class); + if (ObjectUtils.isNotEmpty(entity) && StringUtils.isBlank(entity.getDocumentno())){ + return ActionResult.fail("单据编号不能为空"); + } entity.setId(mainId); entity.setWarehousingdate(new Date()); receiptinService.save(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 44c5434c..2c3084d5 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 @@ -621,6 +621,9 @@ public class TradeuploadController { UserInfo userInfo = userProvider.get(); tradeuploadCrForm.setCreatorTime(DateUtil.getNow()); TradeuploadEntity entity = JsonUtil.getJsonToBean(tradeuploadCrForm, TradeuploadEntity.class); + if (ObjectUtils.isNotEmpty(entity) && StringUtils.isBlank(entity.getPoundlistNo())){ + return ActionResult.fail("磅单号不能为空"); + } QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.lambda().eq(TradeuploadEntity::getPoundlistNo, entity.getPoundlistNo()); List list = tradeuploadService.list(queryWrapper); diff --git a/SC-web/src/views/scm/basicInformation/payment/Form.vue b/SC-web/src/views/scm/basicInformation/payment/Form.vue index b870979a..99299fff 100644 --- a/SC-web/src/views/scm/basicInformation/payment/Form.vue +++ b/SC-web/src/views/scm/basicInformation/payment/Form.vue @@ -5,7 +5,7 @@