From d2be6e4afe1dba009b56f8555792f2823f9e4535 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期一, 22 二月 2021 10:34:59 +0800
Subject: [PATCH] 订单入库备货领取的返回 和修改 试剂直接入库和试剂管理 的搜索排序

---
 src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml |   74 ++++++++++++++++++++++++++++++++++++-
 1 files changed, 72 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml b/src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml
index 1fb781b..76dd4c5 100644
--- a/src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml
@@ -60,8 +60,12 @@
     <result property="applyCode" column="apply_code"></result>
     <result property="num" column="num"></result>
     <result property="used" column="used"></result>
-       <result property="status" column="status" typeHandler="com.nanometer.smartlab.entity.handler.ApplyStatusHandler"></result>
+    <result property="arrivalNum" column="arrival_num"></result>
+    <result property="status" column="status" typeHandler="com.nanometer.smartlab.entity.handler.ApplyStatusHandler"></result>
     <result property="applyUserId" column="apply_user_id"></result>
+    <result property="applyUser" column="apply_user"></result>
+    <result property="arrivalTime" column="arrival_time"></result>
+    <result property="articleNumber" column="articleNumber"></result>
     <result property="projectManage" column="projectManage"/>
     <result property="project" column="project"/>
     <association property="reagent" javaType="com.nanometer.smartlab.entity.SysReagent">
@@ -357,6 +361,16 @@
         LEFT JOIN sys_user as su1 on su1.id = project.sys_user_id
         where oa.valid_flag = 1 and (oa.status=4 or oa.status=6)
         <include refid="getOpeApplyReserveList_queryWhereSql" />
+        <if test="isAllApply != null">
+            <choose>
+                <when test="isAllApply == 1">
+                    and oa.used = oa.num
+                </when>
+                <otherwise>
+                    and oa.used != oa.num
+                </otherwise>
+            </choose>
+        </if>
         GROUP BY oa.id
         )as oaa
     </select>
@@ -395,10 +409,12 @@
         bm1.meta_value productHome,
         sr.dangerous_flag,
         oa.num,
+        oa.apply_user_id apply_user,
         oa.used,
         su.`name` apply_user_id,
         su.project,
-        su1.`name` as projectManage
+        su1.`name` as projectManage,
+        oa.arrival_time
         FROM
         ope_apply AS oa
         LEFT JOIN sys_reagent sr ON sr.id = oa.reagent_id
@@ -411,6 +427,16 @@
         LEFT JOIN sys_user as su1 on su1.id = project.sys_user_id
         where oa.valid_flag = 1 and (oa.status=4 or oa.status=6)
         <include refid="getOpeApplyReserveList_queryWhereSql" />
+        <if test="isAllApply != null">
+            <choose>
+                <when test="isAllApply == 1">
+                    and oa.used = oa.num
+                </when>
+                <otherwise>
+                    and oa.used != oa.num
+                </otherwise>
+            </choose>
+        </if>
         GROUP BY oa.id
         order by oa.update_time desc
         <if test="first != null and pageSize != null">
@@ -429,8 +455,52 @@
     <select id="selectByReId" resultMap="OpeApply">
         select * from ope_apply where reagent_id=#{id}
     </select>
+    <select id="getOpeApplyDetail" resultMap="OpeApplyReserve">
+        select oa.id, oa.apply_code,
+		sr.id reagent_id,
+		oa.status,
+		sr.product_sn reagentProductSn,
+		sr.`name` reagentName,
+		bm2.meta_value controlProducts,
+		bm3.meta_value reagentFormat,
+		sr.main_metering reagentMainMetering,
+		sr.price reagentPrice,
+		sr.cas reagentCas,
+		oa.article_number articleNumber,
+		bm4.meta_value reagentCharacter,
+		bm1.meta_value productHome,
+		sr.dangerous_flag,
+		oa.num,
+		oa.used,
+		oa.arrival_num,
+		su.id apply_user_id
+        from ope_apply as oa
+        left JOIN sys_reagent sr on sr.id = oa.reagent_id
+        left JOIN sys_user su on su.id = oa.apply_user_id
+        left join base_meta as bm2 on sr.control_products = bm2.id
+        left join base_meta as bm3 on sr.reagent_format = bm3.id
+        left join base_meta as bm4 on sr.reagent_character = bm4.id
+        left join base_meta as bm1 on sr.product_home = bm1.id
+        where oa.valid_flag = 1
+        and oa.id = #{0}
+    </select>
+
 
     <update id="updateByReId" parameterType="java.util.Map">
         update ope_apply set reagent_id=#{newReId} where reagent_id=#{oldReId}
     </update>
+
+    <update id="updateOpeApplyInfo" parameterType="java.util.Map">
+        update
+        ope_apply
+        set status = #{status}
+        <if test="arrivalTime!=null" >
+            ,arrival_time = #{arrivalTime}
+        </if>
+        <if test="consigneeId!=null" >
+            ,consignee_id = #{consigneeId}
+        </if>
+        where valid_flag = 1
+        and id = #{applyId}
+    </update>
 </mapper>

--
Gitblit v1.9.2