diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/VoucherMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/VoucherMapper.xml index 23c6e2d7..6c18c732 100644 --- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/VoucherMapper.xml +++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/VoucherMapper.xml @@ -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 diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/VoucherServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/VoucherServiceImpl.java index f46009bd..6b35cfb3 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/VoucherServiceImpl.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/VoucherServiceImpl.java @@ -262,9 +262,14 @@ public class VoucherServiceImpl extends ServiceImpl 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 contractLQueryWrapper=new QueryWrapper<>(); - contractLQueryWrapper.lambda().eq(ContractLEntity::getContractNumber, voucherEntity.getContractNo()); + contractLQueryWrapper.lambda().eq(ContractLEntity::getContractNumber, voucherEntity.getPurchaseContractNo()); List contractLEntityList = contractLService.list(contractLQueryWrapper); if(contractLEntityList != null && contractLEntityList.size() > 0){ voucherEntity.setModeTransport(contractLEntityList.get(0).getModeTransport());//运输方式 diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/VoucherController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/VoucherController.java index a840d170..181af174 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/VoucherController.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/VoucherController.java @@ -228,13 +228,13 @@ public class VoucherController { organize = organize.replace("[",""); organize = organize.replace("]",""); QueryWrapper 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{ diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/VoucherEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/VoucherEntity.java index 4d36e1a4..95d82f00 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/VoucherEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/VoucherEntity.java @@ -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) diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/VoucherProductEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/VoucherProductEntity.java index e69811f9..2d4e4315 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/VoucherProductEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/VoucherProductEntity.java @@ -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; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/voucher/VoucherForm.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/voucher/VoucherForm.java index ec3d7d0e..f8ce12a5 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/voucher/VoucherForm.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/voucher/VoucherForm.java @@ -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; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/voucher/VoucherPagination.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/voucher/VoucherPagination.java index d296287b..505e72f5 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/voucher/VoucherPagination.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/voucher/VoucherPagination.java @@ -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 voucherIdList; + /** 采购合同号 */ + @JsonProperty("purchaseContractNo") + private String purchaseContractNo; + /** 销售合同号 */ + @JsonProperty("saleContractNo") + private String saleContractNo; } diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/form.vue index a35d2764..e29e7fba 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/form.vue @@ -91,8 +91,33 @@ - - + + + + + + + + + + + + + + + + + + + @@ -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: '请输入', diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/index.vue index 825e30be..1c97afd0 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/index.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/index.vue @@ -9,8 +9,13 @@ - - + + + + + + + @@ -149,7 +154,9 @@ - + + + @@ -303,7 +310,8 @@ export default { detailVisible: false, query: { voucherCode: undefined, - contractNo: undefined, + purchaseContractNo: undefined, + saleContractNo: undefined, productName: undefined, voucherType: undefined, preparationTime: undefined,