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/MatMapper.xml | 42 +++++++++++++++++++++++++++++++++---------
1 files changed, 33 insertions(+), 9 deletions(-)
diff --git a/src/main/resources/mapper/MatMapper.xml b/src/main/resources/mapper/MatMapper.xml
index fc07fed..f199f1b 100644
--- a/src/main/resources/mapper/MatMapper.xml
+++ b/src/main/resources/mapper/MatMapper.xml
@@ -6,30 +6,45 @@
<resultMap id="BaseResultMap" type="com.zy.asrs.entity.Mat">
<id column="id" property="id" />
<result column="uuid" property="uuid" />
- <result column="node_id" property="nodeId" />
<result column="tag_id" property="tagId" />
<result column="matnr" property="matnr" />
<result column="maktx" property="maktx" />
<result column="name" property="name" />
<result column="specs" property="specs" />
<result column="model" property="model" />
- <result column="batch" property="batch" />
+ <result column="color" property="color" />
+ <result column="brand" property="brand" />
<result column="unit" property="unit" />
- <result column="barcode" property="barcode" />
- <result column="doc_id" property="docId" />
- <result column="doc_num" property="docNum" />
- <result column="cust_name" property="custName" />
- <result column="item_num" property="itemNum" />
- <result column="count" property="count" />
<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="create_by" property="createBy" />
<result column="create_time" property="createTime" />
<result column="update_by" property="updateBy" />
<result column="update_time" property="updateTime" />
<result column="memo" property="memo" />
-
+ <result column="store_max" property="storeMax" />
+ <result column="store_min" property="storeMin" />
+ <result column="store_max_date" property="storeMaxDate" />
<result column="stock" property="stock" />
</resultMap>
@@ -47,6 +62,7 @@
group by matnr
) as mld on mld.matnr = mm.matnr
WHERE 1=1
+ and (mm.memo is null or mm.memo != '鎵撳寘涓婄嚎')
AND (CHARINDEX(','+#{tagId}+',', ','+mt.path+',') > 0 OR mt.id = #{tagId})
<if test="matnr != null and matnr != ''">
and mm.matnr like concat('%',#{matnr},'%')
@@ -54,10 +70,18 @@
<if test="maktx != null and maktx != ''">
and mm.maktx like concat('%',#{maktx},'%')
</if>
+ <if test="specs != null and specs != ''">
+ and mm.specs like concat('%',#{specs},'%')
+ </if>
ORDER BY mm.create_time DESC
</select>
<select id="selectByMatnr" resultMap="BaseResultMap">
select top 1 * from man_mat where 1=1 and matnr = #{matnr}
</select>
+
+ <select id="selectByBarcode" resultMap="BaseResultMap">
+ select top 1 * from man_mat where 1=1 and barcode = #{barcode}
+ </select>
+
</mapper>
--
Gitblit v1.9.1