材料费 级联

src/main/java/com/liang/entity/StaMaterial.java

@@ -31,6 +31,16 @@ public class StaMaterial implements Serializable {
 
     private String xh;
 
+    // 数量
+    private  String sll;
+
+    public String getSll() {
+        return sll;
+    }
+
+    public void setSll(String sll) {
+        this.sll = sll;
+    }
 
     public String getXh() {
         return xh;

src/main/resources/mapper/StaMaterialDao.xml

@@ -107,11 +107,11 @@
     </insert>
 
     <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
-        insert into sta_Material(ZB, FYSQ, CLMC, WLBM, CGDJ, BHSJE, HSJE, BZ,SQJE,SL,XH)
+        insert into sta_Material(ZB, FYSQ, CLMC, WLBM, CGDJ, BHSJE, HSJE, BZ,SQJE,SL,XH,SLL)
         values
         <foreach collection="entities" item="entity" separator=",">
             (#{entity.zb}, #{entity.fysq}, #{entity.clmc}, #{entity.wlbm}, #{entity.cgdj}, #{entity.bhsje},
-            #{entity.hsje}, #{entity.bz},#{entity.sqje},#{entity.sl},#{entity.xh})
+            #{entity.hsje}, #{entity.bz},#{entity.sqje},#{entity.sl},#{entity.xh},#{entity.sll})
         </foreach>
     </insert>
 
@@ -161,6 +161,9 @@
             <if test="bz != null and bz != ''">
                 BZ = #{bz},
             </if>
+            <if test="sll != null and sll != ''">
+                SLL = #{sll}
+            </if>
         </set>
         where ID = #{id}
     </update>
@@ -212,6 +215,7 @@
         m.CGDJ,
         m.BHSJE,
         m.HSJE,
+        m.SLL,
         CASE
         WHEN b.SFBYJ = 0 THEN '否'
         WHEN b.SFBYJ = 1 THEN '是'

src/main/resources/mapper/StaSourceFeeDao.xml

@@ -250,7 +250,7 @@
         base_ProjectType ON sta_BudgetApproval.XMLX = base_ProjectType.XMLX
         INNER JOIN
         base_Person ON sta_BudgetApproval.XMFZR = base_Person.ID
-        INNER JOIN
+        LEFT JOIN
         sta_Reimbursement ON sta_BudgetApproval.ID = sta_Reimbursement.FYSQ
         where
         sta_BudgetApproval.SPZT != '作废'

src/main/resources/templates/stabudgetapproval/update_apply.html

@@ -2767,6 +2767,7 @@
                     {field: 'hsje', title: '含税金额（元））', width: '13%'},
                     {field: 'sqje', title: '申请金额', width: '15%'},
                     {field: 'sl',title: '税率',width: '10%'},
+                    {field: 'sll',title: '数量',width: '10%'},
                     {field: 'bz', title: '备注', width: '15%'}
                 ]
             ],
@@ -2825,7 +2826,8 @@
                     "hsje": data[0].hsje,
                     "sl": data[0].sl,
                     "bz":data[0].bz,
-                    "wlbm":data[0].wlbm
+                    "wlbm":data[0].wlbm,
+                    "sll": data[0].sll,
                 };
                 layer.open({
                     title: '编辑材料费',
@@ -2878,7 +2880,8 @@
                     "hsje": data[0].hsje,
                     "sl": data[0].sl,
                     "bz":data[0].bz,
-                    "wlbm":data[0].wlbm
+                    "wlbm":data[0].wlbm,
+                    "sll": data[0].sll,
                 };
                 layer.open({
                     title: '浏览材料费',
@@ -3791,7 +3794,8 @@
                                         "cgdj": item.cgdj,
                                         "bhsje": item.bhsje,
                                         "hsje": item.hsje,
-                                        "bz": item.bz
+                                        "bz": item.bz,
+                                        "sll":item.sll
                                     };
                                     matCosts.push(cost);
                                 }

src/main/resources/templates/stamaterial/add.html

@@ -29,6 +29,12 @@
                 <input type="text" id="wlbm" name="wlbm" lay-verify="required" lay-reqtext="物料编码不能为空"
                        class="layui-input">
             </div>
+        </div>
+        <div class="layui-form-item layui-inline" style="width: 100%">
+            <label class="layui-form-label required" style="width: 70px">税率</label>
+            <div class="layui-input-inline" style="width: 640px">
+                <input type="text" id="sl" name="sl" class="layui-input" min="0" lay-verify="requird" lay-reqtext="税率不能为空" autocomplete="off">
+            </div>
         </div>
                 <div class="layui-form-item layui-inline" style="width: 100%">
                     <label class="layui-form-label required" style="width: 70px">序号</label>
@@ -41,32 +47,33 @@
                     </div>
                 </div>
         <div class="layui-form-item layui-inline" style="width: 100%">
+            <label class="layui-form-label required" style="width: 70px">含税金额</label>
+            <div class="layui-input-inline" style="width: 265px">
+                <input type="number" id="hsje" name="hsje" min="0" lay-verify="required" lay-reqtext="含税金额不能为空"
+                       autocomplete="off" class="layui-input" oninput="calculateBhsje()">
+            </div>
+            <label class="layui-form-label required" style="width: 70px">不含税金额</label>
+            <div class="layui-input-inline" style="width: 265px">
+                <input type="number" id="bhsje" name="bhsje" class="layui-input" min = "0"
+                       lay-verify="required" lay-reqtext="不含税金额不能为空" autocomplete="off" oninput="calculateHsje()">
+            </div>
+        </div>
+        <div class="layui-form-item layui-inline" style="width: 100%">
+
             <label class="layui-form-label required" style="width: 70px">单价(万元)</label>
             <div class="layui-input-inline" style="width: 265px">
                 <input type="number" id="cgdj" name="cgdj" min="0" lay-verify="required" lay-reqtext="单价不能为空"
                        autocomplete="off" class="layui-input">
             </div>
-                        <label class="layui-form-label required" style="width: 70px">不含税金额</label>
-                        <div class="layui-input-inline" style="width: 265px">
-                            <input type="number" id="bhsje" name="bhsje" class="layui-input" min = "0" lay-verify="required" lay-reqtext="不含税金额不能为空" autocomplete="off">
-                        </div>
-        </div>
-                <div class="layui-form-item layui-inline" style="width: 100%">
-                    <label class="layui-form-label required" style="width: 70px">含税金额</label>
-                    <div class="layui-input-inline" style="width: 640px">
-                        <input type="number" id="hsje" name="hsje" class="layui-input" min="0" lay-verify="requird" lay-reqtext="含税金额不能为空" autocomplete="off">
-                    </div>
-                </div>
-        <div class="layui-form-item layui-inline" style="width: 100%">
-            <label class="layui-form-label required" style="width: 70px">税率</label>
-            <div class="layui-input-inline" style="width: 640px">
-                <input type="text" id="sl" name="sl" class="layui-input" min="0" lay-verify="requird" lay-reqtext="税率不能为空" autocomplete="off">
+            <label class="layui-form-label required" style="width: 70px">数量</label>
+            <div class="layui-input-inline" style="width: 265px">
+                <input type="number" id="sll" name="sll" class="layui-input" min = "0" lay-verify="required" lay-reqtext="数量不能为空" autocomplete="off">
             </div>
         </div>
         <div class="layui-form-item layui-inline" style="width: 100%">
             <label class="layui-form-label" style="width: 70px">备注</label>
             <div class="layui-input-inline" style="width: 640px">
-                <textarea id="bz" name="bz" class="layui-textarea" style="width: 100%;height: 300px"></textarea>
+                <textarea id="bz" name="bz" class="layui-textarea" style="width: 100%;height: 200px"></textarea>
             </div>
         </div>
         <!-- 右侧悬浮按钮 -->
@@ -80,6 +87,32 @@
         </div>
     </div>
 </form>
+<script>
+    function calculateBhsje() {
+        var hsje = parseFloat(document.getElementById('hsje').value);
+        var sl = parseFloat(document.getElementById('sl').value);
+
+        if (isNaN(hsje) || isNaN(sl) || sl < 0) {
+            document.getElementById('bhsje').value = '';
+        } else {
+            var bhsje = hsje / (1 + sl / 100); // 如果需要，将税率转换为小数形式
+            document.getElementById('bhsje').value = bhsje.toFixed(2); // 根据需要调整小数位数
+        }
+    }
+
+    function calculateHsje() {
+        var bhsje = parseFloat(document.getElementById('bhsje').value);
+        var sl = parseFloat(document.getElementById('sl').value);
+
+        if (isNaN(bhsje) || isNaN(sl) || sl < 0) {
+            document.getElementById('hsje').value = '';
+        } else {
+            var hsje = bhsje * (1 + sl / 100); // 如果需要，将税率转换为小数形式
+            document.getElementById('hsje').value = hsje.toFixed(2); // 根据需要调整小数位数
+        }
+    }
+</script>
+
 
 <script th:src="@{/lib/jquery-3.4.1/jquery-3.4.1.min.js}" charset="utf-8"></script>
 <script th:src="@{/lib/layui/layui.js}" charset="utf-8"></script>
@@ -104,6 +137,7 @@
             var iframeIndex = parent.layer.getFrameIndex(window.name);
             parent.layer.close(iframeIndex);
         });
