From 7662fa301047282fd582f1d1846bdc38000ded8c Mon Sep 17 00:00:00 2001
From: erdanergou <p17686264821@163.com>
Date: Thu, 6 Apr 2023 09:13:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=BB=E5=8A=A8=E7=AB=AF?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2=E8=B7=B3=E8=BD=AC=E5=88=B0?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=E7=94=B3=E8=AF=B7=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/pages/group/group_edit_mobile.html  | 6 +++++-
 .../depository_manage/mapper/DepositoryRecordMapper.xml     | 3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/templates/pages/group/group_edit_mobile.html b/src/main/resources/templates/pages/group/group_edit_mobile.html
index 0b57ee52..fcb9b96d 100644
--- a/src/main/resources/templates/pages/group/group_edit_mobile.html
+++ b/src/main/resources/templates/pages/group/group_edit_mobile.html
@@ -103,12 +103,16 @@
                     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].mid + ')"><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 style="font-size: large">' + "物料编码：" + result[i].mcode + '</p>'
                             + '<p>' + "物料型号：" + result[i].version + '</p>'
-                            + '<p>' + "物料品牌：" + result[i].brand + '</p>'
+                            + brandItem
                             + '<p>' + "包含数量：" + result[i].quantity + ":" + result[i].showUnit + '</p>'
                             + '<p style="text-align: right">' + "创建时间：" + result[i].showCreateTime + '</p>'
                             + '</div></div></li>');
diff --git a/target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml b/target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml
index e0ad3769..0fc58090 100644
--- a/target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml
+++ b/target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml
@@ -84,6 +84,7 @@
         <result column="airstate" property="airstate" jdbcType="VARCHAR"/>
         <result column="airapproverMessage" property="airapproverMessage" jdbcType="VARCHAR"/>
         <result column="mbrand" property="mbrand" jdbcType="VARCHAR"/>
+        <result column="pkingdeecode" property="pkingdeecode" jdbcType="VARCHAR"/>
 
     </resultMap>
 
@@ -169,7 +170,7 @@
     </sql>
 
     <sql id="ApplicationInRecordInfo">
-        airid,did,airmproducedDate,mname,quantity,price,tname,applicant_time,aircode,dname,applicant_id,applyRemark,mcode,mversion,munit,mtexture,mkingdeecode,mdepositoryCode,airUnit,flagForGroup,mid,airPlaceId,airapproverPass,airapproverTime,airapproverId,airstate,airapproverMessage,airtoGroupId,mbrand
+        airid,did,airmproducedDate,mname,quantity,price,tname,applicant_time,aircode,dname,applicant_id,applyRemark,mcode,mversion,munit,mtexture,mkingdeecode,mdepositoryCode,airUnit,flagForGroup,mid,airPlaceId,airapproverPass,airapproverTime,airapproverId,airstate,airapproverMessage,airtoGroupId,mbrand,pkingdeecode
     </sql>
 
     <sql id="ApplicationOutRecordInfo">