xiaochen 2 år sedan
förälder
incheckning
d2ad543f04

+ 10 - 0
src/main/java/com/tld/controller/AskGoodsController.java

@@ -414,4 +414,14 @@ public class AskGoodsController {
         askGoodsService.jsonError();
     }
 
+
+    /**
+     * 生产收货错误信息回调
+     * */
+    @GetMapping("ProductionReturnError")
+    @PassToken
+    public void ProductionReturnError(){
+        askGoodsService.ProductionReturnError();
+    }
+
 }

+ 4 - 0
src/main/java/com/tld/mapper/AskGoodsMapper.java

@@ -227,4 +227,8 @@ public interface AskGoodsMapper {
     List<Error> otherWarehousingReturnError();
 
     List<Error> getJsonError();
+
+    void updJSONError(Error error);
+
+    List<Error> getProductionReturnError();
 }

+ 3 - 0
src/main/java/com/tld/service/AskGoodsService.java

@@ -97,4 +97,7 @@ public interface AskGoodsService {
     void otherWarehousingReturnError();
 
     void jsonError();
+
+    void ProductionReturnError();
+
 }

+ 16 - 1
src/main/java/com/tld/service/impl/AskGoodsServiceImpl.java

@@ -1850,17 +1850,32 @@ public class AskGoodsServiceImpl implements AskGoodsService {
      * */
     @Override
     public void jsonError() {
+        //转JSON
         List<Error> errorList = askGoodsMapper.getJsonError();
         for (Error error : errorList) {
             System.out.println("字符串为:"+error.getDataVal());
             JSONObject jsonObject = JSONObject.parseObject(error.getDataVal());
-
             JSONObject jsonObject1 = JSONObject.parseObject(jsonObject.get("strJson").toString());
 
             JSONObject jsonObject2 = new JSONObject();
             jsonObject2.put("strJson",jsonObject1.toJSONString());
 
             System.out.println("toJsonString字符串为:"+ jsonObject2.toJSONString());
+
+            error.setDataVal(jsonObject2.toJSONString());
+            //修改
+            askGoodsMapper.updJSONError(error);
+        }
+    }
+
+    /**
+     * 生产收货错误信息回调
+     * */
+    @Override
+    public void ProductionReturnError() {
+        List<Error> list = askGoodsMapper.getProductionReturnError();
+        for (Error error : list) {
+            queryListService.anew(error);
         }
     }
 

+ 15 - 3
src/main/resources/mapper/AskGoodsMapper.xml

@@ -1471,9 +1471,11 @@
     </select>
     <!--出库错误信息回调-->
     <select id="getOutgoingReturnError" resultType="com.tld.model.Error">
-        select id,url,error_info,data_val,scrq,type,transmission_type from tld_error
-        where transmission_type = '3'
+        select id,url,error_info,data_val,scrq,type,transmission_type from tld_error_error
+        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">
@@ -1578,10 +1580,16 @@
         where transmission_type = '1'
         and type = '其它入库'
     </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
+        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
         where transmission_type = '3'
-        and type = '出库回传'
+        and type = '生产收货'
     </select>
     <!-- 修改数据传输状态 -->
     <update id="updateRemoval">
@@ -1606,4 +1614,8 @@
     <update id="UpdSerial">
         update tld_removal_half set serial = #{serial} where id = #{id}
     </update>
+    <!--修改-->
+    <update id="updJSONError">
+        update tld_error_error set data_val = #{dataVal} where id = #{id}
+    </update>
 </mapper>