+
     });
 </script>
 </body>

src/main/resources/templates/stamaterial/update.html

@@ -30,6 +30,12 @@
                        class="layui-input">
             </div>
         </div>
+        <div class="layui-form-item layui-inline" style="width: 100%">
+            <label class="layui-form-label required" style="width: 70px">税率</label>
+            <div class="layui-input-inline" style="width: 640px">
+                <input type="text" id="sl" name="sl" class="layui-input" min="0" lay-verify="requird" lay-reqtext="税率不能为空" autocomplete="off">
+            </div>
+        </div>
         <div class="layui-form-item layui-inline" style="width: 100%">
             <label class="layui-form-label required" style="width: 70px">序号</label>
             <div class="layui-input-inline" style="width: 265px">
@@ -41,32 +47,33 @@
             </div>
         </div>
         <div class="layui-form-item layui-inline" style="width: 100%">
-            <label class="layui-form-label required" style="width: 70px">单价(万元)</label>
+            <label class="layui-form-label required" style="width: 70px">含税金额</label>
             <div class="layui-input-inline" style="width: 265px">
-                <input type="number" id="cgdj" name="cgdj" min="0" lay-verify="required" lay-reqtext="单价不能为空"
-                       autocomplete="off" class="layui-input">
+                <input type="number" id="hsje" name="hsje" min="0" lay-verify="required" lay-reqtext="含税金额不能为空"
+                       autocomplete="off" class="layui-input" oninput="calculateBhsje()">
             </div>
             <label class="layui-form-label required" style="width: 70px">不含税金额</label>
             <div class="layui-input-inline" style="width: 265px">
