From ed72baa5f60f2d86cc58799ce96c658321a54d79 Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期五, 30 四月 2021 13:53:54 +0800
Subject: [PATCH] 1.erp立库出库对接 2.erp平仓出库对接
---
src/main/resources/mapper/OutStockMapper.xml | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/src/main/resources/mapper/OutStockMapper.xml b/src/main/resources/mapper/OutStockMapper.xml
index 39dc53d..0a706d7 100644
--- a/src/main/resources/mapper/OutStockMapper.xml
+++ b/src/main/resources/mapper/OutStockMapper.xml
@@ -17,7 +17,9 @@
<result column="FSourceBillNo" property="FSourceBillNo"/>
<result column="FBillNo" property="FBillNo"/>
<result column="FAdd" property="FAdd"/>
- <result column="workRecord" property="workRecord"/>
+ <result column="Fname" property="Fname" />
+ <result column="Fmodel" property="Fmodel" />
+ <result column="Fflag_finish" property="FflagFinish" />
</resultMap>
<!-- asr_loc_detl鏄犲皠缁撴灉 -->
@@ -43,6 +45,8 @@
<result column="mat_status" property="matStatus" />
</resultMap>
+
+
<sql id="stockOutCondition">
<if test="FBillNo!=null and FBillNo!='' ">
and b.FBillNo like '%' + #{FBillNo} + '%'
@@ -54,14 +58,16 @@
(
select ROW_NUMBER() over (order by a.FInterID,a.FEntryID) as row,a.FBrNo,a.FInterID,a.FEntryID,
a.FOrderInterID,a.FAuxQty,a.FCommitQty,a.FAuxPrice,a.FDate,a.FNote, a.Fnumber, a.FSourceBillNo, b.FBillNo,
- b.FAdd,
- ((select COUNT(*) from asr_wrk_detl where warehouse = b.FBillNo and matnr = a.Fnumber) + (select COUNT(*) from asr_wrk_detl_log where warehouse = b.FBillNo and matnr = a.Fnumber)) as workRecord
+ b.FAdd,b.Fflag_finish, a.Fname, a.Fmodel
from OutStockBillEntry a left join OutStockBill b on a.FInterID = b.FInterID
where 1=1
- <if test="FBillNo!=null and FBillNo!='' ">
+ <if test="FSourceBillNo!=null and FSourceBillNo!='' ">
+ and a.FSourceBillNo = #{FSourceBillNo}
+ </if>
+ <if test="FBillNo != null and FBillNo != ''">
and b.FBillNo = #{FBillNo}
</if>
- ) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize}) and workRecord = 0
+ ) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
</select>
<select id="queryOutStockCount" parameterType="java.util.Map" resultType="java.lang.Integer">
@@ -75,10 +81,9 @@
<select id="queryMatnrWithBillNo" resultMap="OutStockResultMap">
select * from (select ROW_NUMBER() over (order by a.FInterID,a.FEntryID) as row,a.FBrNo,a.FInterID,a.FEntryID,
a.FOrderInterID,a.FAuxQty,a.FCommitQty,a.FAuxPrice,a.FDate,a.FNote, a.Fnumber, a.FSourceBillNo, b.FBillNo,
- b.FAdd,
- ((select COUNT(*) from asr_wrk_detl where warehouse = b.FBillNo and matnr = a.Fnumber) + (select COUNT(*) from asr_wrk_detl_log where warehouse = b.FBillNo and matnr = a.Fnumber)) as workRecord
+ b.FAdd
from OutStockBillEntry a left join OutStockBill b on a.FInterID = b.FInterID
- where b.FBillNo = #{FBillNo}) t where t.workRecord = 0
+ where b.FBillNo = #{FBillNo}) t where 1 = 1
</select>
<select id="queryMatWithLoc" resultMap="BaseResultMap">
@@ -106,4 +111,8 @@
end
desc
</select>
+
+ <select id="queryOutStockFInterID" resultType="integer">
+ select FInterID from OutStockBill where FBillNo = #{supplier}
+ </select>
</mapper>
--
Gitblit v1.9.1