From 5849be8e8f0121b22996c2bfa0f8f6ddb2d66da2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Mon, 13 Apr 2026 15:14:48 +0800 Subject: [PATCH] =?UTF-8?q?wms=E8=B4=B9=E7=94=A8=E7=A7=91=E7=9B=AEbug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9;nc=E6=8E=A8=E9=80=81=E4=BF=AE=E6=94=B9;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mhd/common/core/domain/dto/nc/SKitem.java | 2 ++ .../mhd/common/core/domain/dto/nc/Ysitem.java | 4 ++-- .../ContractManageApplicationService.java | 20 +++++++++---------- .../contractManage/SubjectAndPriceReturn.java | 6 +++--- .../persistence/BillManageImpl.java | 8 ++++++++ .../persistence/ReconciliationImpl.java | 4 ++++ .../StockInOrderApplicationService.java | 8 ++++---- 7 files changed, 33 insertions(+), 19 deletions(-) diff --git a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/nc/SKitem.java b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/nc/SKitem.java index 9794a8474..a6b024cc4 100644 --- a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/nc/SKitem.java +++ b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/nc/SKitem.java @@ -70,4 +70,6 @@ public class SKitem { @ApiModelProperty( "") private String def75; + @ApiModelProperty( "费用科目") + private String def29; } \ No newline at end of file diff --git a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/nc/Ysitem.java b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/nc/Ysitem.java index fe7ef23b3..591674a1c 100644 --- a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/nc/Ysitem.java +++ b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/nc/Ysitem.java @@ -83,8 +83,8 @@ public class Ysitem { @ApiModelProperty( "") private String def75; -// @ApiModelProperty( "") -// private String def29; + @ApiModelProperty( "费用类型") + private String def29; //税率id private String taxcodeid; diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/contractManage/ContractManageApplicationService.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/contractManage/ContractManageApplicationService.java index 5afefe17d..f22d0d317 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/contractManage/ContractManageApplicationService.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/contractManage/ContractManageApplicationService.java @@ -247,8 +247,8 @@ public class ContractManageApplicationService { BigDecimal price = subjectAndPriceReturn.getPrice(); BigDecimal num = subjectAndPriceReturn.getNum(); String chargingId = subjectAndPriceReturn.getChargingId(); - Integer isFee = subjectAndPriceReturn.getIsFee(); - if (isFee != null && isFee == 1) { + String isFee = subjectAndPriceReturn.getIsFee(); + if (isFee != null && "1".equals(isFee)) { billingFormula = billingFormula.replace(chargingId, price.toEngineeringString()); } else { billingFormula = billingFormula.replace(chargingId, num.toEngineeringString()); @@ -306,10 +306,10 @@ public class ContractManageApplicationService { Map stringObjectMap1 = preSetRulesList.get(0); for (Map stringObjectMap : billingParamsList) { String fieldsName = (String) stringObjectMap.get("fieldsName"); - Integer isShow = (Integer) stringObjectMap.get("isShow"); - Integer isFee = (Integer) stringObjectMap.get("isFee"); - Integer isPush = (Integer) stringObjectMap.get("isPush"); - if (isFee==1) { + String isShow = (String) stringObjectMap.get("isShow"); + String isFee = (String) stringObjectMap.get("isFee"); + String isPush = (String) stringObjectMap.get("isPush"); + if ("1".equals(isFee)) { Integer sort = (Integer) stringObjectMap.get("sort"); String chargingId = (String) stringObjectMap.get("chargingId"); String fields = (String) stringObjectMap.get("fields"); @@ -379,10 +379,10 @@ public class ContractManageApplicationService { List> billingParamsList = JSON.parseObject(billingParamsJson, new TypeReference>>() {}); for (Map stringObjectMap : billingParamsList) { String fieldsName = (String) stringObjectMap.get("fieldsName"); - Integer isShow = (Integer) stringObjectMap.get("isShow"); - Integer isFee = (Integer) stringObjectMap.get("isFee"); - Integer isPush = (Integer) stringObjectMap.get("isPush"); - if (isShow==1) { + String isShow = (String) stringObjectMap.get("isShow"); + String isFee = (String) stringObjectMap.get("isFee"); + String isPush = (String) stringObjectMap.get("isPush"); + if ("1".equals(isShow)) { String chargingId = (String) stringObjectMap.get("chargingId"); String fields = (String) stringObjectMap.get("fields"); SubjectAndPriceReturn subjectAndPriceReturn = new SubjectAndPriceReturn(); diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/contractManage/SubjectAndPriceReturn.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/contractManage/SubjectAndPriceReturn.java index d223c12e9..6ba87605d 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/contractManage/SubjectAndPriceReturn.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/contractManage/SubjectAndPriceReturn.java @@ -13,9 +13,9 @@ public class SubjectAndPriceReturn { private Long billingRulesId; private String fields; private BigDecimal num; - private Integer isShow; - private Integer isPush; - private Integer isFee; + private String isShow; + private String isPush; + private String isFee; private String subjectCode; private String subjectName; private String serviceItemsCode; diff --git a/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/persistence/BillManageImpl.java b/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/persistence/BillManageImpl.java index 07727abc7..498af31cc 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/persistence/BillManageImpl.java +++ b/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/persistence/BillManageImpl.java @@ -276,6 +276,10 @@ public class BillManageImpl extends ServiceImpl im } else { item.setDef75("T04"); } + String invoiceItem1 = item1.getInvoiceItem(); + if (invoiceItem1 != null && !invoiceItem1.isEmpty()) { + item.setDef29(invoiceItem1); + } item.setTaxcodeid("ZL01"); item.setInvoiceno(invoiceNumber); ysitemList.add(item); @@ -558,6 +562,10 @@ public class BillManageImpl extends ServiceImpl im } else { item.setDef75("T10"); } + String invoiceItem1 = make.getInvoiceItem(); + if (invoiceItem1 != null && !invoiceItem1.isEmpty()) { + item.setDef29(invoiceItem1); + } item.setPk_currtype(settlementCurrencyNcCode); item.setMoney_cr(String.valueOf(totalInvoiceValue)); item.setMoney_bal(String.valueOf(totalInvoiceValue)); diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java b/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java index b0ca83ee4..752af61f7 100644 --- a/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java +++ b/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java @@ -1590,6 +1590,10 @@ public class ReconciliationImpl extends ServiceImpl> billingParamsList = JSON.parseObject(amountJson, new TypeReference>>() {}); com.alibaba.fastjson.JSONObject jsonObject = new com.alibaba.fastjson.JSONObject(); for (Map stringObjectMap : billingParamsList) { - Integer isFee = (Integer) stringObjectMap.get("isFee"); - if (isFee==1) { + String isFee = (String) stringObjectMap.get("isFee"); + if ("1".equals(isFee)) { jsonObject.put((String) stringObjectMap.get("fields"), stringObjectMap.get("price")); } else { jsonObject.put((String) stringObjectMap.get("fields"), stringObjectMap.get("num")); @@ -380,8 +380,8 @@ public class StockInOrderApplicationService { List> billingParamsList = JSON.parseObject(amountJson, new TypeReference>>() {}); com.alibaba.fastjson.JSONObject jsonObject = new com.alibaba.fastjson.JSONObject(); for (Map stringObjectMap : billingParamsList) { - Integer isFee = (Integer) stringObjectMap.get("isFee"); - if (isFee==1) { + String isFee = (String) stringObjectMap.get("isFee"); + if ("1".equals(isFee)) { jsonObject.put((String) stringObjectMap.get("fields"), stringObjectMap.get("price")); } else { jsonObject.put((String) stringObjectMap.get("fields"), stringObjectMap.get("num"));