From 53877293e369c4c74a088eaa88408f78ff0093f6 Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Tue, 13 Aug 2024 10:05:53 +0800
Subject: [PATCH] =?UTF-8?q?[feat]=E9=94=80=E5=94=AE=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=E5=BC=80=E7=A5=A8=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E5=90=8E=E7=AB=AF=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=20=E4=BF=AE=E6=94=B9=E5=8F=91=E8=B5=B7=E5=BC=80?=
 =?UTF-8?q?=E7=A5=A8=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2=EF=BC=9A=E5=8F=91?=
 =?UTF-8?q?=E7=A5=A8=E7=A7=8D=E7=B1=BB=E3=80=81=E5=8F=91=E7=A5=A8=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E3=80=81=20=E5=8F=91=E7=A5=A8=E6=8A=AC=E5=A4=B4?=
 =?UTF-8?q?=E7=94=B1=E4=B8=8B=E6=8B=89=E6=A1=86=E6=94=B9=E6=88=90=E5=8D=95?=
 =?UTF-8?q?=E9=80=89=E6=A1=86=EF=BC=9B=E6=96=B0=E5=A2=9E=E5=BC=80=E7=A5=A8?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E7=9B=B8=E5=85=B3=E6=96=B0=E5=A2=9E=E7=9A=84?=
 =?UTF-8?q?table=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA=EF=BC=9B=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=20=E9=80=9A=E8=BF=87=E9=94=80=E5=94=AE=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=8F=B7=E6=9F=A5=E8=AF=A2=E5=BC=80=E7=A5=A8=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E7=9B=B8=E5=85=B3=E4=BF=A1=E6=81=AF=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?js=E6=96=B9=E6=B3=95=20=E4=BF=AE=E6=94=B9=E9=80=9A=E8=BF=87?=
 =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E5=8F=B7=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E5=AD=90=E8=A1=A8=E7=9A=84?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=90=8E=E7=AB=AF=E6=8E=A5=E5=8F=A3=EF=BC=9A?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B7=B2=E9=AA=8C=E6=94=B6=E6=95=B0=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/SysSalesOrderController.java   |  11 ++
 .../system/SysSalesOrderChildMapper.xml       |   2 +-
 .../system/salesOrder/makeInvoiceRMB.html     | 132 ++++++++++++++++--
 3 files changed, 135 insertions(+), 10 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesOrderController.java
index 3f816257..1324dad5 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesOrderController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesOrderController.java
@@ -618,5 +618,16 @@ public class SysSalesOrderController extends BaseController
         return toAjax(taxInvoiceService.makeInvoiceSave(financialTaxInvoice));
     }
 
+    /**
+     * 新增开票物料列表
+     */
 
+    @ResponseBody
+    @PostMapping("/getSalesOrderCodeChildListByCode")
+    public TableDataInfo getSalesOrderCodeChildListByCode(@RequestParam("salesOrderCode") String salesOrderCode)
+    {
+        startPage();
+        List<SysSalesOrderChild> list = sysSalesOrderChildService.selectOrderChildListBySalesOrderCode(salesOrderCode);
+        return getDataTable(list);
+    }
 }
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderChildMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderChildMapper.xml
index c79b1301..cc00d2ff 100644
--- a/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderChildMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderChildMapper.xml
@@ -93,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectOrderChildListBySalesOrderCode" resultMap="SysSalesOrderChildResult">
         select id, quoteId, materialId, materialCode, materialName, materialType, processMethod, brand,
-               warehouseDept,materialNum, photoUrl,finish_num,apply_shipping_num,has_apply_shipping_num,out_bound_quantity
+               warehouseDept,materialNum, photoUrl,finish_num,apply_shipping_num,has_apply_shipping_num, has_check_num, out_bound_quantity
         from sys_sales_order_child
         where quoteId = #{quoteId}
     </select>
diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/makeInvoiceRMB.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/makeInvoiceRMB.html
index b8007439..285141af 100644
--- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/makeInvoiceRMB.html
+++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/makeInvoiceRMB.html
@@ -92,29 +92,34 @@
     <div class="form-group">
       <label class="col-sm-3 control-label">发票种类：</label>
       <div class="col-sm-8">
-        <select name="taxInvoiceClass" class="form-control m-b" th:with="type=${@dict.getType('tax_invoice_class')}">
-          <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{taxInvoiceClass}"></option>
-        </select>
+        <div class="radio-box" th:each="dict : ${@dict.getType('tax_invoice_class')}">
+          <input type="radio" th:id="${'taxInvoiceClass_' + dict.dictCode}" name="taxInvoiceClass" th:value="${dict.dictValue}" th:field="*{taxInvoiceClass}">
+          <label th:for="${'taxInvoiceClass_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
+        </div>
       </div>
     </div>
 
     <div class="form-group">
       <label class="col-sm-3 control-label">发票类型：</label>
       <div class="col-sm-8">
