2026.4.13 早

接口回传，以及接口接收直接审核，回传表修改

ruoyi-admin/src/main/resources/mapper/in/InStockinDetailBackMapper.xml

@@ -42,13 +42,55 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="sendStatus"    column="send_status"/>
         <result property="sendTime"   column="send_time"/>
         <result property="msg"     column="msg"/>
+        <result property="sourceLineId"     column="source_line_id"/>
+        <result property="barCode"     column="bar_code"/>
+        <result property="isBatchManage"     column="is_batch_manage"/>
+        <result property="oldProjectNo"     column="old_project_no"/>
     </resultMap>
 
     <sql id="selectInStockinDetailBackVo">
-        select stockin_detail_id, stockin_guid, stockin_id, lot_no, product_guid, product_id, quantity,
-               quantity_x, quantity_j, price, cargo_no, remark, assign_num, assign_num_x, assign_num_j,
-               print_date, stock_status, supplier_id, customer_id, unit, spec, spare1, spare2, spare3,
-               spare4, spare5, spare6, scan_num, scan_num_x, scan_num_j, spare7, spare8, spare9, product_name,send_status,send_time,msg from in_stockin_detail_back
+        select stockin_detail_id,
+               stockin_guid,
+               stockin_id,
+               lot_no,
+               product_guid,
+               product_id,
+               quantity,
+               quantity_x,
+               quantity_j,
+               price,
+               cargo_no,
+               remark,
+               assign_num,
+               assign_num_x,
+               assign_num_j,
+               print_date,
+               stock_status,
+               supplier_id,
+               customer_id,
+               unit,
+               spec,
+               spare1,
+               spare2,
+               spare3,
+               spare4,
+               spare5,
+               spare6,
+               scan_num,
+               scan_num_x,
+               scan_num_j,
+               spare7,
+               spare8,
+               spare9,
+               product_name,
+               send_status,
+               send_time,
+               msg,
+               source_line_id,
+               bar_code,
+               is_batch_manage,
+               old_project_no
+        from in_stockin_detail_back
     </sql>
 
     <select id="selectInStockinDetailBackList" parameterType="InStockinDetailBack" resultMap="InStockinDetailBackResult">

ruoyi-admin/src/main/resources/mapper/in/InStockinDetailMapper.xml

@@ -143,6 +143,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="scanNumX != null">scan_num_x,</if>
             <if test="scanNumJ != null">scan_num_j,</if>
             <if test="productName != null">product_name,</if>
+            <if test="sourceLineId != null">source_line_id,</if>
+            <if test="barCode != null">bar_code,</if>
+            <if test="isBatchManage != null">is_batch_manage,</if>
+            <if test="oldProjectNo != null">old_project_no,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="stockinDetailId != null">#{stockinDetailId},</if>
@@ -180,6 +184,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="scanNumX != null">#{scanNumX},</if>
             <if test="scanNumJ != null">#{scanNumJ},</if>
             <if test="productName != null">#{productName},</if>
+
+            <if test="sourceLineId != null">#{sourceLineId},</if>
+            <if test="barCode != null">#{barCode},</if>
+            <if test="isBatchManage != null">#{isBatchManage},</if>
+            <if test="oldProjectNo != null">#{oldProjectNo},</if>
+
          </trim>
     </insert>
     <insert id="insertInStockinDetailList">

ruoyi-admin/src/main/resources/mapper/in/InStockinMapper.xml

@@ -28,6 +28,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="spare4"    column="spare4"    />
         <result property="spare3"    column="spare3"    />
         <result property="spare5"    column="spare5"    />
+        <result property="companyShortName"    column="company_short_name"    />
+        <result property="accountSetNo"    column="account_set_no"    />
     </resultMap>
 
     <sql id="selectInStockinVo">
@@ -138,6 +140,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="spare4 != null">spare4,</if>
             <if test="spare3 != null">spare3,</if>
             <if test="spare5 != null">spare5,</if>
+            <if test="companyShortName != null">company_short_name,</if>
+            <if test="accountSetNo != null">account_set_no,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="stockinGuid != null">#{stockinGuid},</if>
@@ -159,6 +163,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="spare4 != null">#{spare4},</if>
             <if test="spare3 != null">#{spare3},</if>
             <if test="spare5 != null">#{spare5},</if>
+            <if test="company_short_name != null">#{companyShortName},</if>
+            <if test="account_set_no != null">#{accountSetNo},</if>
          </trim>
     </insert>
     <insert id="insertInStockinHistory">
@@ -187,6 +193,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="spare4 != null">spare4 = #{spare4},</if>
             <if test="spare3 != null">spare3 = #{spare3},</if>
             <if test="spare5 != null">spare5 = #{spare5},</if>
+            <if test="companyShortName != null">company_short_name = #{companyShortName},</if>
+            <if test="accountSetNo != null">account_set_no = #{accountSetNo},</if>
         </trim>
         where stockin_guid = #{stockinGuid}
     </update>

ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailMapper.xml

@@ -141,6 +141,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="spare7 != null">spare7,</if>
             <if test="spare8 != null">spare8,</if>
             <if test="spare9 != null">spare9,</if>
+            <if test="sourceLineId != null">source_line_id,</if>
+            <if test="barCode != null">bar_code,</if>
+            <if test="isBatchManage != null">is_batch_manage,</if>
+            <if test="oldProjectNo != null">old_project_no,</if>
 
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -181,6 +185,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="spare7 != null">#{spare7},</if>
         <if test="spare8 != null">#{spare8},</if>
         <if test="spare9 != null">#{spare9},</if>
+        <if test="sourceLineId != null">#{sourceLineId},</if>
+        <if test="barCode != null">#{barCode},</if>
+        <if test="isBatchManage != null">#{isBatchManage},</if>
+        <if test="oldProjectNo != null">#{oldProjectNo},</if>
 </trim>
     </insert>
 

ruoyi-admin/src/main/resources/mapper/out/OutStockoutMapper.xml

@@ -107,6 +107,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="spare6 != null">spare6,</if>
             <if test="spare7 != null">spare7,</if>
             <if test="spare8 != null">spare8,</if>
+            <if test="companyShortName != null">company_short_name,</if>
+            <if test="accountSetNo != null">account_set_no,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="stockoutGuid != null and stockoutGuid != ''">#{stockoutGuid},</if>
@@ -132,6 +134,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="spare6 != null">#{spare6},</if>
             <if test="spare7 != null">#{spare7},</if>
             <if test="spare8 != null">#{spare8},</if>
+            <if test="companyShortName != null">#{companyShortName},</if>
+            <if test="accountSetNo != null">#{accountSetNo},</if>
          </trim>
     </insert>
 
@@ -159,6 +163,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="spare4 != null">spare4 = #{spare4},</if>
             <if test="spare3 != null">spare3 = #{spare3},</if>
             <if test="spare5 != null">spare5 = #{spare5},</if>
+            <if test="companyShortName != null">company_short_name = #{companyShortName},</if>
+            <if test="accountSetNo != null">account_set_no = #{accountSetNo},</if>
         </trim>
         where stockout_guid = #{stockoutGuid}
     </update>