-                <input type="number" id="bhsje" name="bhsje" class="layui-input" min = "0" lay-verify="required" lay-reqtext="不含税金额不能为空" autocomplete="off">
+                <input type="number" id="bhsje" name="bhsje" class="layui-input" min = "0"
+                       lay-verify="required" lay-reqtext="不含税金额不能为空" autocomplete="off" oninput="calculateHsje()">
             </div>
         </div>
         <div class="layui-form-item layui-inline" style="width: 100%">
-            <label class="layui-form-label required" style="width: 70px">含税金额</label>
-            <div class="layui-input-inline" style="width: 640px">
-                <input type="number" id="hsje" name="hsje" class="layui-input" min="0" lay-verify="requird" lay-reqtext="含税金额不能为空" autocomplete="off">
+
+            <label class="layui-form-label required" style="width: 70px">单价(万元)</label>
+            <div class="layui-input-inline" style="width: 265px">
+                <input type="number" id="cgdj" name="cgdj" min="0" lay-verify="required" lay-reqtext="单价不能为空"
+                       autocomplete="off" class="layui-input">
             </div>
-        </div>
-        <div class="layui-form-item layui-inline" style="width: 100%">
-            <label class="layui-form-label required" style="width: 70px">税率</label>
-            <div class="layui-input-inline" style="width: 640px">
-                <input type="text" id="sl" name="sl" class="layui-input" min="0" lay-verify="requird" lay-reqtext="税率不能为空" autocomplete="off">
+            <label class="layui-form-label required" style="width: 70px">数量</label>
+            <div class="layui-input-inline" style="width: 265px">
+                <input type="number" id="sll" name="sll" class="layui-input" min = "0" lay-verify="required" lay-reqtext="数量不能为空" autocomplete="off">
             </div>
         </div>
         <div class="layui-form-item layui-inline" style="width: 100%">
             <label class="layui-form-label" style="width: 70px">备注</label>
             <div class="layui-input-inline" style="width: 640px">