-        <select name="taxInvoiceType" class="form-control m-b" th:with="type=${@dict.getType('tax_invoice_type')}">
-          <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{taxInvoiceType}"></option>
-        </select>
+        <div class="radio-box" th:each="dict : ${@dict.getType('tax_invoice_type')}">
+          <input type="radio" th:id="${'taxInvoiceType_' + dict.dictCode}" name="taxInvoiceType" th:value="${dict.dictValue}" th:field="*{taxInvoiceType}">
+          <label th:for="${'taxInvoiceType_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
+        </div>
       </div>
     </div>
 
+
     <div class="form-group">
       <label class="col-sm-3 control-label">发票抬头：</label>
       <div class="col-sm-8">
-        <select name="taxInvoiceTitle" class="form-control m-b" th:with="type=${@dict.getType('tax_invoice_title')}">
-          <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{taxInvoiceTitle}"></option>
-        </select>
+        <div class="radio-box" th:each="dict : ${@dict.getType('tax_invoice_title')}">
+          <input type="radio" th:id="${'taxInvoiceTitle_' + dict.dictCode}" name="taxInvoiceTitle" th:value="${dict.dictValue}" th:field="*{taxInvoiceTitle}">
+          <label th:for="${'taxInvoiceTitle_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
+        </div>
       </div>
     </div>
+
     <div class="form-group">
       <label class="col-sm-3 control-label">业务人员：</label>
       <div class="col-sm-8">
@@ -140,11 +145,27 @@
         <input name="businessRemark" th:field="*{businessRemark}" class="form-control" type="text">
       </div>
     </div>
+
+    <div class="container">
+      <div class="row">
+        <h4 class="font-weight-bold">开票物料</h4>
+      </div>
+      <div class="row">
+        <div class="col-sm-12 select-table table-striped">
+          <table id="bootstrap-table-material"></table>
+        </div>
+      </div>
+    </div>
+
   </form>
 </div>
 <th:block th:include="include :: footer" />
 <th:block th:include="include :: datetimepicker-js" />
 <script th:inline="javascript">
+
+  var materialProcessMethodDatas = [[${@dict.getType('processMethod')}]];
+  var materialTypeDatas = [[${@category.getChildByCode('materialType')}]];
+
   var prefix = ctx + "system/salesOrder"
   $("#form-taxInvoice-RMBAdd").validate({
     focusCleanup: true
@@ -161,6 +182,99 @@
     minView: "month",
     autoclose: true
   });
+
+
+
+  $(function() {
+    var options = {
+      id: 'bootstrap-table-material',
+      url: prefix + "/getSalesOrderCodeChildListByCode",
+      queryParams: function(params) {
+        return {
+          salesOrderCode: $("#salesOrderCode").val(),
+        }
+      },
+      showSearch: false,
+      showRefresh: false,
+      showToggle: false,
+      showColumns: false,
+      pagination: false, // 设置不分页
+      modalName: "国税发票物料",
+      columns: [{
+        checkbox: true
+      },
+        {
+          title: '国税发票物料ID',
+          field: 'invoiceMaterialId',
+          visible: false
+        },
+        {
+          title: '物料编号',
+          field: 'materialCode',
+        },
+        {
+          title: '物料名称',
+          field: 'materialName',
+        },
+        {
+          field: 'materialType',
+          title: '物料类型',
+          formatter: function(value, row, index) {
+            return $.table.selectCategoryLabel(materialTypeDatas, value);
+          }
+        },
+        {
+          title: '物料加工方式',
+          field: 'materialProcessMethod',
+          formatter: function(value, row, index) {
+            return $.table.selectDictLabel(materialProcessMethodDatas, value);
+          }
+        },
+        {
+          title: '物料品牌',
+          field: 'materialBrand',
+        },
+        {
+          title: '物料图片',
+          field: 'materialPhotourl',
+        },
+        {
+          title: '物料单位',
+          field: 'materialUnit',
+        },
+        {
+          title: '物料描述',
+          field: 'materialDescribe',
+        },
+        {
+          title: '物料的数量',
+          field: 'materialNum',
+        },
+        {
+          title: '物料的含税单价(RMB)',
+          field: 'taxRmb',
+        },
+        {
+          title: '物料的不含税单价(RMB)',
+          field: 'noTaxRmb',
+        },
+        {
+          title: '已出库数量',
+          field: 'outBoundQuantity',
+        },
+        {
+          title: '已验收数',
+          field: 'hasCheckNum',
+        },
+        {
+          title: '退货数',
+          field: 'refundsNum',
+        }]
+    };
+    $.table.init(options);
+  });
+
+
 </script>
 </body>
 </html>
\ No newline at end of file