yunxi
/
SC-MOM
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

增加单据编号判断

Browse Source
product
杨世强 1 year ago
parent 54b65a63e8
commit 48379345d1
22 changed files with 38 additions and 21 deletions
Show Stats Download Patch File Download Diff File

3
SC-boot/linkage-scm/src/main/java/jnpf/payment/controller/PaymentController.java
Unescape View File

@ -266,6 +266,9 @@ public class PaymentController {
UserInfo userInfo=userProvider.get(); UserInfo userInfo=userProvider.get();
//paymentCrForm.setDocumentno(generaterSwapUtil.getBillNumber("payment", false)); //paymentCrForm.setDocumentno(generaterSwapUtil.getBillNumber("payment", false));
PaymentEntity entity = JsonUtil.getJsonToBean(paymentCrForm, PaymentEntity.class); PaymentEntity entity = JsonUtil.getJsonToBean(paymentCrForm, PaymentEntity.class);
if (ObjectUtils.isNotEmpty(entity) && StringUtils.isBlank(entity.getDocumentno())){
return ActionResult.fail("单据编号不能为空");
}
entity.setId(mainId); entity.setId(mainId);
paymentService.save(entity); paymentService.save(entity);
QueryWrapper<PaymentdocEntity> paymentdocEntityWrapper = new QueryWrapper<>(); QueryWrapper<PaymentdocEntity> paymentdocEntityWrapper = new QueryWrapper<>();

3
SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/controller/PaymentdocController.java
Unescape View File

@ -208,6 +208,9 @@ public class PaymentdocController {
UserInfo userInfo=userProvider.get(); UserInfo userInfo=userProvider.get();
//paymentdocCrForm.setDocumentNo(generaterSwapUtil.getBillNumber("fukuanshenqing", false)); //paymentdocCrForm.setDocumentNo(generaterSwapUtil.getBillNumber("fukuanshenqing", false));
PaymentdocEntity entity = JsonUtil.getJsonToBean(paymentdocCrForm, PaymentdocEntity.class); PaymentdocEntity entity = JsonUtil.getJsonToBean(paymentdocCrForm, PaymentdocEntity.class);
if (ObjectUtils.isNotEmpty(entity) && StringUtils.isBlank(entity.getDocumentNo())){
return ActionResult.fail("单据编号不能为空");
}
entity.setId(mainId); entity.setId(mainId);
paymentdocService.save(entity); paymentdocService.save(entity);

9
SC-boot/linkage-scm/src/main/java/jnpf/poundlist/controller/PoundlistController.java
Unescape View File

@ -218,9 +218,12 @@ public class PoundlistController {
String mainId =RandomUtil.uuId(); String mainId =RandomUtil.uuId();
UserInfo userInfo=userProvider.get(); UserInfo userInfo=userProvider.get();
PoundlistEntity entity = JsonUtil.getJsonToBean(poundlistCrForm, PoundlistEntity.class); PoundlistEntity entity = JsonUtil.getJsonToBean(poundlistCrForm, PoundlistEntity.class);
entity.setId(mainId); if (ObjectUtils.isNotEmpty(entity) && StringUtils.isNotBlank(entity.getPoundlistNo())) {
poundlistService.save(entity); entity.setId(mainId);
poundlistService.save(entity);
}else{
return ActionResult.fail("磅单号不能为空");
}
return ActionResult.success("创建成功"); return ActionResult.success("创建成功");
} }

3
SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java
Unescape View File

@ -289,6 +289,9 @@ public class PurchaseorderController {
purchaseorderCrForm.setIsSettle("0");//未结算 purchaseorderCrForm.setIsSettle("0");//未结算
purchaseorderCrForm.setIsTransfer("0");//未转销售 purchaseorderCrForm.setIsTransfer("0");//未转销售
PurchaseorderitemEntity entity = JsonUtil.getJsonToBean(purchaseorderCrForm, PurchaseorderitemEntity.class); PurchaseorderitemEntity entity = JsonUtil.getJsonToBean(purchaseorderCrForm, PurchaseorderitemEntity.class);
if (ObjectUtils.isNotEmpty(entity) && StringUtils.isBlank(entity.getDocumentNo())){
return ActionResult.fail("单据编号不能为空");
}
entity.setId(mainId); entity.setId(mainId);
purchaseorderitemService.save(entity); purchaseorderitemService.save(entity);
List<Purchaseorder_item0Entity> Purchaseorder_item0List = JsonUtil.getJsonToList(purchaseorderCrForm.getPurchaseorder_item0List(), Purchaseorder_item0Entity.class); List<Purchaseorder_item0Entity> Purchaseorder_item0List = JsonUtil.getJsonToList(purchaseorderCrForm.getPurchaseorder_item0List(), Purchaseorder_item0Entity.class);

3
SC-boot/linkage-scm/src/main/java/jnpf/receiptin/controller/ReceiptinController.java
Unescape View File

@ -163,6 +163,9 @@ public class ReceiptinController {
receiptinCrForm.setCreatorTime(DateUtil.getNow()); receiptinCrForm.setCreatorTime(DateUtil.getNow());
receiptinCrForm.setCreatorUserName(userInfo.getUserId()); receiptinCrForm.setCreatorUserName(userInfo.getUserId());
ReceiptinEntity entity = JsonUtil.getJsonToBean(receiptinCrForm, ReceiptinEntity.class); ReceiptinEntity entity = JsonUtil.getJsonToBean(receiptinCrForm, ReceiptinEntity.class);
if (ObjectUtils.isNotEmpty(entity) && StringUtils.isBlank(entity.getDocumentno())){
return ActionResult.fail("单据编号不能为空");
}
entity.setId(mainId); entity.setId(mainId);
entity.setWarehousingdate(new Date()); entity.setWarehousingdate(new Date());
receiptinService.save(entity); receiptinService.save(entity);

3
SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/controller/TradeuploadController.java
Unescape View File

@ -621,6 +621,9 @@ public class TradeuploadController {
UserInfo userInfo = userProvider.get(); UserInfo userInfo = userProvider.get();
tradeuploadCrForm.setCreatorTime(DateUtil.getNow()); tradeuploadCrForm.setCreatorTime(DateUtil.getNow());
TradeuploadEntity entity = JsonUtil.getJsonToBean(tradeuploadCrForm, TradeuploadEntity.class); TradeuploadEntity entity = JsonUtil.getJsonToBean(tradeuploadCrForm, TradeuploadEntity.class);
if (ObjectUtils.isNotEmpty(entity) && StringUtils.isBlank(entity.getPoundlistNo())){
return ActionResult.fail("磅单号不能为空");
}
QueryWrapper<TradeuploadEntity> queryWrapper = new QueryWrapper<>(); QueryWrapper<TradeuploadEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(TradeuploadEntity::getPoundlistNo, entity.getPoundlistNo()); queryWrapper.lambda().eq(TradeuploadEntity::getPoundlistNo, entity.getPoundlistNo());
List<TradeuploadEntity> list = tradeuploadService.list(queryWrapper); List<TradeuploadEntity> list = tradeuploadService.list(queryWrapper);

2
SC-web/src/views/scm/basicInformation/payment/Form.vue
Unescape View File

@ -5,7 +5,7 @@
<el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right"> <el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right">
<template v-if="!loading"> <template v-if="!loading">
<el-col :span="8"> <el-col :span="8">
<el-form-item label="单据编号" prop="documentno"> <el-form-item label="单据编号" prop="documentno" required>
<el-input v-model="dataForm.documentno" placeholder="系统自动生成" readonly> <el-input v-model="dataForm.documentno" placeholder="系统自动生成" readonly>
</el-input> </el-input>

2
SC-web/src/views/scm/basicInformation/paymentdoc/Form.vue
Unescape View File

@ -5,7 +5,7 @@
> >
<template v-if="!loading && formOperates"> <template v-if="!loading && formOperates">
<el-col :span="8" v-if="judgeShow('documentNo')"> <el-col :span="8" v-if="judgeShow('documentNo')">
<el-form-item label="单据编号" prop="documentNo"> <el-form-item label="单据编号" prop="documentNo" required>
<el-input :disabled="judgeWrite('documentNo')" v-model="dataForm.documentNo" placeholder="系统自动生成" <el-input :disabled="judgeWrite('documentNo')" v-model="dataForm.documentNo" placeholder="系统自动生成"
readonly> readonly>

2
SC-web/src/views/scm/basicInformation/paymentdoc/paymentForm.vue
Unescape View File

@ -5,7 +5,7 @@
<el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right"> <el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right">
<template v-if="!loading"> <template v-if="!loading">
<el-col :span="8"> <el-col :span="8">
<el-form-item label="单据编号" prop="documentno"> <el-form-item label="单据编号" prop="documentno" required>
<el-input v-model="dataForm.documentno" placeholder="系统自动生成" readonly> <el-input v-model="dataForm.documentno" placeholder="系统自动生成" readonly>
</el-input> </el-input>

5
SC-web/src/views/scm/basicInformation/poundlist/PurchaseOrderForm.vue
Unescape View File

@ -5,9 +5,8 @@
<el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right"> <el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right">
<template v-if="!loading"> <template v-if="!loading">
<el-col :span="8"> <el-col :span="8">
<el-form-item label="单据编号" prop="documentNo"> <el-form-item label="单据编号" prop="documentNo" required>
<el-input v-model="dataForm.documentNo" placeholder="系统自动生成" readonly> <el-input v-model="dataForm.documentNo" placeholder="系统自动生成" readonly>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>

2
SC-web/src/views/scm/basicInformation/purchaseback/Form.vue
Unescape View File

@ -6,7 +6,7 @@
label-position="right"> label-position="right">
<template v-if="!loading"> <template v-if="!loading">
<el-col :span="8"> <el-col :span="8">
<el-form-item label="单据编号" prop="documentNo"> <el-form-item label="单据编号" prop="documentNo" required>
<el-input v-model="dataForm.documentNo" placeholder="请输入" clearable <el-input v-model="dataForm.documentNo" placeholder="请输入" clearable
:style='{"width":"100%"}' :disabled="true"> :style='{"width":"100%"}' :disabled="true">

2
SC-web/src/views/scm/basicInformation/purchaseorder/AdvanceForm.vue
Unescape View File

@ -5,7 +5,7 @@
<el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right"> <el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right">
<template v-if="!loading"> <template v-if="!loading">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="单据编号" prop="documentNo"> <el-form-item label="单据编号" prop="documentNo" >
<el-input v-model="dataForm.documentNo" placeholder="系统自动生成" readonly> <el-input v-model="dataForm.documentNo" placeholder="系统自动生成" readonly>
</el-input> </el-input>

2
SC-web/src/views/scm/basicInformation/purchaseorder/InvoicesForm.vue
Unescape View File

@ -5,7 +5,7 @@
<el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right"> <el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right">
<template v-if="!loading"> <template v-if="!loading">
<el-col :span="8"> <el-col :span="8">
<el-form-item label="单据编号" prop="documentNo"> <el-form-item label="单据编号" prop="documentNo" required>
<el-input v-model="dataForm.documentNo" placeholder="请输入单据编号" clearable :style='{"width":"100%"}' readonly> <el-input v-model="dataForm.documentNo" placeholder="请输入单据编号" clearable :style='{"width":"100%"}' readonly>
</el-input> </el-input>

2
SC-web/src/views/scm/basicInformation/purchaseorder/PaymentdocForm.vue
Unescape View File

@ -8,7 +8,7 @@
<template v-if="!loading"> <template v-if="!loading">
<el-col :span="8"> <el-col :span="8">
<el-form-item label="单据编号" <el-form-item label="单据编号"
prop="documentNo"> prop="documentNo" required>
<el-input v-model="dataForm.documentNo" <el-input v-model="dataForm.documentNo"
placeholder="系统自动生成" readonly :disabled="true"> placeholder="系统自动生成" readonly :disabled="true">

2
SC-web/src/views/scm/basicInformation/purchaseorder/purchasebackForm.vue
Unescape View File

@ -6,7 +6,7 @@
label-position="right"> label-position="right">
<template v-if="!loading"> <template v-if="!loading">
<el-col :span="8"> <el-col :span="8">
<el-form-item label="单据编号" prop="documentNo"> <el-form-item label="单据编号" prop="documentNo" required>
<el-input v-model="dataForm.documentNo" placeholder="请输入" clearable <el-input v-model="dataForm.documentNo" placeholder="请输入" clearable
:style='{"width":"100%"}' :disabled="true"> :style='{"width":"100%"}' :disabled="true">

2
SC-web/src/views/scm/basicInformation/purchaseorder/receiptinForm.vue
Unescape View File

@ -6,7 +6,7 @@
label-position="right"> label-position="right">
<template v-if="!loading"> <template v-if="!loading">
<el-col :span="8"> <el-col :span="8">
<el-form-item label="单据编号" prop="documentno"> <el-form-item label="单据编号" prop="documentno" required>
<el-input v-model="dataForm.documentno" placeholder="系统自动生成" readonly> <el-input v-model="dataForm.documentno" placeholder="系统自动生成" readonly>
</el-input> </el-input>

2
SC-web/src/views/scm/basicInformation/saleback/Form.vue
Unescape View File

@ -6,7 +6,7 @@
label-position="right"> label-position="right">
<template v-if="!loading"> <template v-if="!loading">
<el-col :span="8"> <el-col :span="8">
<el-form-item label="单据编号" prop="documentNo"> <el-form-item label="单据编号" prop="documentNo" required>
<el-input v-model="dataForm.documentNo" placeholder="请输入" clearable <el-input v-model="dataForm.documentNo" placeholder="请输入" clearable
:style='{"width":"100%"}' readonly> :style='{"width":"100%"}' readonly>

2
SC-web/src/views/scm/basicInformation/saleorder/Form.vue
Unescape View File

@ -8,7 +8,7 @@
<template v-if="!loading"> <template v-if="!loading">
<el-col :span="8"> <el-col :span="8">
<el-form-item label="单据编号" <el-form-item label="单据编号"
prop="documentNo"> prop="documentNo" required>
<el-input v-model="dataForm.documentNo" <el-input v-model="dataForm.documentNo"
placeholder="系统自动生成" readonly> placeholder="系统自动生成" readonly>

2
SC-web/src/views/scm/basicInformation/saleorder/arinvoicesForm.vue
Unescape View File

@ -8,7 +8,7 @@
<template v-if="!loading"> <template v-if="!loading">
<el-col :span="8" > <el-col :span="8" >
<el-form-item label="单据编号" <el-form-item label="单据编号"
prop="documentNo" > prop="documentNo" required>
<el-input v-model="dataForm.documentNo" <el-input v-model="dataForm.documentNo"
placeholder="系统自动生成" readonly > placeholder="系统自动生成" readonly >

2
SC-web/src/views/scm/basicInformation/saleorder/collectionForm.vue
Unescape View File

@ -8,7 +8,7 @@
<template v-if="!loading"> <template v-if="!loading">
<el-col :span="8" > <el-col :span="8" >
<el-form-item label="单据编号" <el-form-item label="单据编号"
prop="documentNo" > prop="documentNo" required>
<el-input v-model="dataForm.documentNo" <el-input v-model="dataForm.documentNo"
placeholder="系统自动生成" readonly > placeholder="系统自动生成" readonly >

2
SC-web/src/views/scm/basicInformation/saleorder/receiptoutForm.vue
Unescape View File

@ -8,7 +8,7 @@
<template v-if="!loading"> <template v-if="!loading">
<el-col :span="8"> <el-col :span="8">
<el-form-item label="单据编号" <el-form-item label="单据编号"
prop="documentNo"> prop="documentNo" required>
<el-input v-model="dataForm.documentNo" <el-input v-model="dataForm.documentNo"
placeholder="系统自动生成" readonly> placeholder="系统自动生成" readonly>

2
SC-web/src/views/scm/basicInformation/saleorder/salebackForm.vue
Unescape View File

@ -6,7 +6,7 @@
label-position="right"> label-position="right">
<template v-if="!loading"> <template v-if="!loading">
<el-col :span="8"> <el-col :span="8">
<el-form-item label="单据编号" prop="documentNo"> <el-form-item label="单据编号" prop="documentNo" required>
<el-input v-model="dataForm.documentNo" placeholder="请输入" clearable <el-input v-model="dataForm.documentNo" placeholder="请输入" clearable
:style='{"width":"100%"}' readonly> :style='{"width":"100%"}' readonly>

Write Preview
Loading…
Cancel
Save