From 89d1ba1ca655e2c84027a2fb26d362153cc320ca Mon Sep 17 00:00:00 2001 From: zhangsiqi <2825463979@qq.com> Date: Mon, 5 Aug 2024 20:20:05 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[feat]=E5=AE=A2=E6=88=B7=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A0=B9=E6=8D=AE=E5=AE=A1=E6=A0=B8=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E6=8E=92=E5=BA=8F=EF=BC=8C=E9=94=80=E5=94=AE=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E6=96=B0=E5=A2=9E=E6=A0=B9=E6=8D=AE=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=8E=92=E5=BA=8F=EF=BC=8C=E4=BE=9B=E5=BA=94?= =?UTF-8?q?=E5=95=86=E8=B5=84=E6=96=99=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A0=B9=E6=8D=AE=E5=AE=A1=E6=A0=B8=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E6=8E=92=E5=BA=8F=EF=BC=8C=E9=87=87=E8=B4=AD=E6=8A=A5?= =?UTF-8?q?=E4=BB=B7=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=AE=A1=E6=A0=B8=E7=8A=B6=E6=80=81=E6=8E=92?= =?UTF-8?q?=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/purchase/PurchasePlanChildMapper.xml | 1 + .../src/main/resources/mapper/purchase/PurchaseQuoteMapper.xml | 2 +- .../src/main/resources/mapper/system/SysCustomerMapper.xml | 2 +- .../src/main/resources/mapper/system/SysSalesOrderMapper.xml | 2 +- .../src/main/resources/mapper/system/SysSupplierMapper.xml | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ruoyi-admin/src/main/resources/mapper/purchase/PurchasePlanChildMapper.xml b/ruoyi-admin/src/main/resources/mapper/purchase/PurchasePlanChildMapper.xml index b0da17cb..b5566728 100644 --- a/ruoyi-admin/src/main/resources/mapper/purchase/PurchasePlanChildMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/purchase/PurchasePlanChildMapper.xml @@ -58,6 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and use_status = #{useStatus} and audit_status = #{auditStatus} + order by create_time desc + + + and ctc_id = #{ctcId} + and year = #{year} + and month = #{month} + and create_time between #{params.beginCreateTime} and #{params.endCreateTime} + + + + + + + insert into financial_company_cost + + id, + ctc_id, + year, + month, + operating_costs, + salary_expenses, + factory_rental_fees, + tax_expenses, + factory_electricity_fees, + ohter_expenses, + business_cost, + transportation_costs, + promotion_expenses, + packaging_cost, + business_expenses, + after_sales_expenses, + business_commission, + create_time, + create_by, + update_time, + update_by, + remark, + + + #{id}, + #{ctcId}, + #{year}, + #{month}, + #{operatingCosts}, + #{salaryExpenses}, + #{factoryRentalFees}, + #{taxExpenses}, + #{factoryElectricityFees}, + #{ohterExpenses}, + #{businessCost}, + #{transportationCosts}, + #{promotionExpenses}, + #{packagingCost}, + #{businessExpenses}, + #{afterSalesExpenses}, + #{businessCommission}, + #{createTime}, + #{createBy}, + #{updateTime}, + #{updateBy}, + #{remark}, + + + + + update financial_company_cost + + ctc_id = #{ctcId}, + year = #{year}, + month = #{month}, + operating_costs = #{operatingCosts}, + salary_expenses = #{salaryExpenses}, + factory_rental_fees = #{factoryRentalFees}, + tax_expenses = #{taxExpenses}, + factory_electricity_fees = #{factoryElectricityFees}, + ohter_expenses = #{ohterExpenses}, + business_cost = #{businessCost}, + transportation_costs = #{transportationCosts}, + promotion_expenses = #{promotionExpenses}, + packaging_cost = #{packagingCost}, + business_expenses = #{businessExpenses}, + after_sales_expenses = #{afterSalesExpenses}, + business_commission = #{businessCommission}, + create_time = #{createTime}, + create_by = #{createBy}, + update_time = #{updateTime}, + update_by = #{updateBy}, + remark = #{remark}, + + where id = #{id} + + + + delete from financial_company_cost where id = #{id} + + + delete from financial_company_cost where id in + + #{id} + + + + delete from financial_company_cost where ctc_id = #{ctcId} + + + delete from financial_company_cost where ctc_id in + + #{ctcId} + + + + update financial_company_cost set del_flag = '1' where id = #{id} + + + + update financial_company_cost set del_flag = '0' where id = #{id} + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/taxInvoice/ErpCompanyCostMapper.xml b/ruoyi-admin/src/main/resources/mapper/taxInvoice/ErpCompanyCostMapper.xml deleted file mode 100644 index dfa3128b..00000000 --- a/ruoyi-admin/src/main/resources/mapper/taxInvoice/ErpCompanyCostMapper.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - - - - - - - - - - - select id, ctc_id, year, month, opex, cob, create_by, create_time, update_time, update_by, remark from erp_company_cost - - - - - - - - insert into erp_company_cost - - id, - ctc_id, - year, - month, - opex, - cob, - create_by, - create_time, - update_time, - update_by, - remark, - - - #{id}, - #{ctcId}, - #{year}, - #{month}, - #{opex}, - #{cob}, - #{createBy}, - #{createTime}, - #{updateTime}, - #{updateBy}, - #{remark}, - - - - - update erp_company_cost - - ctc_id = #{ctcId}, - year = #{year}, - month = #{month}, - opex = #{opex}, - cob = #{cob}, - create_by = #{createBy}, - create_time = #{createTime}, - update_time = #{updateTime}, - update_by = #{updateBy}, - remark = #{remark}, - - where id = #{id} - - - - delete from erp_company_cost where id = #{id} - - - - delete from erp_company_cost where id in - - #{id} - - - - - update erp_company_cost set del_flag = '1' where id = #{id} - - - - update erp_company_cost set del_flag = '0' where id = #{id} - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/financial/compantFixedAssets/add.html b/ruoyi-admin/src/main/resources/templates/financial/compantFixedAssets/add.html index 81fe1b13..a7695515 100644 --- a/ruoyi-admin/src/main/resources/templates/financial/compantFixedAssets/add.html +++ b/ruoyi-admin/src/main/resources/templates/financial/compantFixedAssets/add.html @@ -19,9 +19,8 @@
- + +
@@ -129,7 +128,10 @@
- +
+ + % +
@@ -192,42 +194,12 @@ // minimumInputLength: 1 } }); - $("#compant_materialName").select2({ - theme: "bootstrap", - allowClear: true, - placeholder: "请选择物料", - ajax:{ - type: "post", - url:ctx + "erp/material/getMaterialSelList", - dataType:"json", - delay:250, - cache:true, - processResults: function (res, params) { - var resultList = res.data; - var options = []; - for(let i in resultList){ - var option = resultList[i]; - option.id = resultList[i]["materialName"]; - option.text = resultList[i]["materialName"]; - option.title = resultList[i]["materialNo"]; - options.push(option); - } - return {results: options, pagination: {}}; - },escapeMarkup: function (markup) { return markup; }, - } - }); }); $("#compant_materialCode").on('select2:select', function (e){ var dataObj = e.params.data; console.log(dataObj); - $("#compant_materialName").val(dataObj.materialName).trigger('change'); - }); - - $("#compant_materialName").on('select2:select', function (e){ - var dataObj = e.params.data; - console.log(dataObj); - $("#compant_materialCode").val(dataObj.materialNo).trigger('change'); + $("input[name='materialName']").val(dataObj.materialName).trigger('change'); }); function submitHandler() { if ($.validate.form()) { diff --git a/ruoyi-admin/src/main/resources/templates/financial/companyCost/add.html b/ruoyi-admin/src/main/resources/templates/financial/companyCost/add.html new file mode 100644 index 00000000..6cb2e2ee --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/financial/companyCost/add.html @@ -0,0 +1,127 @@ + + + + + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/financial/companyCost/compantCost.html b/ruoyi-admin/src/main/resources/templates/financial/companyCost/compantCost.html new file mode 100644 index 00000000..a2d1bc8d --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/financial/companyCost/compantCost.html @@ -0,0 +1,117 @@ + + + + + + +
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + + - + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ +
+ + 添加 + + + + + + + + + + +
+
+
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/financial/companyCost/edit.html b/ruoyi-admin/src/main/resources/templates/financial/companyCost/edit.html new file mode 100644 index 00000000..cd5bcf8d --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/financial/companyCost/edit.html @@ -0,0 +1,128 @@ + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/taxInvoice/companyCost/add.html b/ruoyi-admin/src/main/resources/templates/taxInvoice/companyCost/add.html deleted file mode 100644 index a5b55ed6..00000000 --- a/ruoyi-admin/src/main/resources/templates/taxInvoice/companyCost/add.html +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
-
- - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/taxInvoice/companyCost/companyCost.html b/ruoyi-admin/src/main/resources/templates/taxInvoice/companyCost/companyCost.html deleted file mode 100644 index 9c5d1e1b..00000000 --- a/ruoyi-admin/src/main/resources/templates/taxInvoice/companyCost/companyCost.html +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - -
-
-
-
-
-
    -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - - - - -
    • -
  • -  搜索 -  重置 -
    • -
-
-
-
- - -
-
-
-
-
- - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/taxInvoice/companyCost/edit.html b/ruoyi-admin/src/main/resources/templates/taxInvoice/companyCost/edit.html deleted file mode 100644 index 624cc2b8..00000000 --- a/ruoyi-admin/src/main/resources/templates/taxInvoice/companyCost/edit.html +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - -
-
- -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
-
- - - - \ No newline at end of file