-                <textarea id="bz" name="bz" class="layui-textarea" style="width: 100%;height: 300px"></textarea>
+                <textarea id="bz" name="bz" class="layui-textarea" style="width: 100%;height: 200px"></textarea>
             </div>
         </div>
         <!-- 右侧悬浮按钮 -->
@@ -80,6 +87,32 @@
         </div>
     </div>
 </form>
+<script>
+    function calculateBhsje() {
+        var hsje = parseFloat(document.getElementById('hsje').value);
+        var sl = parseFloat(document.getElementById('sl').value);
+
+        if (isNaN(hsje) || isNaN(sl) || sl < 0) {
+            document.getElementById('bhsje').value = '';
+        } else {
+            var bhsje = hsje / (1 + sl / 100); // 如果需要，将税率转换为小数形式
+            document.getElementById('bhsje').value = bhsje.toFixed(2); // 根据需要调整小数位数
+        }
+    }
+
+    function calculateHsje() {
+        var bhsje = parseFloat(document.getElementById('bhsje').value);
+        var sl = parseFloat(document.getElementById('sl').value);
+
+        if (isNaN(bhsje) || isNaN(sl) || sl < 0) {
+            document.getElementById('hsje').value = '';
+        } else {
+            var hsje = bhsje * (1 + sl / 100); // 如果需要，将税率转换为小数形式
+            document.getElementById('hsje').value = hsje.toFixed(2); // 根据需要调整小数位数
+        }
+    }
+</script>
+
 
 <script th:src="@{/lib/jquery-3.4.1/jquery-3.4.1.min.js}" charset="utf-8"></script>
 <script th:src="@{/lib/layui/layui.js}" charset="utf-8"></script>
@@ -103,6 +136,8 @@
         $("#bz").val(materialCost.bz);
         $("#xh").val(materialCost.xh);
         $("#sl").val(materialCost.sl);
