From 77b4465bb5489f392e8883387d4d83ccc5ccd59c Mon Sep 17 00:00:00 2001
From: erdanergou <p17686264821@163.com>
Date: Sat, 4 Mar 2023 11:44:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=89=A9=E6=96=99=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E5=88=97=E8=A1=A8=E5=8D=95=E4=BB=B7=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/MaterialServiceImpl.java     |   9 +-
 .../pages/material/material-out.html          |  39 +++++-
 .../pages/stockTaking/stockTaking.html        | 131 +-----------------
 .../pages/material/material-out.html          |  39 +++++-
 .../pages/stockTaking/stockTaking.html        | 131 +-----------------
 5 files changed, 82 insertions(+), 267 deletions(-)

diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java
index f4d2c5eb..3b496d15 100644
--- a/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java
+++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java
@@ -266,7 +266,14 @@ public class MaterialServiceImpl implements MaterialService {
             state = map.get("state");
         }
         map.put("state", state);
-        return materialMapper.findMaterialByCondition(map);
+        List<Material> materialByCondition = materialMapper.findMaterialByCondition(map);
+        for (Material material:materialByCondition
+             ) {
+            if(material.getPrice() != null){
+                material.setPrice(material.getPrice() / 100);
+            }
+        }
+        return materialByCondition;
     }
 
     /**
diff --git a/src/main/resources/templates/pages/material/material-out.html b/src/main/resources/templates/pages/material/material-out.html
index 80b542d8..b5494059 100644
--- a/src/main/resources/templates/pages/material/material-out.html
+++ b/src/main/resources/templates/pages/material/material-out.html
@@ -15,6 +15,7 @@
 <div class="layuimini-container">
     <div class="layuimini-main">
         <input style="display:none;" id="nowDay" th:value="${nowDay}">
+        <input style="display:none;" id="display" th:value="${display}">
 
             <fieldset class="table-search-fieldset" >
                 <legend>搜索信息</legend>
@@ -130,6 +131,24 @@
             });
         });
 
+        let cols = [
+            {type: "checkbox", width: 50},
+            {field: 'code', width: 150, title: '存货编码', sort: true},
+            {field: 'mname', width: 120, title: '物料名称', sort: false},
+            {field: 'typeName', width: 150, title: '物料种类'},
+            {field: 'version', width: 200, title: '规格型号', sort: false},
+            {field: 'unit', width: 150, title: '计量单位'},
+            {field: 'state', title: '状态', minWidth: 100, templet: '#switchTpl'},
+            {title: '操作', minWidth: 200, toolbar: '#currentTableBar', align: "center"},
+            {field: 'texture', width: 100, title: '材质'},
+            {field: 'brand', width: 150, title: '品牌'},
+            {field: 'shelfLife', width: 150, title: '保质期'},
+            {field: 'productionPlace', width: 150, title: '产地'},
+            {field: 'remark', width: 150, title: '备注'},
+
+        ];
+        let flagForRelod = true;
+
 
         table.render({
             elem: "#currentTableId",
@@ -166,22 +185,36 @@
                     {field: 'mname', width: 120, title: '物料名称', sort: false},
                     {field: 'typeName', width: 150, title: '物料种类'},
                     {field: 'version', width: 200, title: '规格型号', sort: false},
-                    {field: 'texture', width: 100, title: '材质'},
                     {field: 'unit', width: 150, title: '计量单位'},
+                    {field: 'state', title: '状态', minWidth: 100, templet: '#switchTpl'},
+                    {title: '操作', minWidth: 200, toolbar: '#currentTableBar', align: "center"},
+                    {field: 'texture', width: 100, title: '材质'},
                     {field: 'brand', width: 150, title: '品牌'},
                     {field: 'shelfLife', width: 150, title: '保质期'},
                     {field: 'productionPlace', width: 150, title: '产地'},
                     {field: 'remark', width: 150, title: '备注'},
-                    {field: 'state', title: '状态', minWidth: 100, templet: '#switchTpl'},
-                    {title: '操作', minWidth: 200, toolbar: '#currentTableBar', align: "center"}
+
                 ]
             ],
             limits: [10, 15, 20, 25, 50,100],
             limit: 10,
             page: true,
             skin: 'line',
+            done: function (res, curr, count) {
+                let display = $("#display").val();
+                if("inline-block" === display){
+                    if(flagForRelod){
+                        flagForRelod = false;
+                        let col =  {field: 'price', width: 150, title: '物料单价'};
+                        cols.splice(6,0,col);
+                        table.reload('currentTableId',{cols:[cols]});
+                    }
+
+                }
 
 
+            }
+
         });
 
 
diff --git a/src/main/resources/templates/pages/stockTaking/stockTaking.html b/src/main/resources/templates/pages/stockTaking/stockTaking.html
index 6878f210..f0f4ca18 100644
--- a/src/main/resources/templates/pages/stockTaking/stockTaking.html
+++ b/src/main/resources/templates/pages/stockTaking/stockTaking.html
@@ -98,136 +98,7 @@
                                         </div>
                                     </div>
 
-                                    <fieldset class="table-search-fieldset">
-                                        <legend>盘点明细</legend>
-                                        <div class="layui-card-body" id="InventoryDetails" style="padding-right: 0px">
-                                            <hr>
-                                            <i class="layui-icon layui-icon-subtraction" style="display: inline"
-                                               onclick="deleteItem(this)"></i>
-
-                                            <div class="layui-form-item">
-                                                <label class="layui-form-label" style="height: 40px;">物料名称:</label>
-
-                                                <div class="layui-input-block" style="margin: 0px;">
-                                                    <div class="inputdiv">
-                                                        <input type="text" placeholder="请选择物料"
-                                                               class="layui-input fairy-tag-input"
-                                                               style="border-style: none"
-                                                               id="openSonByMaterial"
-                                                               onblur="selectMaterialByName(this)"
-                                                               lay-verify="required"/>
-                                                        <i class="layui-icon layui-icon-search" style="display: inline"
-                                                           id="selectMaterial" onclick="selectMaterial(this)"></i>
-                                                    </div>
-                                                    <input type="text" name="mid" class="layui-input" id="mid"
-                                                           style="display: none" lay-verify="required"/>
-                                                </div>
-                                            </div>
-                                            <div class="layui-form-item">
-                                                <label class="layui-form-label" style="height: 40px;">物料编码:</label>
-                                                <div class="layui-input-block" style="margin: 0px;">
-                                                    <div class="inputdiv">
-                                                        <input id="code" name="code" type="text" placeholder="请填写入物料编码"
-                                                               value=""
-                                                               onblur="selectCode(this)"
-                                                               class="layui-input" lay-verify="required"
-                                                               style="border-style: none">
-                                                        <img src="/static/images/search.ico" height="16" width="16"
-                                                             style="margin-top: 10px"
-                                                             onclick="scanMaterialCodeForTaking(this)">
-                                                    </div>
-                                                </div>
-                                            </div>
-                                            <div class="layui-form-item">
-                                                <label class="layui-form-label" style="height: 40px;">条形编码:</label>
-                                                <div class="layui-input-block" style="margin: 0px;">
-                                                    <div class="inputdiv">
-                                                        <select id="barCode" name="barCode"
-                                                                style="border-style: none">
-                                                        </select>
-                                                        <img src="/static/images/search.ico" height="16" width="16"
-                                                             id="barCodeImg"
-                                                             style="margin-top: 10px"
-                                                             onclick="scanBarCodeForTaking(this)">
-                                                    </div>
-                                                </div>
-                                            </div>
-                                            <div class="layui-form-item">
-                                                <label class="layui-form-label">物料类型：</label>
-                                                <div class="layui-input-block">
-                                                    <input type="text" placeholder="请选择物料类型" class="layui-input"
-                                                           id="openSonByMateralType" readonly
-                                                           lay-verify="required"/>
-                                                    <input type="text" id="materialTypeId" name="typeId"
-                                                           placeholder="请选择物料类型" class="layui-input"
-                                                           style="display: none" lay-verify="required"/>
-
-                                                </div>
-                                            </div>
-                                            <div class="layui-form-item">
-                                                <label class="layui-form-label">材质:</label>
-                                                <div class="layui-input-block">
-                                                    <input type="text" placeholder="请填写材质名称" class="layui-input" readonly
-                                                           name="texture"/>
-                                                </div>
-                                            </div>
-                                            <div class="layui-form-item">
-                                                <label class="layui-form-label">规格型号:</label>
-                                                <div class="layui-input-block">
-                                                    <input type="text" placeholder="请填写规格型号" class="layui-input" readonly
-                                                           name="version"/>
-                                                </div>
-                                            </div>
-                                            <div class="layui-form-item">
-                                                <label class="layui-form-label">计量单位:</label>
-                                                <div class="layui-input-block">
-                                                    <select id="unit" name="unit"></select>
-                                                </div>
-                                            </div>
-                                            <div class="layui-form-item" style="display: none" id="producedDateItem">
-                                                <label class="layui-form-label">生产日期:</label>
-                                                <div class="layui-input-block">
-                                                    <!--                                                    <input type="text" name="producedDate" id="producedDate"  placeholder="请填写生产日期" onclick="selectDate(this)"-->
-                                                    <!--                                                           autocomplete="off" class="layui-input">-->
-                                                    <select name="producedDate" id="producedDate">
-
-                                                    </select>
-                                                </div>
-                                            </div>
-                                            <div class="layui-form-item">
-                                                <label class="layui-form-label">库存数量:</label>
-                                                <div class="layui-input-block">
-                                                    <input type="number" class="layui-input" readonly id="oldInventory"
-                                                           name="oldInventory" lay-verify="required"/>
-                                                </div>
-                                            </div>
-                                            <div class="layui-form-item">
-                                                <label class="layui-form-label">盘点数量:</label>
-                                                <div class="layui-input-block">
-                                                    <input type="number" class="layui-input" onblur="calculate(this)"
-                                                           name="newInventory" lay-verify="required"/>
-                                                </div>
-                                            </div>
-                                            <div class="layui-form-item">
-                                                <label class="layui-form-label">盘点结果:</label>
-                                                <div class="layui-input-block">
-                                                    <select name="takingResult" id="result">
-
-                                                    </select>
-                                                </div>
-                                            </div>
-                                            <div class="layui-form-item">
-                                                <label class="layui-form-label">盈亏数量:</label>
-                                                <div class="layui-input-block">
-                                                    <input type="number" class="layui-input" readonly
-                                                           id="Inventory_number"
-                                                           name="inventory" lay-verify="required"/>
-                                                </div>
-                                            </div>
-                                            <i class="layui-icon layui-icon-addition" style="display: inline"
-                                               onclick="addItem(this)"></i>
-                                        </div>
-                                    </fieldset>
+                                    <table class="layui-hide" id="currentTableId" lay-filter="currentTableFilter"></table>
 
                                     <!--                                        提交按钮-->
                                     <div class="layui-form-item" style="margin-top: 10px;">
diff --git a/target/classes/templates/pages/material/material-out.html b/target/classes/templates/pages/material/material-out.html
index 80b542d8..b5494059 100644
--- a/target/classes/templates/pages/material/material-out.html
+++ b/target/classes/templates/pages/material/material-out.html
@@ -15,6 +15,7 @@
 <div class="layuimini-container">
     <div class="layuimini-main">
         <input style="display:none;" id="nowDay" th:value="${nowDay}">
+        <input style="display:none;" id="display" th:value="${display}">
 
             <fieldset class="table-search-fieldset" >
                 <legend>搜索信息</legend>
@@ -130,6 +131,24 @@
             });
         });
 
+        let cols = [
+            {type: "checkbox", width: 50},
+            {field: 'code', width: 150, title: '存货编码', sort: true},
+            {field: 'mname', width: 120, title: '物料名称', sort: false},
+            {field: 'typeName', width: 150, title: '物料种类'},
+            {field: 'version', width: 200, title: '规格型号', sort: false},
+            {field: 'unit', width: 150, title: '计量单位'},
+            {field: 'state', title: '状态', minWidth: 100, templet: '#switchTpl'},
+            {title: '操作', minWidth: 200, toolbar: '#currentTableBar', align: "center"},
+            {field: 'texture', width: 100, title: '材质'},
+            {field: 'brand', width: 150, title: '品牌'},
+            {field: 'shelfLife', width: 150, title: '保质期'},
+            {field: 'productionPlace', width: 150, title: '产地'},
+            {field: 'remark', width: 150, title: '备注'},
+
+        ];
+        let flagForRelod = true;
+
 
         table.render({
             elem: "#currentTableId",
@@ -166,22 +185,36 @@
                     {field: 'mname', width: 120, title: '物料名称', sort: false},
                     {field: 'typeName', width: 150, title: '物料种类'},
                     {field: 'version', width: 200, title: '规格型号', sort: false},
-                    {field: 'texture', width: 100, title: '材质'},
                     {field: 'unit', width: 150, title: '计量单位'},
+                    {field: 'state', title: '状态', minWidth: 100, templet: '#switchTpl'},
+                    {title: '操作', minWidth: 200, toolbar: '#currentTableBar', align: "center"},
+                    {field: 'texture', width: 100, title: '材质'},
                     {field: 'brand', width: 150, title: '品牌'},
                     {field: 'shelfLife', width: 150, title: '保质期'},
                     {field: 'productionPlace', width: 150, title: '产地'},
                     {field: 'remark', width: 150, title: '备注'},
-                    {field: 'state', title: '状态', minWidth: 100, templet: '#switchTpl'},
-                    {title: '操作', minWidth: 200, toolbar: '#currentTableBar', align: "center"}
+
                 ]
             ],
             limits: [10, 15, 20, 25, 50,100],
             limit: 10,
             page: true,
             skin: 'line',
+            done: function (res, curr, count) {
+                let display = $("#display").val();
+                if("inline-block" === display){
+                    if(flagForRelod){
+                        flagForRelod = false;
+                        let col =  {field: 'price', width: 150, title: '物料单价'};
+                        cols.splice(6,0,col);
+                        table.reload('currentTableId',{cols:[cols]});
+                    }
+
+                }
 
 
+            }
+
         });
 
 
diff --git a/target/classes/templates/pages/stockTaking/stockTaking.html b/target/classes/templates/pages/stockTaking/stockTaking.html
index 6878f210..f0f4ca18 100644
--- a/target/classes/templates/pages/stockTaking/stockTaking.html
+++ b/target/classes/templates/pages/stockTaking/stockTaking.html
@@ -98,136 +98,7 @@
                                         </div>
                                     </div>
 
-                                    <fieldset class="table-search-fieldset">
-                                        <legend>盘点明细</legend>
-                                        <div class="layui-card-body" id="InventoryDetails" style="padding-right: 0px">
-                                            <hr>
-                                            <i class="layui-icon layui-icon-subtraction" style="display: inline"
-                                               onclick="deleteItem(this)"></i>
-
-                                            <div class="layui-form-item">
-                                                <label class="layui-form-label" style="height: 40px;">物料名称:</label>
-
-                                                <div class="layui-input-block" style="margin: 0px;">
-                                                    <div class="inputdiv">
-                                                        <input type="text" placeholder="请选择物料"
-                                                               class="layui-input fairy-tag-input"
-                                                               style="border-style: none"
-                                                               id="openSonByMaterial"
-                                                               onblur="selectMaterialByName(this)"
-                                                               lay-verify="required"/>
-                                                        <i class="layui-icon layui-icon-search" style="display: inline"
-                                                           id="selectMaterial" onclick="selectMaterial(this)"></i>
-                                                    </div>
-                                                    <input type="text" name="mid" class="layui-input" id="mid"
-                                                           style="display: none" lay-verify="required"/>
-                                                </div>
-                                            </div>
-                                            <div class="layui-form-item">
-                                                <label class="layui-form-label" style="height: 40px;">物料编码:</label>
-                                                <div class="layui-input-block" style="margin: 0px;">
-                                                    <div class="inputdiv">
-                                                        <input id="code" name="code" type="text" placeholder="请填写入物料编码"
-                                                               value=""
-                                                               onblur="selectCode(this)"
-                                                               class="layui-input" lay-verify="required"
-                                                               style="border-style: none">
-                                                        <img src="/static/images/search.ico" height="16" width="16"
-                                                             style="margin-top: 10px"
-                                                             onclick="scanMaterialCodeForTaking(this)">
-                                                    </div>
-                                                </div>
-                                            </div>
-                                            <div class="layui-form-item">
-                                                <label class="layui-form-label" style="height: 40px;">条形编码:</label>
-                                                <div class="layui-input-block" style="margin: 0px;">
-                                                    <div class="inputdiv">
-                                                        <select id="barCode" name="barCode"
-                                                                style="border-style: none">
-                                                        </select>
-                                                        <img src="/static/images/search.ico" height="16" width="16"
-                                                             id="barCodeImg"
-                                                             style="margin-top: 10px"
-                                                             onclick="scanBarCodeForTaking(this)">
-                                                    </div>
-                                                </div>
-                                            </div>
-                                            <div class="layui-form-item">
-                                                <label class="layui-form-label">物料类型：</label>
-                                                <div class="layui-input-block">
-                                                    <input type="text" placeholder="请选择物料类型" class="layui-input"
-                                                           id="openSonByMateralType" readonly
-                                                           lay-verify="required"/>
-                                                    <input type="text" id="materialTypeId" name="typeId"
-                                                           placeholder="请选择物料类型" class="layui-input"
-                                                           style="display: none" lay-verify="required"/>
-
-                                                </div>
-                                            </div>
-                                            <div class="layui-form-item">
-                                                <label class="layui-form-label">材质:</label>
-                                                <div class="layui-input-block">
-                                                    <input type="text" placeholder="请填写材质名称" class="layui-input" readonly
-                                                           name="texture"/>
-                                                </div>
-                                            </div>
-                                            <div class="layui-form-item">
-                                                <label class="layui-form-label">规格型号:</label>
-                                                <div class="layui-input-block">
-                                                    <input type="text" placeholder="请填写规格型号" class="layui-input" readonly
-                                                           name="version"/>
-                                                </div>
-                                            </div>
-                                            <div class="layui-form-item">
-                                                <label class="layui-form-label">计量单位:</label>
-                                                <div class="layui-input-block">
-                                                    <select id="unit" name="unit"></select>
-                                                </div>
-                                            </div>
-                                            <div class="layui-form-item" style="display: none" id="producedDateItem">
-                                                <label class="layui-form-label">生产日期:</label>
-                                                <div class="layui-input-block">
-                                                    <!--                                                    <input type="text" name="producedDate" id="producedDate"  placeholder="请填写生产日期" onclick="selectDate(this)"-->
-                                                    <!--                                                           autocomplete="off" class="layui-input">-->
-                                                    <select name="producedDate" id="producedDate">
-
-                                                    </select>
-                                                </div>
-                                            </div>
-                                            <div class="layui-form-item">
-                                                <label class="layui-form-label">库存数量:</label>
-                                                <div class="layui-input-block">
-                                                    <input type="number" class="layui-input" readonly id="oldInventory"
-                                                           name="oldInventory" lay-verify="required"/>
-                                                </div>
-                                            </div>
-                                            <div class="layui-form-item">
-                                                <label class="layui-form-label">盘点数量:</label>
-                                                <div class="layui-input-block">
-                                                    <input type="number" class="layui-input" onblur="calculate(this)"
-                                                           name="newInventory" lay-verify="required"/>
-                                                </div>
-                                            </div>
-                                            <div class="layui-form-item">
-                                                <label class="layui-form-label">盘点结果:</label>
-                                                <div class="layui-input-block">
-                                                    <select name="takingResult" id="result">
-
-                                                    </select>
-                                                </div>
-                                            </div>
-                                            <div class="layui-form-item">
-                                                <label class="layui-form-label">盈亏数量:</label>
-                                                <div class="layui-input-block">
-                                                    <input type="number" class="layui-input" readonly
-                                                           id="Inventory_number"
-                                                           name="inventory" lay-verify="required"/>
-                                                </div>
-                                            </div>
-                                            <i class="layui-icon layui-icon-addition" style="display: inline"
-                                               onclick="addItem(this)"></i>
-                                        </div>
-                                    </fieldset>
+                                    <table class="layui-hide" id="currentTableId" lay-filter="currentTableFilter"></table>
 
                                     <!--                                        提交按钮-->
                                     <div class="layui-form-item" style="margin-top: 10px;">