From c4b2cfbdc4b31a6e37a9b51c5f69620bd5e7841f Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期六, 23 八月 2025 08:38:58 +0800
Subject: [PATCH] wcs功能完善

---
 src/main/resources/mapper/LocDetlMapper.xml |   64 ++++++++++++++++++++++++-------
 1 files changed, 49 insertions(+), 15 deletions(-)

diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 26dabee..d3c1930 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -1,38 +1,68 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.asrs.mapper.LocDetlMapper">
+<mapper namespace="com.zy.mapper.LocDetlMapper">
 
     <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
-    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.LocDetl">
+    <resultMap id="BaseResultMap" type="com.zy.entity.LocDetl">
         <result column="loc_no" property="locNo" />
+        <result column="zpallet" property="zpallet" />
+        <result column="anfme" property="anfme" />
         <result column="matnr" property="matnr" />
         <result column="maktx" property="maktx" />
-        <result column="lgnum" property="lgnum" />
-        <result column="type" property="type" />
+        <result column="batch" property="batch" />
+        <result column="order_no" property="orderNo" />
+
+        <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="memo" property="memo" />
+        <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="man_length" property="manLength" />
+        <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="modi_user" property="modiUser" />
         <result column="modi_time" property="modiTime" />
         <result column="appe_user" property="appeUser" />
         <result column="appe_time" property="appeTime" />
+        <result column="memo" property="memo" />
+        <result column="standby1" property="standby1" />
+        <result column="standby2" property="standby2" />
+        <result column="standby3" property="standby3" />
+        <result column="box_type1" property="boxType1" />
+        <result column="box_type2" property="boxType2" />
+        <result column="box_type3" property="boxType3" />
+        <result column="box_type2" property="boxType2" />
+        <result column="box_type3" property="boxType3" />
     </resultMap>
 
     <sql id="stockOutCondition">
         <if test="loc_no!=null and loc_no!='' ">
             and a.loc_no like '%' + #{loc_no} + '%'
         </if>
-        <if test="matnr!=null and matnr!='' ">
-            and a.matnr like '%' + #{matnr} + '%'
+        <if test="matNo!=null and matNo!='' ">
+            and a.matnr like '%' + #{matNo} + '%'
         </if>
-        <if test="maktx!=null and maktx!='' ">
-            and a.maktx like '%' + #{maktx} + '%'
+        <if test="matName!=null and matName!='' ">
+            and a.maktx like '%' + #{matName} + '%'
         </if>
         <if test="anfme!=null and anfme!='' ">
             and a.anfme like '%' + #{anfme} + '%'
@@ -59,6 +89,10 @@
         ) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
     </select>
 
+    <select id="selectListByMatnr" resultMap="BaseResultMap">
+        select * from asr_loc_detl ald left join asr_loc_mast alm on ald.loc_no = alm.loc_no where alm.loc_sts = 'F' and ald.matnr = #{bucketType} order by alm.bay1,alm.lev1
+    </select>
+
     <select id="getStockOutPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
         select
         count(1)

--
Gitblit v1.9.1