From 6f7a815b2d6e4f30e7ccf901b24d5103aaa72078 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 25 十二月 2023 10:23:08 +0800
Subject: [PATCH] Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1

---
 src/main/resources/mapper/WaitPakinMapper.xml |   42 +++++++++++++++++++++++++++++++-----------
 1 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/src/main/resources/mapper/WaitPakinMapper.xml b/src/main/resources/mapper/WaitPakinMapper.xml
index c8fea64..e4227b7 100644
--- a/src/main/resources/mapper/WaitPakinMapper.xml
+++ b/src/main/resources/mapper/WaitPakinMapper.xml
@@ -4,29 +4,49 @@
 
     <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
     <resultMap id="BaseResultMap" type="com.zy.asrs.entity.WaitPakin">
+        <result column="zpallet" property="zpallet" />
+        <result column="loc_no" property="locNo" />
+        <result column="anfme" property="anfme" />
         <result column="matnr" property="matnr" />
         <result column="maktx" property="maktx" />
         <result column="batch" property="batch" />
         <result column="order_no" property="orderNo" />
-        <result column="lgnum" property="lgnum" />
-        <result column="type" property="type" />
+
+        <result column="specs" property="specs" />
+        <result column="model" property="model" />
         <result column="color" property="color" />
-        <result column="supplier" property="supplier" />
-        <result column="warehouse" property="warehouse" />
         <result column="brand" property="brand" />
-        <result column="anfme" property="anfme" />
-        <result column="altme" property="altme" />
-        <result column="zpallet" property="zpallet" />
-        <result column="bname" property="bname" />
-        <result column="loc_no" property="locNo" />
+        <result column="unit" property="unit" />
+        <result column="price" property="price" />
+        <result column="sku" property="sku" />
+        <result column="units" property="units" />
+        <result column="barcode" property="barcode" />
+        <result column="origin" property="origin" />
+        <result column="manu" property="manu" />
+        <result column="manu_date" property="manuDate" />
+        <result column="item_num" property="itemNum" />
+        <result column="safe_qty" property="safeQty" />
+        <result column="weight" property="weight" />
+        <result column="length" property="length" />
+        <result column="volume" property="volume" />
+        <result column="three_code" property="threeCode" />
+        <result column="supp" property="supp" />
+        <result column="supp_code" property="suppCode" />
+        <result column="be_batch" property="beBatch" />
+        <result column="dead_time" property="deadTime" />
+        <result column="dead_warn" property="deadWarn" />
+        <result column="source" property="source" />
+        <result column="inspect" property="inspect" />
+        <result column="danger" property="danger" />
+
         <result column="status" property="status" />
         <result column="io_status" property="ioStatus" />
-        <result column="memo" property="memo" />
+
         <result column="modi_time" property="modiTime" />
         <result column="modi_user" property="modiUser" />
         <result column="appe_time" property="appeTime" />
         <result column="appe_user" property="appeUser" />
-
+        <result column="memo" property="memo" />
     </resultMap>
 
 </mapper>

--
Gitblit v1.9.1