+        $("#sll").val(materialCost.sll);
+
 
         //监听提交
         form.on('submit(saveBtn)', function (data) {

src/main/resources/templates/stamaterial/view.html

@@ -20,7 +20,7 @@
             <label class="layui-form-label required" style="width: 70px">材料名称</label>
             <div class="layui-input-inline" style="width: 640px">
                 <input type="text" id="clmc" name="clmc" lay-verify="required" lay-reqtext="材料名称不能为空"
-                       class="layui-input" disabled >
+                       class="layui-input" disabled>
             </div>
         </div>
         <div class="layui-form-item layui-inline" style="width: 100%">
@@ -30,6 +30,12 @@
                        class="layui-input" disabled>
             </div>
         </div>
+        <div class="layui-form-item layui-inline" style="width: 100%">
+            <label class="layui-form-label required" style="width: 70px">税率</label>
+            <div class="layui-input-inline" style="width: 640px">
+                <input type="text" id="sl" name="sl" class="layui-input" disabled min="0" lay-verify="requird" lay-reqtext="税率不能为空" autocomplete="off">
+            </div>
+        </div>
         <div class="layui-form-item layui-inline" style="width: 100%">
             <label class="layui-form-label required" style="width: 70px">序号</label>
             <div class="layui-input-inline" style="width: 265px">
@@ -41,32 +47,33 @@
             </div>
         </div>
         <div class="layui-form-item layui-inline" style="width: 100%">
-            <label class="layui-form-label required" style="width: 70px">单价(万元)</label>
+            <label class="layui-form-label required" style="width: 70px">含税金额</label>
             <div class="layui-input-inline" style="width: 265px">
-                <input type="number" id="cgdj" name="cgdj" min="0" lay-verify="required" lay-reqtext="单价不能为空"
-                       autocomplete="off" class="layui-input" disabled>
+                <input type="number" id="hsje" name="hsje" min="0" lay-verify="required" lay-reqtext="含税金额不能为空"
+                       autocomplete="off" class="layui-input" disabled oninput="calculateBhsje()">
             </div>
             <label class="layui-form-label required" style="width: 70px">不含税金额</label>
             <div class="layui-input-inline" style="width: 265px">
-                <input type="number" id="bhsje" name="bhsje" class="layui-input" disabled min = "0" lay-verify="required" lay-reqtext="不含税金额不能为空" autocomplete="off">
+                <input type="number" id="bhsje" name="bhsje" class="layui-input" disabled min = "0"
+                       lay-verify="required" lay-reqtext="不含税金额不能为空" autocomplete="off" oninput="calculateHsje()">
             </div>
         </div>
         <div class="layui-form-item layui-inline" style="width: 100%">
-            <label class="layui-form-label required" style="width: 70px">含税金额</label>
-            <div class="layui-input-inline" style="width: 640px">
-                <input type="number" id="hsje" name="hsje" class="layui-input" disabled min="0" lay-verify="requird" lay-reqtext="含税金额不能为空" autocomplete="off">
+
+            <label class="layui-form-label required" style="width: 70px">单价(万元)</label>
+            <div class="layui-input-inline" style="width: 265px">
+                <input type="number" id="cgdj" name="cgdj" min="0" lay-verify="required" lay-reqtext="单价不能为空"
+                       autocomplete="off" class="layui-input" disabled>
             </div>
-        </div>
-        <div class="layui-form-item layui-inline" style="width: 100%">
-            <label class="layui-form-label required" style="width: 70px">税率</label>
-            <div class="layui-input-inline" style="width: 640px">
-                <input type="text" id="sl" name="sl" class="layui-input" disabled min="0" lay-verify="requird" lay-reqtext="税率不能为空" autocomplete="off">
+            <label class="layui-form-label required" style="width: 70px">数量</label>
+            <div class="layui-input-inline" style="width: 265px">
+                <input type="number" id="sll" name="sll" class="layui-input" disabled min = "0" lay-verify="required" lay-reqtext="数量不能为空" autocomplete="off">
             </div>
         </div>
         <div class="layui-form-item layui-inline" style="width: 100%">
             <label class="layui-form-label" style="width: 70px">备注</label>
             <div class="layui-input-inline" style="width: 640px">
-                <textarea id="bz" name="bz" class="layui-textarea" style="width: 100%;height: 300px"></textarea>
+                <textarea id="bz" name="bz" class="layui-textarea" style="width: 100%;height: 200px" disabled></textarea>
             </div>
         </div>
         <!-- 右侧悬浮按钮 -->
@@ -103,6 +110,7 @@
         $("#bz").val(materialCost.bz);
         $("#xh").val(materialCost.xh);
         $("#sl").val(materialCost.sl);
+        $("#sll").val(materialCost.sll);
         // 监听取消按钮
         $("button[lay-filter='cancleBtn']").click(function () {
             var iframeIndex = parent.layer.getFrameIndex(window.name);

src/main/resources/templates/statistical/material.html

@@ -161,6 +161,7 @@
                     {type: 'numbers', align: 'center',title: '序号'},
                     {field: 'BM', width: '7%', title: '所属部门'},
                     {field: 'XMBH', width: '7%', title: '项目编号'},
+                    {field: 'SLL', width: '7%', title: '数量'},
                     {field: 'NF',width: '5%',title:'年份'},
                     {field: 'BH',width: '7%',title: '费用申请编号'},
                     {field: 'XMMC', width: '15%', title: '项目名称', sort: true},