From 96f36fff2209027a0c4759d91080ed771cc31b7c Mon Sep 17 00:00:00 2001 From: "XI_TENG\\xixi_" <971623072> Date: Wed, 24 Jul 2024 17:27:13 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9D=9E=E9=95=BF=E5=8D=8F=E7=AE=A1=E6=8E=A7?= =?UTF-8?q?=EF=BC=8C=E7=BB=93=E7=AE=97=E5=8D=95=E9=87=8D=E9=87=8F=EF=BC=8C?= =?UTF-8?q?=E9=94=80=E5=94=AE=E6=98=BE=E7=A4=BA=E7=89=A9=E6=96=99=E7=BC=96?= =?UTF-8?q?=E7=A0=81=EF=BC=8C=E9=94=80=E5=94=AE=E6=9F=A5=E8=AF=A2=EF=BC=8C?= =?UTF-8?q?=E7=BB=93=E7=AE=97=E5=8D=95=E6=9D=A1=E4=BB=B6=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/scm/BusinessOrderMapper.xml | 17 +++++++++-- .../mapper/scm/CwaccountvoucherMapper.xml | 8 ++++++ .../java/jnpf/mapper/BusinessOrderMapper.java | 2 ++ .../jnpf/service/BusinessOrderService.java | 2 ++ .../impl/BusinessOrderServiceImpl.java | 20 +++++++++++++ .../controller/BusinessOrderController.java | 28 ++++++++++++++++--- .../jnpf/entity/CwaccountsummaryEntity.java | 3 ++ .../jnpf/entity/CwaccountvoucherEntity.java | 5 ++++ .../entity/CwsettlementsummaryEntity.java | 2 ++ .../BusinessOrderPagination.java | 4 +++ .../cwaccount/CwaccountsummaryModel.java | 3 ++ .../cwaccount/CwaccountvoucherModel.java | 3 ++ .../CwsettlementsummaryModel.java | 3 ++ .../src/views/extend/cwaccount/form.vue | 18 +++++++++++- .../src/views/extend/cwsettlement/form.vue | 18 +++++++++++- .../src/views/extend/cwsettlement/index.vue | 5 +++- .../scm/purchaseCenter/purchaseOrder/form.vue | 10 +++++++ .../views/scm/saleCenter/saleOrder/form.vue | 4 +-- .../views/scm/saleCenter/saleOrder/index.vue | 19 +++++++++++++ 19 files changed, 163 insertions(+), 11 deletions(-) diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderMapper.xml index f35fa15a..6e86ceab 100644 --- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderMapper.xml +++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderMapper.xml @@ -257,7 +257,8 @@ c.f_full_name AS enterpriseName, d.contract_name AS relatedContractName, e.name AS secondCustomName, - h.name AS businessName + h.name AS businessName, + a.contract_num AS contractNum FROM jg_contract a LEFT JOIN jg_subject_basic b ON a.subject = b.id @@ -288,7 +289,8 @@ d.contract_name AS relatedContractName, e.name AS secondSupplyName, f.name AS thirdSupplyName, - h.name AS businessName + h.name AS businessName, + a.contract_num AS contractNum FROM jg_contract a LEFT JOIN jg_subject_basic b ON a.subject = b.id @@ -1306,4 +1308,15 @@ f_delete_mark IS NULL AND business_order_id = #{id} + + + diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/CwaccountvoucherMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/CwaccountvoucherMapper.xml index 831ba78f..4031c0c8 100644 --- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/CwaccountvoucherMapper.xml +++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/CwaccountvoucherMapper.xml @@ -102,6 +102,7 @@ SELECT a.product_id productId, b.spec spec, + b.code code, a.inventory_unit_id inventoryUnitId, a.sales_main_unit_id purchaseUnitId, a.sales_main_unit_id settlementUnit, @@ -144,6 +145,7 @@ SELECT a.product_id productId, b.spec spec, + b.code code, a.inventory_unit_id inventoryUnitId, a.sales_main_unit_id purchaseUnitId, a.sales_main_unit_id settlementUnit, @@ -186,6 +188,7 @@ SELECT a.product_id productId, b.spec spec, + b.code code, a.inventory_unit_id inventoryUnitId, a.sales_main_unit_id purchaseUnitId, a.sales_main_unit_id settlementUnit, @@ -228,6 +231,7 @@ SELECT a.product_id productId, b.spec spec, + b.code code, a.inventory_unit_id inventoryUnitId, a.sales_main_unit_id purchaseUnitId, a.sales_main_unit_id settlementUnit, @@ -270,6 +274,7 @@ SELECT a.product_id productId, b.spec spec, + b.code code, a.inventory_unit_id inventoryUnitId, a.sales_main_unit_id purchaseUnitId, a.sales_main_unit_id settlementUnit, @@ -309,6 +314,7 @@ SELECT a.product_id productId, b.spec spec, + b.code code, a.inventory_unit_id inventoryUnitId, a.sales_main_unit_id purchaseUnitId, a.sales_main_unit_id settlementUnit, @@ -351,6 +357,7 @@ SELECT a.product_id productId, b.spec spec, + b.code code, a.inventory_unit_id inventoryUnitId, a.sales_main_unit_id purchaseUnitId, a.sales_main_unit_id settlementUnit, @@ -390,6 +397,7 @@ SELECT a.product_id productId, b.spec spec, + b.code code, a.inventory_unit_id inventoryUnitId, a.sales_main_unit_id purchaseUnitId, a.sales_main_unit_id settlementUnit, diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/BusinessOrderMapper.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/BusinessOrderMapper.java index 3c2ce820..dd5be31a 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/BusinessOrderMapper.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/BusinessOrderMapper.java @@ -84,4 +84,6 @@ public interface BusinessOrderMapper extends BaseMapper { //销售业务线带出合同信息 List queryBusinessContractSale(@Param("businessLine") String businessLine,@Param("organize") String organize,@Param("contractNumber") String contractNumber); + + BigDecimal queryBusinessContractSum(@Param("id") String id); } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/BusinessOrderService.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/BusinessOrderService.java index d528ed96..3ac4571e 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/BusinessOrderService.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/BusinessOrderService.java @@ -112,4 +112,6 @@ public interface BusinessOrderService extends IService { //根据业务线带出销售合同 List queryBusinessContractSaleInfo(String businessLine,String contractNumber); + + BigDecimal queryBusinessContractSum(String id); } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/BusinessOrderServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/BusinessOrderServiceImpl.java index e1082a5b..87bd1378 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/BusinessOrderServiceImpl.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/BusinessOrderServiceImpl.java @@ -318,6 +318,21 @@ public class BusinessOrderServiceImpl extends ServiceImpl> list, String templateFilePath,String settlements,BigDecimal amount) throws Exception { String[] strings = settlements.split("_"); settlements=strings[0]; diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessOrderController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessOrderController.java index d5794857..087a11b7 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessOrderController.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessOrderController.java @@ -1179,10 +1179,16 @@ public class BusinessOrderController { for (ContractLEntity entity : list){ List productByContractModelList = businessOrderService.queryProductByContractInfo(entity.getId()); if (entity.getIsLongAgreement().equals("1")){ //1是非长协 - QueryWrapper businessOrderEntityQueryWrapper = new QueryWrapper<>(); - businessOrderEntityQueryWrapper.lambda().eq(BusinessOrderEntity::getContractId,entity.getId()); - List businessOrderEntityList = businessOrderService.list(businessOrderEntityQueryWrapper); - if (businessOrderEntityList!=null && businessOrderEntityList.size()>0){ + BigDecimal planSum =businessOrderService.queryBusinessContractSum(entity.getId()); + if (entity.getContractNum()==null){ + entity.setContractNum(BigDecimal.ZERO); + } + if (planSum==null){ + planSum=BigDecimal.ZERO; + } + + int comparisonResult = planSum.compareTo(entity.getContractNum()); + if (comparisonResult!=-1){ entity.setIslang("1"); } } @@ -1207,6 +1213,20 @@ public class BusinessOrderController { List list= businessOrderService.queryPurchaseContractInfo(businessLineId); for (ContractLEntity entity : list){ List productByContractModelList = businessOrderService.queryProductByContractInfo(entity.getId()); + if (entity.getIsLongAgreement().equals("1")){ //1是非长协 + BigDecimal planSum =businessOrderService.queryBusinessContractSum(entity.getId()); + if (entity.getContractNum()==null){ + entity.setContractNum(BigDecimal.ZERO); + } + if (planSum==null){ + planSum=BigDecimal.ZERO; + } + + int comparisonResult = planSum.compareTo(entity.getContractNum()); + if (comparisonResult!=-1){ + entity.setIslang("1"); + } + } entity.setProductByContractModelList(productByContractModelList); QueryWrapper subjectQueryWrapper = new QueryWrapper<>(); subjectQueryWrapper.lambda().eq(SubjectbasicEntity::getId,entity.getSubject()); diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/CwaccountsummaryEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/CwaccountsummaryEntity.java index 7d9d3977..a37b9d17 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/CwaccountsummaryEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/CwaccountsummaryEntity.java @@ -83,6 +83,9 @@ public class CwaccountsummaryEntity { @TableField("ORGANIZE_JSON_ID") private String organizeJsonId; + @TableField(value = "CODE" , updateStrategy = FieldStrategy.IGNORED) + private String code; + @TableField("ord_ln") private String ordLn; @TableField("business_code") diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/CwaccountvoucherEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/CwaccountvoucherEntity.java index cc35ec8b..88d06ef2 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/CwaccountvoucherEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/CwaccountvoucherEntity.java @@ -60,6 +60,8 @@ public class CwaccountvoucherEntity { private String productName; @TableField(value = "SPEC" , updateStrategy = FieldStrategy.IGNORED) private String spec; + + @TableField(value = "UNIT" , updateStrategy = FieldStrategy.IGNORED) private String unit; @TableField(value = "GROSS_WEIGHT" , updateStrategy = FieldStrategy.IGNORED) @@ -153,4 +155,7 @@ public class CwaccountvoucherEntity { @TableField(exist = false) private BigDecimal storageNumber; + @TableField(exist = false) + private String code; + } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/CwsettlementsummaryEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/CwsettlementsummaryEntity.java index 85ad5cb1..3717a3fd 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/CwsettlementsummaryEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/CwsettlementsummaryEntity.java @@ -30,6 +30,8 @@ public class CwsettlementsummaryEntity { private String productId; @TableField(value = "SPEC" , updateStrategy = FieldStrategy.IGNORED) private String spec; + @TableField(value = "CODE" , updateStrategy = FieldStrategy.IGNORED) + private String code; @TableField(value = "RATE" , updateStrategy = FieldStrategy.IGNORED) private String rate; @TableField(value = "SETTLEMENT_UNIT" , updateStrategy = FieldStrategy.IGNORED) diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/businessorder/BusinessOrderPagination.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/businessorder/BusinessOrderPagination.java index fd63c9ef..f7d160cd 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/businessorder/BusinessOrderPagination.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/businessorder/BusinessOrderPagination.java @@ -87,5 +87,9 @@ public class BusinessOrderPagination extends Pagination { @JsonProperty("contractNumber") private String contractNumber; + /** 合同编码 */ + @JsonProperty("customer") + private String customer; + } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/cwaccount/CwaccountsummaryModel.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/cwaccount/CwaccountsummaryModel.java index 43d525eb..9c7d4848 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/cwaccount/CwaccountsummaryModel.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/cwaccount/CwaccountsummaryModel.java @@ -25,6 +25,9 @@ public class CwaccountsummaryModel { /** 规格 **/ @JSONField(name = "spec") private String spec; + /** 编码 **/ + @JSONField(name = "code") + private String code; /** 库存单位 **/ @JSONField(name = "inventoryUnitId") private String inventoryUnitId; diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/cwaccount/CwaccountvoucherModel.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/cwaccount/CwaccountvoucherModel.java index ad179ec3..8cb810f5 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/cwaccount/CwaccountvoucherModel.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/cwaccount/CwaccountvoucherModel.java @@ -55,6 +55,9 @@ public class CwaccountvoucherModel { /** 规格 **/ @JSONField(name = "spec") private String spec; + /** 编码 **/ + @JSONField(name = "code") + private String code; /** 单位 **/ @JSONField(name = "unit") private String unit; diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/cwsettlement/CwsettlementsummaryModel.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/cwsettlement/CwsettlementsummaryModel.java index 9e735fb1..9e2bc1bb 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/cwsettlement/CwsettlementsummaryModel.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/cwsettlement/CwsettlementsummaryModel.java @@ -25,6 +25,9 @@ public class CwsettlementsummaryModel { /** 规格 **/ @JSONField(name = "spec") private String spec; + /** 编码 **/ + @JSONField(name = "code") + private String code; /** 结算单位 **/ @JSONField(name = "settlementUnit") private String settlementUnit; diff --git a/jnpf-java-boot/jnpf-web/src/views/extend/cwaccount/form.vue b/jnpf-java-boot/jnpf-web/src/views/extend/cwaccount/form.vue index 996800ef..01664c42 100644 --- a/jnpf-java-boot/jnpf-web/src/views/extend/cwaccount/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/extend/cwaccount/form.vue @@ -948,6 +948,21 @@ + + + + + + + + + + + +