yunxi
/
jigangSCM2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

凭证新增字段

Browse Source
jg-waiwang-pro
vayne 5 months ago
parent 4299ed6ab0
commit 113e35f2e2
9 changed files with 99 additions and 25 deletions
Show Stats Download Patch File Download Diff File

11
jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/VoucherMapper.xml
Unescape View File

@ -101,7 +101,7 @@
c.net_weight,
c.remark,
d.vehicle_number,
a.contract_no as contractNo,
a.purchase_contract_no as purchaseContractNo,
f.name as productName
FROM
jg_voucher a
@ -387,7 +387,10 @@
d.unit,
e.vehicle_number,
f.name AS productName,
a.contract_no as contractNo
a.purchase_contract_no as purchaseContractNo,
a.sale_contract_no as saleContractNo,
a.purchase_amount as purchaseAmount,
a.sale_amount as saleAmount
FROM
jg_voucher a
LEFT JOIN jg_subject_basic b ON a.associate_third_suppliers = b.id
@ -551,7 +554,9 @@
a.weigh_pictures3 as weighPictures3,
a.id as isSaleDeliveryVoucherSource,
c.telephone as telephone,
c.carrier as vehicleCarrier
c.carrier as vehicleCarrier,
a.sale_contract_no as saleContractNo,
a.sale_amount as saleAmount
FROM
jg_voucher a
LEFT JOIN jg_voucher_product b ON a.id = b.voucher_id AND b.f_delete_mark IS NULL

15
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/VoucherServiceImpl.java
Unescape View File

