为库存导入添加备注字段

src/main/java/com/dreamchaser/depository_manage/controller/PageController.java

@@ -850,6 +850,15 @@ public class PageController {
         UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
         ModelAndView mv = new ModelAndView();
         mv.setViewName("pages/depository/table-stock");
+        Integer isadmin = userToken.getIsadmin();
+        if (isadmin == null) {
+            isadmin = 1;
+        }
+        if (isadmin == 4 || Integer.compare(userToken.getMaindeparment(), 361) == 0) {
+            mv.addObject("display", "table-cell");
+        } else {
+            mv.addObject("display", "none");
+        }
         mv.addObject("number", userToken.getNumber());
         String userAgent = request.getHeader("user-agent");
         // 判断当前使用的设备为移动端还是pc端
@@ -913,6 +922,20 @@ public class PageController {
                 inventory.setSplitInfoList(splitInfoByMid);
                 mv.addObject("record", inventory);
                 String userAgent = request.getHeader("user-agent");
+                String token = request.getHeader("user-token");
+                if (token == null) {
+                    token = (String) request.getSession().getAttribute("userToken");
+                }
+                UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
+                Integer isadmin = userToken.getIsadmin();
+                if (isadmin == null) {
+                    isadmin = 1;
+                }
+                if (isadmin == 4 || Integer.compare(userToken.getMaindeparment(), 361) == 0) {
+                    mv.addObject("display", "block");
+                } else {
+                    mv.addObject("display", "none");
+                }
                 // 判断当前使用的设备为移动端还是pc端
                 boolean b = DeviceUtil.checkAgentIsMobile(userAgent);
                 if (b) {

src/main/java/com/dreamchaser/depository_manage/entity/ExcelInfoByInventory.java

@@ -42,4 +42,7 @@ public class ExcelInfoByInventory {
     /** 仓库编码 */
     @ExcelProperty(value = "库位码")
     private String depositoryCode;
+
+    @ExcelProperty(value = "备注")
+    private String remark;
 }

src/main/java/com/dreamchaser/depository_manage/entity/Inventory.java

@@ -142,10 +142,15 @@ public class Inventory {
     private String brand;
 
     /**
-     * 备注
+     * 物料备注
      */
     private String remark;
 
+    /**
+     * 库存导入时备注
+     */
+    private String iremark;
+
     /**
      * 生产日期
      */

src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml

@@ -51,6 +51,7 @@
         <result column="brand" property="brand" jdbcType="VARCHAR"/>
         <result column="remark" property="remark" jdbcType="VARCHAR"/>
         <result column="tname" property="typeName" jdbcType="VARCHAR"/>
+        <result column="iremark" property="iremark" jdbcType="VARCHAR"/>
         <result column="numberOfTemporary" property="numberOfTemporary" jdbcType="INTEGER"/>
     </resultMap>
 
@@ -137,7 +138,8 @@
     </sql>
     <!-- 表查询字段，包括物料类型 用于库存视图-->
     <sql id="allColumnsAndTypeNameOnViewByInventory">
-        id,mid,depositoryId,mname,quantity,price,mtid,mstate,tname,dname,version ,unit ,texture,mcode,depositoryCode,producedDate,shelfLife,productionPlace,brand,remark,numberOfTemporary
+        id,mid,depositoryId,mname,quantity,price,mtid,mstate,tname,dname,version ,unit ,
+        texture,mcode,depositoryCode,producedDate,shelfLife,productionPlace,brand,remark,numberOfTemporary,iremark
     </sql>
 
     <sql id="allColumnsByMaterialAndProducedDate">
@@ -810,10 +812,11 @@
     </insert>
     <!-- 插入数据 -->
     <insert id="insertInventory" useGeneratedKeys="true" keyProperty="id">
-        insert into inventory(id,mid,quantity,producedDate,depository_id)
+        insert into inventory(id,mid,remark,quantity,producedDate,depository_id)
         values (
         #{id},
         #{mid},
+        #{remark},
         #{quantity},
         #{producedDate},
         #{depositoryId}
@@ -1004,6 +1007,9 @@
             <if test="depositoryId != null">
                 depository_id = #{depositoryId},
             </if>
+            <if test="remark != '' and remark != null">
+                remark = #{remark},
+            </if>
             <if test="mid != null and mid != '' ">
                 mid = #{mid},
             </if>

src/main/java/com/dreamchaser/depository_manage/pojo/InventoryP.java

@@ -216,6 +216,12 @@ public class InventoryP {
     private Double defaultQuantity;
 
 
+    /**
+     * 库存导入时备注
+     */
+    private String iremark;
+
+
     public InventoryP(Integer id, Integer depositoryId, String mname, Integer quantity, Double price, String typeName) {
         this.id = id;
         this.mname = mname;
@@ -248,6 +254,7 @@ public class InventoryP {
         this.baseUnit = inventory.getUnit(); // 基础单位
         this.placeKingdeeCode = inventory.getPlaceKingdeeCode(); // 库位编码（金蝶）
         this.depositoryName = inventory.getDepositoryName(); // 仓库名称
+        this.iremark = inventory.getIremark() == null ? "" : inventory.getIremark(); // 库存导入时填写的备注
     }
 
     public InventoryP() {

src/main/java/com/dreamchaser/depository_manage/service/impl/ExcelServiceImpl.java

@@ -610,6 +610,10 @@ public class ExcelServiceImpl implements ExcelService {
             insert.put("depositoryId", depositoryId);
             insert.put("depositoryCode", excelInfoByInventory.getDepositoryCode());
             insert.put("mid", material.getId());
+            String remark = excelInfoByInventory.getRemark();
+            if (remark != null) {
+                insert.put("remark", remark);
+            }
 
             // 插入库存记录
             materialService.insertInventoryForImport(insert);

src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java

@@ -988,6 +988,11 @@ public class MaterialServiceImpl implements MaterialService {
             // 如果该物料存在
             Inventory material = inventory.get(0);
 
+            if(map.containsKey("remark")){
+                material.setRemark(map.get("remark").toString());
+            }
+
+
 
             double quantity = Double.parseDouble(map.get("quantity").toString());
             double quantity_residue = 0;

src/main/resources/templates/pages/depository/Inventory-view.html

@@ -125,7 +125,7 @@
                    class="layui-input">
         </div>
     </div>
-    <div class="layui-form-item">
+    <div class="layui-form-item" th:style="'display:'+${display}">
         <label class="layui-form-label">单价</label>
         <div class="layui-input-inline">
             <input type="text" th:value="${record.getPrice()}" name="price" required autocomplete="off" id="price"
@@ -133,7 +133,7 @@
                    class="layui-input">
         </div>
     </div>
-    <div class="layui-form-item">
+    <div class="layui-form-item" th:style="'display:'+${display}">
         <label class="layui-form-label">总额</label>
         <div class="layui-input-inline">
             <input type="text" th:value="${record.getAmounts()}" name="amounts" required autocomplete="off" id="amounts"

src/main/resources/templates/pages/depository/Inventory-view_mobile.html

@@ -125,7 +125,7 @@
                    class="layui-input">
         </div>
     </div>
-    <div class="layui-form-item">
+    <div class="layui-form-item" th:style="'display:'+${display}">
         <label class="layui-form-label">单价</label>
         <div class="layui-input-inline">
             <input type="text" th:value="${record.getPrice()}" name="price" required autocomplete="off" id="price"
@@ -133,7 +133,7 @@
                    class="layui-input">
         </div>
     </div>
-    <div class="layui-form-item">
+    <div class="layui-form-item" th:style="'display:'+${display}">
         <label class="layui-form-label">总额</label>
         <div class="layui-input-inline">
             <input type="text" th:value="${record.getAmounts()}" name="amounts" required autocomplete="off" id="amounts"

src/main/resources/templates/pages/depository/table-stock.html

@@ -18,6 +18,7 @@
             <legend>搜索信息</legend>
             <div style="margin: 10px 10px 10px 10px">
                 <input style="display: none" th:value="${number}" id="number">
+                <input style="display: none" th:value="${display}" id="display">
                 <form class="layui-form layui-form-pane" action="">
                     <div class="layui-form-item">
                         <div class="layui-inline">
@@ -136,13 +137,14 @@
     let newIndexShade;
 
 
-
     layui.use(['form', 'table', 'upload'], function () {
         var $ = layui.jquery,
             form = layui.form,
             upload = layui.upload,
             table = layui.table;
 
+        let display = $("#display").val();
+
         $('#openSonByMateralType').on('click', function () {
             layer.open({
                 type: 2,
@@ -187,6 +189,28 @@
         });
 
 
+        let cols = [
+            {type: "checkbox", width: 50},
+            {title: '存货编码', width: 150, templet: '#materialCode'},
+            {field: 'mname', width: 200, title: '物料名称'},
+            {field: 'brand', width: 200, title: '品牌'},
+            {field: 'version', width: 200, title: '规格型号'},
+            {field: 'typeName', width: 200, title: '物料类型'},
+            {title: '计量单位', width: 200, templet: '#changeUnit', align: "center"},
+            {field: 'quantity', width: 200, title: '数量'},
+            {field: 'depositoryName', width: 200, title: '仓库名称'},
+            {field: 'depositoryCode', width: 200, title: '仓库编码'},
+            {title: '所处库位', width: 200, templet: '#changePlace', align: "center"},
+            {field: 'warningCount', width: 200, title: '待过期数量', sort: true},
+            {field: 'price', title: '单价', width: 200, sort: true},
+            {field: 'amounts', title: '总金额', width: 200, sort: true},
+            {field: 'texture', width: 200, title: '材质',},
+            {field: 'iremark', width: 200, title: '备注',},
+            {title: '操作', minWidth: 250, toolbar: '#currentTableBar', align: "center"}
+        ];
+
+        let flagForReload = true;
+
         table.render({
             elem: "#currentTableId",
             url: '/material/findInventory',
@@ -225,9 +249,8 @@
                     {field: 'depositoryCode', width: 200, title: '仓库编码'},
                     {title: '所处库位', width: 200, templet: '#changePlace', align: "center"},
                     {field: 'warningCount', width: 200, title: '待过期数量', sort: true},
-                    {field: 'price', title: '单价', width: 200, sort: true},
-                    {field: 'amounts', title: '总金额', width: 200, sort: true},
                     {field: 'texture', width: 200, title: '材质',},
+                    {field: 'iremark', width: 200, title: '备注',},
                     {title: '操作', minWidth: 250, toolbar: '#currentTableBar', align: "center"}
                 ]
             ],
@@ -237,17 +260,21 @@
             skin: 'line',
             done: function (res, curr, count) {
                 bindTableToolbarFunction();
+                if (display !== "none") {
+                    if (flagForReload) {
+                        flagForReload = false;
+                        table.reload("currentTableId", {cols: [cols]});
+                    }
+                }
                 $.each(res['data'], function (i, j) {
                     let jElement = j['warningCount'];
                     let placeCode = j['placeCode'].split(" ");
                     let placeKingdeeCode = j['placeKingdeeCode'].split(" ");
                     let depositoryId = j['depositoryId'];
-                    let unit = j['unit'];
                     let mid = j['id'];
                     if (jElement !== null && jElement !== undefined) {
                         let flag = (Number(jElement) !== 0);
                         if (flag) {
-                            // console.log(i + ' -458- ' + 'jdjg is null');
                             Layui_SetDataTableRowColor('table', i + 1, '#b1070a');
                         }
 
@@ -424,8 +451,7 @@
                     layer.full(index);
                 });
                 return false;
-            }
-            else if (obj.event === 'applicationOut') {
+            } else if (obj.event === 'applicationOut') {
                 // 出库申请
                 var index = layer.open({
                     title: '出库申请',
@@ -440,8 +466,7 @@
                     layer.full(index);
                 });
                 return false;
-            }
-            else if (obj.event === 'changeUnit') {
+            } else if (obj.event === 'changeUnit') {
                 let showQuantity = data.showQuantity;
                 let btn = $("#btn_" + data.id);
                 let clickNum = Number(btn.attr("click_num"));
@@ -538,11 +563,13 @@
                             re += show
                         }
                         for (let i = 0; i < res.data.dataList.length; i++) {
-                            var code = res.data.dataList[i]["code"] === null ? '' : res.data.dataList[i]["code"];
-                            var mname = res.data.dataList[i]["mname"];
-                            var version = res.data.dataList[i]["version"] === null ? '' : res.data.dataList[i]["version"];
-                            var quantity = res.data.dataList[i]["quantity"];
-                            var show = "<p style='color: #00FF00'>" + code + "， " + mname + "， " + version + "， 数量为" + quantity + "：通过" + "</p>";
+                            let dataListElement = res.data.dataList[i];
+                            var code = dataListElement["code"] === null ? '' : dataListElement["code"];
+                            var mname = dataListElement["mname"];
+                            var version = dataListElement["version"] === null ? '' : dataListElement["version"];
+                            var quantity = dataListElement["quantity"];
+                            var remark = dataListElement["remark"] === null ? "" : dataListElement["remark"];
+                            var show = "<p style='color: #00FF00'>" + code + "， " + mname + "， " + version + "， 数量为:" + quantity + "备注：" + remark + "：通过" + "</p>";
                             re += show
                         }
 
@@ -583,7 +610,8 @@
                                     var mname = jsonObject[i]["mname"];
                                     var version = jsonObject[i]["version"] === null ? '' : jsonObject[i]["version"];
                                     var quantity = jsonObject[i]["quantity"];
-                                    var show = "<p style='color: #00FF00'>" + code + "， " + mname + "， " + version + "， 数量为" + quantity + "：通过" + "</p>";
+                                    var remark = jsonObject[i]["remark"];
+                                    var show = "<p style='color: #00FF00'>" + code + "， " + mname + "， " + version + "， 数量为:" + quantity + "备注：" + remark + "：通过" + "</p>";
                                     re += show
                                 }
                                 $("#showDataContent").append(re);
@@ -669,9 +697,6 @@
         }
 
 
-
-
-
         closeShowDataMessage = function () {
             $("#layui-layer-shade-x" + newIndexShade).remove();
             $("#showImportData").hide();

src/main/resources/templates/pages/depository/table-stock_mobile.html

@@ -163,6 +163,7 @@
                             + '<p>' + "物料型号：" + result[i].version + '</p>'
                             + brandItem
                             + '<p>' + "物料类型：" + result[i].typeName + '</p>'
+                            + '<p>' + "库存备注：" + result[i].iremark + '</p>'
                             + '</div></div></li>');
                     }
                     lis.push('</div>');
@@ -273,13 +274,19 @@
                             result = res.data;
                             lis.push("<div class='clearfix'>");
                             for (let i = 0; i < result.length; i++) {
+
+                                let brandItem = '<p>' + "物料品牌：" + result[i].brand + '</p>';
+                                if (result[i].brand === "") {
+                                    brandItem = "";
+                                }
                                 lis.push('<li style="width:100%;margin-top: 10px;float:left;border: 1px solid #9999996e;"><div class="layui-card  my-shadow my-card flow1" onclick="showDetail('
                                     + result[i].id + ')"><div class="layui-card-header"><h2>' + result[i].mname + '</h2></div>');
                                 lis.push('<div class="layui-col-md4 my-info" style="margin-left: 15px; color: #999;font-size: 15px;">'
-                                    + '<p>' + result[i].code + '</p>'
-                                    + '<p>' + result[i].version + '</p>'
-                                    + '<p>' + "品牌：" + result[i].brand + '</p>'
-                                    + '<p>' + result[i].typeName + '</p>'
+                                    + '<p>' + "物料编码：" + result[i].code + '</p>'
+                                    + '<p>' + "物料型号：" + result[i].version + '</p>'
+                                    + brandItem
+                                    + '<p>' + "物料类型：" + result[i].typeName + '</p>'
+                                    + '<p>' + "库存备注：" + result[i].iremark + '</p>'
                                     + '</div></div></li>');
                             }
                             lis.push('</div>');

target/classes/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml

@@ -51,6 +51,7 @@
         <result column="brand" property="brand" jdbcType="VARCHAR"/>
         <result column="remark" property="remark" jdbcType="VARCHAR"/>
         <result column="tname" property="typeName" jdbcType="VARCHAR"/>
+        <result column="iremark" property="iremark" jdbcType="VARCHAR"/>
         <result column="numberOfTemporary" property="numberOfTemporary" jdbcType="INTEGER"/>
     </resultMap>
 
@@ -137,7 +138,8 @@
     </sql>
     <!-- 表查询字段，包括物料类型 用于库存视图-->
     <sql id="allColumnsAndTypeNameOnViewByInventory">
-        id,mid,depositoryId,mname,quantity,price,mtid,mstate,tname,dname,version ,unit ,texture,mcode,depositoryCode,producedDate,shelfLife,productionPlace,brand,remark,numberOfTemporary
+        id,mid,depositoryId,mname,quantity,price,mtid,mstate,tname,dname,version ,unit ,
+        texture,mcode,depositoryCode,producedDate,shelfLife,productionPlace,brand,remark,numberOfTemporary,iremark
     </sql>
 
     <sql id="allColumnsByMaterialAndProducedDate">
@@ -810,10 +812,11 @@
     </insert>
     <!-- 插入数据 -->
     <insert id="insertInventory" useGeneratedKeys="true" keyProperty="id">
-        insert into inventory(id,mid,quantity,producedDate,depository_id)
+        insert into inventory(id,mid,remark,quantity,producedDate,depository_id)
         values (
         #{id},
         #{mid},
+        #{remark},
         #{quantity},
         #{producedDate},
         #{depositoryId}
@@ -1004,6 +1007,9 @@
             <if test="depositoryId != null">
                 depository_id = #{depositoryId},
             </if>
+            <if test="remark != '' and remark != null">
+                remark = #{remark},
+            </if>
             <if test="mid != null and mid != '' ">
                 mid = #{mid},
             </if>

target/classes/templates/pages/depository/Inventory-view.html

@@ -125,7 +125,7 @@
                    class="layui-input">
         </div>
     </div>
-    <div class="layui-form-item">
+    <div class="layui-form-item" th:style="'display:'+${display}">
         <label class="layui-form-label">单价</label>
         <div class="layui-input-inline">
             <input type="text" th:value="${record.getPrice()}" name="price" required autocomplete="off" id="price"
@@ -133,7 +133,7 @@
                    class="layui-input">
         </div>
     </div>
-    <div class="layui-form-item">
+    <div class="layui-form-item" th:style="'display:'+${display}">
         <label class="layui-form-label">总额</label>
         <div class="layui-input-inline">
             <input type="text" th:value="${record.getAmounts()}" name="amounts" required autocomplete="off" id="amounts"

target/classes/templates/pages/depository/Inventory-view_mobile.html

@@ -125,7 +125,7 @@
                    class="layui-input">
         </div>
     </div>
-    <div class="layui-form-item">
+    <div class="layui-form-item" th:style="'display:'+${display}">
         <label class="layui-form-label">单价</label>
         <div class="layui-input-inline">
             <input type="text" th:value="${record.getPrice()}" name="price" required autocomplete="off" id="price"
@@ -133,7 +133,7 @@
                    class="layui-input">
         </div>
     </div>
-    <div class="layui-form-item">
+    <div class="layui-form-item" th:style="'display:'+${display}">
         <label class="layui-form-label">总额</label>
         <div class="layui-input-inline">
             <input type="text" th:value="${record.getAmounts()}" name="amounts" required autocomplete="off" id="amounts"

target/classes/templates/pages/depository/table-stock.html

@@ -18,6 +18,7 @@
             <legend>搜索信息</legend>
             <div style="margin: 10px 10px 10px 10px">
                 <input style="display: none" th:value="${number}" id="number">
+                <input style="display: none" th:value="${display}" id="display">
                 <form class="layui-form layui-form-pane" action="">
                     <div class="layui-form-item">
                         <div class="layui-inline">
@@ -136,13 +137,14 @@
     let newIndexShade;
 
 
-
     layui.use(['form', 'table', 'upload'], function () {
         var $ = layui.jquery,
             form = layui.form,
             upload = layui.upload,
             table = layui.table;
 
+        let display = $("#display").val();
+
         $('#openSonByMateralType').on('click', function () {
             layer.open({
                 type: 2,
@@ -187,6 +189,28 @@
         });
 
 
+        let cols = [
+            {type: "checkbox", width: 50},
+            {title: '存货编码', width: 150, templet: '#materialCode'},
+            {field: 'mname', width: 200, title: '物料名称'},
+            {field: 'brand', width: 200, title: '品牌'},
+            {field: 'version', width: 200, title: '规格型号'},
+            {field: 'typeName', width: 200, title: '物料类型'},
+            {title: '计量单位', width: 200, templet: '#changeUnit', align: "center"},
+            {field: 'quantity', width: 200, title: '数量'},
+            {field: 'depositoryName', width: 200, title: '仓库名称'},
+            {field: 'depositoryCode', width: 200, title: '仓库编码'},
+            {title: '所处库位', width: 200, templet: '#changePlace', align: "center"},
+            {field: 'warningCount', width: 200, title: '待过期数量', sort: true},
+            {field: 'price', title: '单价', width: 200, sort: true},
+            {field: 'amounts', title: '总金额', width: 200, sort: true},
+            {field: 'texture', width: 200, title: '材质',},
+            {field: 'iremark', width: 200, title: '备注',},
+            {title: '操作', minWidth: 250, toolbar: '#currentTableBar', align: "center"}
+        ];
+
+        let flagForReload = true;
+
         table.render({
             elem: "#currentTableId",
             url: '/material/findInventory',
@@ -225,9 +249,8 @@
                     {field: 'depositoryCode', width: 200, title: '仓库编码'},
                     {title: '所处库位', width: 200, templet: '#changePlace', align: "center"},
                     {field: 'warningCount', width: 200, title: '待过期数量', sort: true},
-                    {field: 'price', title: '单价', width: 200, sort: true},
-                    {field: 'amounts', title: '总金额', width: 200, sort: true},
                     {field: 'texture', width: 200, title: '材质',},
+                    {field: 'iremark', width: 200, title: '备注',},
                     {title: '操作', minWidth: 250, toolbar: '#currentTableBar', align: "center"}
                 ]
             ],
@@ -237,17 +260,21 @@
             skin: 'line',
             done: function (res, curr, count) {
                 bindTableToolbarFunction();
+                if (display !== "none") {
+                    if (flagForReload) {
+                        flagForReload = false;
+                        table.reload("currentTableId", {cols: [cols]});
+                    }
+                }
                 $.each(res['data'], function (i, j) {
                     let jElement = j['warningCount'];
                     let placeCode = j['placeCode'].split(" ");
                     let placeKingdeeCode = j['placeKingdeeCode'].split(" ");
                     let depositoryId = j['depositoryId'];
-                    let unit = j['unit'];
                     let mid = j['id'];
                     if (jElement !== null && jElement !== undefined) {
                         let flag = (Number(jElement) !== 0);
                         if (flag) {
-                            // console.log(i + ' -458- ' + 'jdjg is null');
                             Layui_SetDataTableRowColor('table', i + 1, '#b1070a');
                         }
 
@@ -424,8 +451,7 @@
                     layer.full(index);
                 });
                 return false;
-            }
-            else if (obj.event === 'applicationOut') {
+            } else if (obj.event === 'applicationOut') {
                 // 出库申请
                 var index = layer.open({
                     title: '出库申请',
@@ -440,8 +466,7 @@
                     layer.full(index);
                 });
                 return false;
-            }
-            else if (obj.event === 'changeUnit') {
+            } else if (obj.event === 'changeUnit') {
                 let showQuantity = data.showQuantity;
                 let btn = $("#btn_" + data.id);
                 let clickNum = Number(btn.attr("click_num"));
@@ -538,11 +563,13 @@
                             re += show
                         }
                         for (let i = 0; i < res.data.dataList.length; i++) {
-                            var code = res.data.dataList[i]["code"] === null ? '' : res.data.dataList[i]["code"];
-                            var mname = res.data.dataList[i]["mname"];
-                            var version = res.data.dataList[i]["version"] === null ? '' : res.data.dataList[i]["version"];
-                            var quantity = res.data.dataList[i]["quantity"];
-                            var show = "<p style='color: #00FF00'>" + code + "， " + mname + "， " + version + "， 数量为" + quantity + "：通过" + "</p>";
+                            let dataListElement = res.data.dataList[i];
+                            var code = dataListElement["code"] === null ? '' : dataListElement["code"];
+                            var mname = dataListElement["mname"];
+                            var version = dataListElement["version"] === null ? '' : dataListElement["version"];
+                            var quantity = dataListElement["quantity"];
+                            var remark = dataListElement["remark"] === null ? "" : dataListElement["remark"];
+                            var show = "<p style='color: #00FF00'>" + code + "， " + mname + "， " + version + "， 数量为:" + quantity + "备注：" + remark + "：通过" + "</p>";
                             re += show
                         }
 
@@ -583,7 +610,8 @@
                                     var mname = jsonObject[i]["mname"];
                                     var version = jsonObject[i]["version"] === null ? '' : jsonObject[i]["version"];
                                     var quantity = jsonObject[i]["quantity"];
-                                    var show = "<p style='color: #00FF00'>" + code + "， " + mname + "， " + version + "， 数量为" + quantity + "：通过" + "</p>";
+                                    var remark = jsonObject[i]["remark"];
+                                    var show = "<p style='color: #00FF00'>" + code + "， " + mname + "， " + version + "， 数量为:" + quantity + "备注：" + remark + "：通过" + "</p>";
                                     re += show
                                 }
                                 $("#showDataContent").append(re);
@@ -669,9 +697,6 @@
         }
 
 
-
-
-
         closeShowDataMessage = function () {
             $("#layui-layer-shade-x" + newIndexShade).remove();
             $("#showImportData").hide();

target/classes/templates/pages/depository/table-stock_mobile.html

@@ -163,6 +163,7 @@
                             + '<p>' + "物料型号：" + result[i].version + '</p>'
                             + brandItem
                             + '<p>' + "物料类型：" + result[i].typeName + '</p>'
+                            + '<p>' + "库存备注：" + result[i].iremark + '</p>'
                             + '</div></div></li>');
                     }
                     lis.push('</div>');
@@ -273,13 +274,19 @@
                             result = res.data;
                             lis.push("<div class='clearfix'>");
                             for (let i = 0; i < result.length; i++) {
+
+                                let brandItem = '<p>' + "物料品牌：" + result[i].brand + '</p>';
+                                if (result[i].brand === "") {
+                                    brandItem = "";
+                                }
                                 lis.push('<li style="width:100%;margin-top: 10px;float:left;border: 1px solid #9999996e;"><div class="layui-card  my-shadow my-card flow1" onclick="showDetail('
                                     + result[i].id + ')"><div class="layui-card-header"><h2>' + result[i].mname + '</h2></div>');
                                 lis.push('<div class="layui-col-md4 my-info" style="margin-left: 15px; color: #999;font-size: 15px;">'
-                                    + '<p>' + result[i].code + '</p>'
-                                    + '<p>' + result[i].version + '</p>'
-                                    + '<p>' + "品牌：" + result[i].brand + '</p>'
-                                    + '<p>' + result[i].typeName + '</p>'
+                                    + '<p>' + "物料编码：" + result[i].code + '</p>'
+                                    + '<p>' + "物料型号：" + result[i].version + '</p>'
+                                    + brandItem
+                                    + '<p>' + "物料类型：" + result[i].typeName + '</p>'
+                                    + '<p>' + "库存备注：" + result[i].iremark + '</p>'
                                     + '</div></div></li>');
                             }
                             lis.push('</div>');