weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wms费用科目bug修改;nc推送修改;

Browse Source
This commit is contained in:
王奎兴
2026-04-13 15:14:48 +08:00
parent 0a9e127d64
commit 5849be8e8f
7 changed files with 33 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/nc/SKitem.java
+2
View File
@@ -70,4 +70,6 @@ public class SKitem {
@ApiModelProperty( "") @ApiModelProperty( "")
private String def75; private String def75;
@ApiModelProperty( "费用科目")
private String def29;
} }
mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/nc/Ysitem.java
+2 -2
View File
@@ -83,8 +83,8 @@ public class Ysitem {
@ApiModelProperty( "") @ApiModelProperty( "")
private String def75; private String def75;
// @ApiModelProperty( "") @ApiModelProperty( "费用类型")
// private String def29; private String def29;
//税率id //税率id
private String taxcodeid; private String taxcodeid;
mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/contractManage/ContractManageApplicationService.java
+10 -10
View File
@@ -247,8 +247,8 @@ public class ContractManageApplicationService {
BigDecimal price = subjectAndPriceReturn.getPrice(); BigDecimal price = subjectAndPriceReturn.getPrice();
BigDecimal num = subjectAndPriceReturn.getNum(); BigDecimal num = subjectAndPriceReturn.getNum();
String chargingId = subjectAndPriceReturn.getChargingId(); String chargingId = subjectAndPriceReturn.getChargingId();
Integer isFee = subjectAndPriceReturn.getIsFee(); String isFee = subjectAndPriceReturn.getIsFee();
if (isFee != null && isFee == 1) { if (isFee != null && "1".equals(isFee)) {
billingFormula = billingFormula.replace(chargingId, price.toEngineeringString()); billingFormula = billingFormula.replace(chargingId, price.toEngineeringString());
} else { } else {
billingFormula = billingFormula.replace(chargingId, num.toEngineeringString()); billingFormula = billingFormula.replace(chargingId, num.toEngineeringString());
@@ -306,10 +306,10 @@ public class ContractManageApplicationService {
Map<String, Object> stringObjectMap1 = preSetRulesList.get(0); Map<String, Object> stringObjectMap1 = preSetRulesList.get(0);
for (Map<String, Object> stringObjectMap : billingParamsList) { for (Map<String, Object> stringObjectMap : billingParamsList) {
String fieldsName = (String) stringObjectMap.get("fieldsName"); String fieldsName = (String) stringObjectMap.get("fieldsName");
Integer isShow = (Integer) stringObjectMap.get("isShow"); String isShow = (String) stringObjectMap.get("isShow");
Integer isFee = (Integer) stringObjectMap.get("isFee"); String isFee = (String) stringObjectMap.get("isFee");
Integer isPush = (Integer) stringObjectMap.get("isPush"); String isPush = (String) stringObjectMap.get("isPush");
if (isFee==1) { if ("1".equals(isFee)) {
Integer sort = (Integer) stringObjectMap.get("sort"); Integer sort = (Integer) stringObjectMap.get("sort");
String chargingId = (String) stringObjectMap.get("chargingId"); String chargingId = (String) stringObjectMap.get("chargingId");
String fields = (String) stringObjectMap.get("fields"); String fields = (String) stringObjectMap.get("fields");
@@ -379,10 +379,10 @@ public class ContractManageApplicationService {
List<Map<String, Object>> billingParamsList = JSON.parseObject(billingParamsJson, new TypeReference<List<Map<String, Object>>>() {}); List<Map<String, Object>> billingParamsList = JSON.parseObject(billingParamsJson, new TypeReference<List<Map<String, Object>>>() {});
for (Map<String, Object> stringObjectMap : billingParamsList) { for (Map<String, Object> stringObjectMap : billingParamsList) {
String fieldsName = (String) stringObjectMap.get("fieldsName"); String fieldsName = (String) stringObjectMap.get("fieldsName");
Integer isShow = (Integer) stringObjectMap.get("isShow"); String isShow = (String) stringObjectMap.get("isShow");
Integer isFee = (Integer) stringObjectMap.get("isFee"); String isFee = (String) stringObjectMap.get("isFee");
Integer isPush = (Integer) stringObjectMap.get("isPush"); String isPush = (String) stringObjectMap.get("isPush");
if (isShow==1) { if ("1".equals(isShow)) {
String chargingId = (String) stringObjectMap.get("chargingId"); String chargingId = (String) stringObjectMap.get("chargingId");
String fields = (String) stringObjectMap.get("fields"); String fields = (String) stringObjectMap.get("fields");
SubjectAndPriceReturn subjectAndPriceReturn = new SubjectAndPriceReturn(); SubjectAndPriceReturn subjectAndPriceReturn = new SubjectAndPriceReturn();
mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/contractManage/SubjectAndPriceReturn.java
+3 -3
View File
@@ -13,9 +13,9 @@ public class SubjectAndPriceReturn {
private Long billingRulesId; private Long billingRulesId;
private String fields; private String fields;
private BigDecimal num; private BigDecimal num;
private Integer isShow; private String isShow;
private Integer isPush; private String isPush;
private Integer isFee; private String isFee;
private String subjectCode; private String subjectCode;
private String subjectName; private String subjectName;
private String serviceItemsCode; private String serviceItemsCode;
mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/persistence/BillManageImpl.java
+8
View File
@@ -276,6 +276,10 @@ public class BillManageImpl extends ServiceImpl<BillManageMapper, BillManage> im
} else { } else {
item.setDef75("T04"); item.setDef75("T04");
} }
String invoiceItem1 = item1.getInvoiceItem();
if (invoiceItem1 != null && !invoiceItem1.isEmpty()) {
item.setDef29(invoiceItem1);
}
item.setTaxcodeid("ZL01"); item.setTaxcodeid("ZL01");
item.setInvoiceno(invoiceNumber); item.setInvoiceno(invoiceNumber);
ysitemList.add(item); ysitemList.add(item);
@@ -558,6 +562,10 @@ public class BillManageImpl extends ServiceImpl<BillManageMapper, BillManage> im
} else { } else {
item.setDef75("T10"); item.setDef75("T10");
} }
String invoiceItem1 = make.getInvoiceItem();
if (invoiceItem1 != null && !invoiceItem1.isEmpty()) {
item.setDef29(invoiceItem1);
}
item.setPk_currtype(settlementCurrencyNcCode); item.setPk_currtype(settlementCurrencyNcCode);
item.setMoney_cr(String.valueOf(totalInvoiceValue)); item.setMoney_cr(String.valueOf(totalInvoiceValue));
item.setMoney_bal(String.valueOf(totalInvoiceValue)); item.setMoney_bal(String.valueOf(totalInvoiceValue));
mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java
+4
View File
@@ -1590,6 +1590,10 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
} else { } else {
item.setDef75("T10"); item.setDef75("T10");
} }
String invoiceItem1 = firstItem.getInvoiceItem();
if (invoiceItem1 != null && !invoiceItem1.isEmpty()) {
item.setDef29(invoiceItem1);
}
item.setPk_currtype(settlementCurrencyNcCode); item.setPk_currtype(settlementCurrencyNcCode);
item.setMoney_cr(String.valueOf(totalInvoiceValue)); item.setMoney_cr(String.valueOf(totalInvoiceValue));
item.setMoney_bal(String.valueOf(totalInvoiceValue)); item.setMoney_bal(String.valueOf(totalInvoiceValue));
mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java
+4 -4
View File
@@ -316,8 +316,8 @@ public class StockInOrderApplicationService {
List<Map<String, Object>> billingParamsList = JSON.parseObject(amountJson, new TypeReference<List<Map<String, Object>>>() {}); List<Map<String, Object>> billingParamsList = JSON.parseObject(amountJson, new TypeReference<List<Map<String, Object>>>() {});
com.alibaba.fastjson.JSONObject jsonObject = new com.alibaba.fastjson.JSONObject(); com.alibaba.fastjson.JSONObject jsonObject = new com.alibaba.fastjson.JSONObject();
for (Map<String, Object> stringObjectMap : billingParamsList) { for (Map<String, Object> stringObjectMap : billingParamsList) {
Integer isFee = (Integer) stringObjectMap.get("isFee"); String isFee = (String) stringObjectMap.get("isFee");
if (isFee==1) { if ("1".equals(isFee)) {
jsonObject.put((String) stringObjectMap.get("fields"), stringObjectMap.get("price")); jsonObject.put((String) stringObjectMap.get("fields"), stringObjectMap.get("price"));
} else { } else {
jsonObject.put((String) stringObjectMap.get("fields"), stringObjectMap.get("num")); jsonObject.put((String) stringObjectMap.get("fields"), stringObjectMap.get("num"));
@@ -380,8 +380,8 @@ public class StockInOrderApplicationService {
List<Map<String, Object>> billingParamsList = JSON.parseObject(amountJson, new TypeReference<List<Map<String, Object>>>() {}); List<Map<String, Object>> billingParamsList = JSON.parseObject(amountJson, new TypeReference<List<Map<String, Object>>>() {});
com.alibaba.fastjson.JSONObject jsonObject = new com.alibaba.fastjson.JSONObject(); com.alibaba.fastjson.JSONObject jsonObject = new com.alibaba.fastjson.JSONObject();
for (Map<String, Object> stringObjectMap : billingParamsList) { for (Map<String, Object> stringObjectMap : billingParamsList) {
Integer isFee = (Integer) stringObjectMap.get("isFee"); String isFee = (String) stringObjectMap.get("isFee");
if (isFee==1) { if ("1".equals(isFee)) {
jsonObject.put((String) stringObjectMap.get("fields"), stringObjectMap.get("price")); jsonObject.put((String) stringObjectMap.get("fields"), stringObjectMap.get("price"));
} else { } else {
jsonObject.put((String) stringObjectMap.get("fields"), stringObjectMap.get("num")); jsonObject.put((String) stringObjectMap.get("fields"), stringObjectMap.get("num"));