问题修改

src/main/java/com/tld/model/AskGoods.java

@@ -272,4 +272,12 @@ public class AskGoods implements Serializable {
      * 子表id分录单id
      */
     private String documentPointsId;
+    /**
+     * 父表备注
+     */
+    private String remarkF;
+    /**
+     * 子表备注
+     */
+    private String remarkZ;
 }

src/main/java/com/tld/service/impl/InviteServiceImpl.java

@@ -461,6 +461,7 @@ public class InviteServiceImpl implements InviteService {
                     ag.setRequestTypeNumber(jsonMap.get("requestTypeNumber").toString());
                     ag.setRequestTypeName(jsonMap.get("requestTypeName").toString());
                     ag.setIfCommodity(jsonMap.get("ifCommodity").toString());
+                    ag.setRemarkF(jsonMap.get("remark").toString());//备注
                     //子表
                     ag.setEntryNumber(element.get("entryNumber").toString());
                     ag.setProductionCode(element.get("prodOrderNo").toString());//
@@ -470,6 +471,7 @@ public class InviteServiceImpl implements InviteService {
                     ag.setNum(element.get("orderCount").toString());
                     ag.setOutNum("0");
                     ag.setAskGoodsType("0");
+                    ag.setRemarkZ(element.get("remark").toString());//备注
                     askGoodsList.add(ag);
                 }
             }

src/main/resources/mapper/AskGoodsMapper.xml

@@ -1496,11 +1496,8 @@
     </select>
     <!--出库错误信息回调-->
     <select id="getOutgoingReturnError" resultType="com.tld.model.Error">
-        select id,url,error_info,data_val,scrq,type,transmission_type from tld_error_error
+        select id,url,error_info,data_val,scrq,type,transmission_type from tld_error_excel_parking
         where transmission_type = '1'
-        and type = '出库回传'
-        and scrq <![CDATA[>=]]> '2023-05-13'
-        and error_info like '%message%'
     </select>
     <!--查询销售出库导入数据-->
     <select id="getMarketList" resultType="com.tld.model.MarketReturn">
@@ -1607,9 +1604,8 @@
     </select>
     <!--转JSON-->
     <select id="getJsonError" resultType="com.tld.model.Error">
-        select id,url,error_info,data_val,scrq,type,transmission_type from tld_error_error
+        select id,url,error_info,data_val,scrq,type,transmission_type from tld_error_excel_parking
         where type = '出库回传'
-        and scrq <![CDATA[>=]]> '2023-05-13'
     </select>
     <select id="getProductionReturnError" resultType="com.tld.model.Error">
         select id,url,error_info,data_val,scrq,type,transmission_type from tld_error
@@ -1695,7 +1691,7 @@
     </update>
     <!--修改-->
     <update id="updJSONError">
-        update tld_error set data_val = #{dataVal} where id = #{id}
+        update tld_error_excel_parking set data_val = #{dataVal} where id = #{id}
     </update>
     <!--修改error-->
     <update id="updErrorParking">

src/main/resources/mapper/InviteMapper.xml

@@ -15,13 +15,13 @@
     </update>
     <!-- 新增要料申请单 -->
     <insert id="addAskGoods">
