bms2.0出账及发票修改;

2026-03-14 14:29:38 +08:00
parent 23ec38d4a3
commit 2870e6729f
30 changed files with 673 additions and 270 deletions
@@ -42,4 +42,6 @@ public interface ReconciliationMapper extends BaseMapper<Reconciliation>
    String getDocumentPreparerNcCode(@Param("salesmanId") String salesmanId);

    String getSettlementCurrencyNcCode(@Param("settlementCurrency") String settlementCurrency);
+
+    String getServiceItemsCodeNc(@Param("name") String name);
 }
@@ -721,6 +721,7 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
                                    }
                                }
                                String invoiceItemName = String.join(",", names);
+                                item.setDef29(invoiceItemName);
                                item.setScomment("业务部：应收"+appointShipper+invoiceItemName+invoiceNumber);
                                // item.setPk_currtype("CNY");
                                item.setPk_currtype(settlementCurrencyNcCode);
@@ -736,7 +737,14 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
                                item.setTax_de(String.valueOf(tax_de));
                                item.setPrice(String.valueOf(item1.getInvoiceValue()));
                                item.setTaxprice(String.valueOf(item1.getInvoiceValue()));
-                                item.setDef75("T10");
+                                //                                费用类别
+                                String feeType = item1.getFeeType();
+                                String serviceItemsCodeNc = reconciliationMapper.getServiceItemsCodeNc(feeType);
+                                if (serviceItemsCodeNc != null && !serviceItemsCodeNc.isEmpty()) {
+                                    item.setDef75(serviceItemsCodeNc);
+                                } else {
+                                    item.setDef75("T10");
+                                }
                                item.setTaxcodeid("ZL01");
                                item.setInvoiceno(invoiceNumber);
                                ysitemList.add(item);
@@ -380,4 +380,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
    <select id="getSettlementCurrencyNcCode" parameterType="java.lang.String" resultType="java.lang.String">
        SELECT NC_SYSTEM_CODE FROM NGWL_TEST_WLHY."TMS_SETTLEMENT_EXCHANGE_RATE" where IS_DELETE = '0' and ENGLISH_NAME = #{settlementCurrency} limit 1
    </select>
+
+    <select id="getServiceItemsCodeNc" parameterType="java.lang.String" resultType="java.lang.String">
+        SELECT SERVICE_ITEMS_CODE_NC FROM NGWL_TEST_SYSTEM."SERVICE_ITEMS_MANAGE" where DEL_FLAG = '0' and SERVICE_ITEMS_NAME = #{name} limit 1
+    </select>
 </mapper>