@ -262,9 +262,14 @@ public class VoucherServiceImpl extends ServiceImpl<VoucherMapper, VoucherEntity
voucherQueryWrapper.like("a.voucher_code",value);
}
if(ObjectUtil.isNotEmpty(voucherPagination.getContractNo())){
if(ObjectUtil.isNotEmpty(voucherPagination.getPurchaseContractNo())){
voucherNum++;
voucherQueryWrapper.like("a.contract_no",voucherPagination.getContractNo());
voucherQueryWrapper.like("a.purchase_contract_no",voucherPagination.getPurchaseContractNo());
}
if(ObjectUtil.isNotEmpty(voucherPagination.getSaleContractNo())){
voucherNum++;
voucherQueryWrapper.like("a.sale_contract_no",voucherPagination.getSaleContractNo());
}
if(ObjectUtil.isNotEmpty(voucherPagination.getProductName())){
@ -725,7 +730,7 @@ public class VoucherServiceImpl extends ServiceImpl<VoucherMapper, VoucherEntity
queryWrapper.eq("a.delivery_type","2");
queryWrapper.eq("a.voucher_status","4");
if (StringUtils.isNotEmpty(voucherPagination.getKeyword())) {
queryWrapper.and(wrapper -> wrapper.like("a.contract_no", voucherPagination.getKeyword())
queryWrapper.and(wrapper -> wrapper.like("a.purchase_contract_no", voucherPagination.getKeyword())
.or().like("f.name", voucherPagination.getKeyword())
.or().like("a.voucher_code",voucherPagination.getKeyword()));
}
@ -952,10 +957,10 @@ public class VoucherServiceImpl extends ServiceImpl<VoucherMapper, VoucherEntity
voucherEntity.setDeliveryType(StringUtil.equals(model.getDeliveryType(), "仓配") ? "1" : "2");//配送方式
voucherEntity.setVoucherStatus(StringUtil.equals(model.getDeliveryType(), "仓配") ? "3" : "4");//凭证状态
voucherEntity.setAssociateThirdSuppliers("");//关联三级供应商
voucherEntity.setContractNo(model.getContractNo());//合同编号
voucherEntity.setPurchaseContractNo(model.getContractNo());//合同编号
//根据合同编号取查合同
QueryWrapper<ContractLEntity> contractLQueryWrapper=new QueryWrapper<>();
contractLQueryWrapper.lambda().eq(ContractLEntity::getContractNumber, voucherEntity.getContractNo());
contractLQueryWrapper.lambda().eq(ContractLEntity::getContractNumber, voucherEntity.getPurchaseContractNo());
List<ContractLEntity> contractLEntityList = contractLService.list(contractLQueryWrapper);
if(contractLEntityList != null && contractLEntityList.size() > 0){
voucherEntity.setModeTransport(contractLEntityList.get(0).getModeTransport());//运输方式

4
jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/VoucherController.java
Unescape View File

@ -228,13 +228,13 @@ public class VoucherController {
organize = organize.replace("[","");
organize = organize.replace("]","");
QueryWrapper<ContractLEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("contract_number",voucherForm.getContractNo());
queryWrapper.eq("contract_number",voucherForm.getPurchaseContractNo());
queryWrapper.eq("contract_type","1");
queryWrapper.inSql("id", "SELECT f_process_id FROM flow_task WHERE f_status = '2'");//通过审核的订单
queryWrapper.like("organize_json_id",organize);
long count = contractLService.count(queryWrapper);
if (count < 1){
return ActionResult.fail("合同不存在");
return ActionResult.fail("采购合同编号不存在");
}
}
try{

10
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/VoucherEntity.java
Unescape View File

@ -144,10 +144,16 @@ public class VoucherEntity {
private String isReturnCargoOrder;
@TableField("DELIVERY_TYPE")
private String deliveryType;
@TableField("CONTRACT_NO")
private String contractNo;
@TableField("PURCHASE_CONTRACT_NO")
private String purchaseContractNo;
@TableField("IS_USED")
private String isUsed;
@TableField("SALE_CONTRACT_NO")
private String saleContractNo;
@TableField("PURCHASE_AMOUNT")
private String purchaseAmount;
@TableField("SALE_AMOUNT")
private String saleAmount;
@TableField(exist = false)

6
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/VoucherProductEntity.java
Unescape View File

@ -143,4 +143,10 @@ public class VoucherProductEntity {
/** 车辆承运商 **/
@TableField(exist = false)
private String isSaleDeliveryVoucherSource;
/** 销售合同编号 **/
@TableField(exist = false)
private String saleContractNo;
/** 销售额 **/
@TableField(exist = false)
private String saleAmount;
}

18
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/voucher/VoucherForm.java
Unescape View File

@ -136,7 +136,19 @@ public class VoucherForm {
/** 发货凭证 **/
@JsonProperty("isSaleDeliveryVoucherSource")
private Object isSaleDeliveryVoucherSource;
/** 合同号 **/
@JsonProperty("contractNo")
private String contractNo;
/** 采购合同号 **/
@JsonProperty("purchaseContractNo")
private String purchaseContractNo;
/** 是否被使用 **/
@JsonProperty("isUsed")
private String isUsed;
/** 销售合同号 **/
@JsonProperty("saleContractNo")
private String saleContractNo;
/** 采购额 **/
@JsonProperty("purchaseAmount")
private String purchaseAmount;
/** 销售额 **/
@JsonProperty("saleAmount")
private String saleAmount;
}

8
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/voucher/VoucherPagination.java
Unescape View File

@ -66,11 +66,15 @@ public class VoucherPagination extends Pagination {
@JsonProperty("voucherStatus")
private String voucherStatus;
@JsonProperty("contractNo")
private String contractNo;
/** 商品名称 */
@JsonProperty("productName")
private String productName;
@JsonProperty("voucherIdList")
private List<String> voucherIdList;
/** 采购合同号 */
@JsonProperty("purchaseContractNo")
private String purchaseContractNo;
/** 销售合同号 */
@JsonProperty("saleContractNo")
private String saleContractNo;
}

36
jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/form.vue
Unescape View File

@ -91,8 +91,33 @@
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('freight')">
<jnpf-form-tip-item label="合同编号" v-if="judgeShow('freight')" prop="contractNo">
<JnpfInput v-model="dataForm.contractNo" @change="changeData('freight', -1)"
<jnpf-form-tip-item label="采购合同编号" v-if="judgeShow('freight')"
prop="purchaseContractNo">
<JnpfInput v-model="dataForm.purchaseContractNo" @change="changeData('freight', -1)"
placeholder="请输入" :disabled="judgeWrite('freight')" clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('freight')">
<jnpf-form-tip-item label="销售合同编号" v-if="judgeShow('freight')" prop="saleContractNo">
<JnpfInput v-model="dataForm.saleContractNo" @change="changeData('freight', -1)"
placeholder="请输入" :disabled="judgeWrite('freight')" clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('freight')">
<jnpf-form-tip-item label="采购额" v-if="judgeShow('freight')" prop="purchaseAmount">
<JnpfInput v-model="dataForm.purchaseAmount" @change="changeData('freight', -1)"
placeholder="请输入" :disabled="judgeWrite('freight')" clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('freight')">
<jnpf-form-tip-item label="销售额" v-if="judgeShow('freight')" prop="saleAmount">
<JnpfInput v-model="dataForm.saleAmount" @change="changeData('freight', -1)"
placeholder="请输入" :disabled="judgeWrite('freight')" clearable
:style='{ "width": "100%" }'>
</JnpfInput>
@ -738,7 +763,10 @@ export default {
placeDispatch: [],
destination: [],
freight: undefined,
contractNo: undefined,
purchaseContractNo: undefined,
saleContractNo: undefined,
purchaseAmount: undefined,
saleAmount: undefined,
vehiclePictures: [],
vehiclePictures1: [],
vehiclePictures2: [],
@ -879,7 +907,7 @@ export default {
trigger: 'blur'
},
],
contractNo: [
purchaseContractNo: [
{
required: true,
message: '请输入',

16
jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/index.vue
Unescape View File

@ -9,8 +9,13 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="合同编号">
<el-input v-model="query.contractNo" placeholder="请输入" clearable> </el-input>
<el-form-item label="采购合同编号">
<el-input v-model="query.purchaseContractNo" placeholder="请输入" clearable> </el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="销售合同编号">
<el-input v-model="query.saleContractNo" placeholder="请输入" clearable> </el-input>
</el-form-item>
</el-col>
<el-col :span="6">
@ -149,7 +154,9 @@
</el-table-column>
<el-table-column prop="netWeight" label="净重" align="center" width="200">
</el-table-column>
<el-table-column prop="contractNo" label="合同编号" align="center" width="260">
<el-table-column prop="purchaseContractNo" label="采购合同编号" align="center" width="260">
</el-table-column>
<el-table-column prop="saleContractNo" label="销售合同编号" align="center" width="260">
</el-table-column>
<el-table-column prop="productName" label="商品名称" align="center" width="260">
</el-table-column>
@ -303,7 +310,8 @@ export default {
detailVisible: false,
query: {
voucherCode: undefined,
contractNo: undefined,
purchaseContractNo: undefined,
saleContractNo: undefined,
productName: undefined,
voucherType: undefined,
preparationTime: undefined,

Write Preview
Loading…
Cancel
Save