-        insert into tld_invite(ask_goods_id,entry_number,production_code,material_id,wbs,measurement_id,num,out_num,ask_goods_type)
-        values(#{askGoodsId},#{entryNumber},#{productionCode},#{materialId},#{wbs},#{measurementId},#{num},'0',#{askGoodsType})
+        insert into tld_invite(ask_goods_id,entry_number,production_code,material_id,wbs,measurement_id,num,out_num,ask_goods_type,remark)
+        values(#{askGoodsId},#{entryNumber},#{productionCode},#{materialId},#{wbs},#{measurementId},#{num},'0',#{askGoodsType},#{remarkZ})
     </insert>
     <!-- 新增要料申请单父级 -->
     <insert id="addAskGoodsf">
-        insert into tld_invite_f(ask_goods_id,ask_goods_code,company_number,sqrq,department,source_type,move_type,request_type_number,request_type_name,if_commodity)
-        values(#{askGoodsId},#{askGoodsCode},#{companyNumber},#{sqrq},#{department},#{sourceType},#{moveType},#{requestTypeNumber},#{requestTypeName},#{ifCommodity})
+        insert into tld_invite_f(ask_goods_id,ask_goods_code,company_number,sqrq,department,source_type,move_type,request_type_number,request_type_name,if_commodity,remark)
+        values(#{askGoodsId},#{askGoodsCode},#{companyNumber},#{sqrq},#{department},#{sourceType},#{moveType},#{requestTypeNumber},#{requestTypeName},#{ifCommodity},#{remarkF})
     </insert>
     <!-- 新增要料日志 -->
     <insert id="addAskGoodsLog">
@@ -354,25 +354,25 @@
     </insert>
     <!-- 移库通知单 -->
     <insert id="addWarehouseTransfer">
-        insert into tld_warehouse_transfer_f (warehouse_transfer_id, warehouse_transfer_code, ask_goods_warehouse_id, document_time, warehouse_transfer_type)
+        insert into tld_warehouse_transfer_f (warehouse_transfer_id, warehouse_transfer_code, ask_goods_warehouse_id, document_time, warehouse_transfer_type,remark)
         values
         <foreach collection="list" index="index" item="item" separator=",">
-            (#{item.transferNoticeOrderId},#{item.transferNoticeOrderNo},#{item.requestWarehouseId},#{item.docDate},#{item.moveType})
+            (#{item.transferNoticeOrderId},#{item.transferNoticeOrderNo},#{item.requestWarehouseId},#{item.docDate},#{item.moveType},#{item.remark})
         </foreach>
         ;
-        insert into tld_warehouse_transfer ( warehouse_transfer_id, entry_number, supply_warehouse_id, material_id, wbs, measurement_id, num, out_num, type,account_sleeve)
+        insert into tld_warehouse_transfer ( warehouse_transfer_id, entry_number, supply_warehouse_id, material_id, wbs, measurement_id, num, out_num, type,account_sleeve,remark)
         values
         <foreach collection="list" index="index" item="item" separator=",">
             <foreach collection="item.datalist" index="index" item="items" separator=",">
-                (#{item.transferNoticeOrderId},#{items.entryNo},#{items.supplyWarehouseId},#{items.materialId},#{items.WBS},#{items.measUnitId},#{items.orderCount},0,0,#{items.accountSleeve})
+                (#{item.transferNoticeOrderId},#{items.entryNo},#{items.supplyWarehouseId},#{items.materialId},#{items.WBS},#{items.measUnitId},#{items.orderCount},0,0,#{items.accountSleeve},#{items.remark})
             </foreach>
         </foreach>
         ;
-        insert into tld_warehouse_transfer_log (warehouse_transfer_id, warehouse_transfer_code, ask_goods_warehouse_id, document_time, warehouse_transfer_type, entry_number, supply_warehouse_id, material_id, wbs, measurement_id, num, out_num, type,account_sleeve)
+        insert into tld_warehouse_transfer_log (warehouse_transfer_id, warehouse_transfer_code, ask_goods_warehouse_id, document_time, warehouse_transfer_type, entry_number, supply_warehouse_id, material_id, wbs, measurement_id, num, out_num, type,account_sleeve,remark)
         values
         <foreach collection="list" index="index" item="item" separator=",">
             <foreach collection="item.datalist" index="index" item="items" separator=",">
-                (#{item.transferNoticeOrderId},#{item.transferNoticeOrderNo},#{item.requestWarehouseId},#{item.docDate},#{item.moveType},#{items.entryNo},#{items.supplyWarehouseId},#{items.materialId},#{items.WBS},#{items.measUnitId},#{items.orderCount},0,0,#{items.accountSleeve})
+                (#{item.transferNoticeOrderId},#{item.transferNoticeOrderNo},#{item.requestWarehouseId},#{item.docDate},#{item.moveType},#{items.entryNo},#{items.supplyWarehouseId},#{items.materialId},#{items.WBS},#{items.measUnitId},#{items.orderCount},0,0,#{items.accountSleeve},#{items.remark})
             </foreach>
         </foreach>
         ;