From f42983b35c738a28ed4b9d1732d1045c5f2a19bb Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期日, 09 五月 2021 16:57:12 +0800
Subject: [PATCH] 优化代码

---
 java110-db/src/main/resources/mapper/store/PurchaseApplyServiceDaoImplMapper.xml |   20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/store/PurchaseApplyServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/store/PurchaseApplyServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index a4149b8..706d524
--- a/java110-db/src/main/resources/mapper/store/PurchaseApplyServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/store/PurchaseApplyServiceDaoImplMapper.xml
@@ -23,6 +23,7 @@
             <id property="id" column="id"/>
             <result property="applyOrderId" column="applyOrderId"/>
             <result property="resId" column="resId"/>
+            <result column="rsId" property="rsId"/>
             <result property="quantity" column="quantity"/>
             <result property="resName" column="resName"/>
             <result property="remark" column="remark"/>
@@ -60,18 +61,22 @@
 
     <!-- 淇濆瓨閲囪喘鏄庣粏琛�-->
     <insert id="savePurchaseApplyDetailInfo" parameterType="List">
-        insert into purchase_apply_detail (id,apply_order_id,res_id,quantity,remark,b_id,operate,status_cd)
+        insert into purchase_apply_detail (id,rs_id,apply_order_id,res_id,quantity,remark,b_id,operate,status_cd,price,purchase_quantity,purchase_remark)
         values
         <foreach collection="list" item="item" index="index" separator=",">
             (
             #{item.id},
+            #{item.rsId},
             #{item.applyOrderId},
             #{item.resId},
             #{item.quantity},
             #{item.remark},
             '-1',
             'ADD',
-            '0'
+            '0',
+            #{item.price},
+            #{item.purchaseQuantity},
+            #{item.purchaseRemark}
             )
         </foreach>
     </insert>
@@ -194,7 +199,10 @@
         t.end_user_tel,
         t.end_user_name endUserName,
         t.end_user_tel endUserTel,
-        t.description
+        t.description,
+        t.create_user_id createUserId,
+        t.create_user_name createUserName,
+        t.warehousing_way warehousingWay
         from purchase_apply t
         inner join t_dict d on t.state = d.status_cd and d.table_name = 'purchase_apply' and d.table_columns = 'state'
         where 1 = 1
@@ -297,7 +305,7 @@
         select
         p.id,
         p.apply_order_id applyOrderId,
-        p.res_id resId,p.quantity,p.remark,
+        p.res_id resId,p.quantity,p.remark,p.purchase_quantity purchaseQuantity,p.purchase_remark purchaseRemark,p.price purchasePrice,
         r.res_name resName,r.res_code resCode,
         r.price,r.stock
         from
@@ -400,8 +408,8 @@
     <!-- 淇濆瓨閲囪喘鐢宠淇℃伅 add by wuxw 2018-07-03 -->
     <insert id="savePurchaseApply" parameterType="Map">
         insert into purchase_apply
-        (status_cd,res_order_type,description,apply_order_id,state,store_id,user_id,user_name,b_id,end_user_name,end_user_tel,create_time)
+        (status_cd,res_order_type,description,apply_order_id,state,store_id,user_id,user_name,b_id,end_user_name,end_user_tel,create_time,create_user_id,create_user_name,warehousing_way)
         values
-        ('0',#{resOrderType},#{description},#{applyOrderId},#{state},#{storeId},#{userId},#{userName},'-1',#{endUserName},#{endUserTel},#{createTime})
+        ('0',#{resOrderType},#{description},#{applyOrderId},#{state},#{storeId},#{userId},#{userName},'-1',#{endUserName},#{endUserTel},#{createTime},#{createUserId},#{createUserName},#{warehousingWay})
     </insert>
 </mapper>

--
Gitblit v1.8.0