问题修改

src/main/java/com/tld/controller/GsPlugOutController.java

@@ -31,7 +31,7 @@ public class GsPlugOutController {
 
     /**
      * 出库回传---生产领用单/非生产领用出库单
-     * @param removalCode 参数
+     * @param removalCode 要货申请单id
      */
     @GetMapping("plugOutRemoval")
     public void plugOutRemoval(String removalCode){

src/main/java/com/tld/mapper/AskGoodsMapper.java

@@ -93,4 +93,11 @@ public interface AskGoodsMapper {
     List<Inventory> getInventoryInfo(AskGoods askGoods);
 
     List<String> getWarehouseWhere(String removalCode);
+
+    void delPlugOutRemoval(@Param("removalCode") String removalCode);
+
+    void delRemovalz(@Param("removalCode") String removalCode);
+
+    void addAccess(@Param("names") String names, @Param("returnGsRemoval") String returnGsRemoval, @Param("accessType") String accessType);
+
 }

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

@@ -306,24 +306,43 @@ public class AskGoodsServiceImpl implements AskGoodsService {
             HttpClientUtil httpClientUtil1 = new HttpClientUtil();
             Map<String, Object> result = httpClientUtil1.doPost("http://42.159.85.29:52480/cwbase/sg/V1/ERP/TELD/DEVTEST/API_WMS_PurInStock/CreateProductiveOutStock", returnData);
             System.out.println("result："+result);
-            if (Integer.parseInt(result.get("msg").toString()) != 200) {
-                if (Integer.parseInt(result.get("msg").toString()) != 400){
-                    List<Map<String, Object>> data = (List<Map<String, Object>>) result.get("data");
-                    System.out.println("data："+data);
-                    for (Map<String, Object> datum : data) {
-                        if (datum.get("State").equals("0")){
+            Error error = new Error();
+            if(Integer.parseInt(result.get("msg").toString()) != 200){
+                //如果失败存入报错信息跟数据
+                error.setErrorInfo(result.get("data").toString());
+                error.setUrl("http://42.159.85.29:52480/cwbase/sg/V1/ERP/TELD/DEVTEST/API_WMS_PurInStock/CreateProductiveOutStock");
+                error.setDataVal(returnData.toJSONString());
+                errorMapper.addError(error);
+            }else {
+                JSONObject jsonObject = (JSONObject) JSONObject.parse(result.get("data").toString());
+                JSONObject jsonObject1 = (JSONObject) JSONObject.parse(jsonObject.get("result").toString());
+                if ( jsonObject1.get("State").toString().equals("0") ){
+                    //如果失败存入报错信息跟数据
+                    error.setErrorInfo(jsonObject1.get("Msg").toString());
+                    error.setUrl("http://42.159.85.29:52480/cwbase/sg/V1/ERP/TELD/DEVTEST/API_WMS_PurInStock/CreateProductiveOutStock");
+                    error.setDataVal(returnData.toJSONString());
+                    errorMapper.addError(error);
+                }else {
+                    List<JSONObject>  data1 = (List<JSONObject>) JSONObject.parse(jsonObject1.get("data").toString());
+                    for (JSONObject map : data1) {
+                        if (map.get("State").toString().equals("0")){
                             //如果失败存入报错信息跟数据
-                            Error error = new Error()
-                                    .setErrorInfo(datum.toString())
-                                    .setUrl("http://42.159.85.29:52480/cwbase/sg/V1/ERP/TELD/DEVTEST/API_WMS_PurInStock/CreateProductiveOutStock")
-                                    .setDataVal(JSON.toJSONString(returnData));
+                            error.setErrorInfo(map.get("FailReason").toString());
+                            error.setUrl("http://42.159.85.29:52480/cwbase/sg/V1/ERP/TELD/DEVTEST/API_WMS_PurInStock/CreateProductiveOutStock");
+                            error.setDataVal(map.toString());
                             errorMapper.addError(error);
                         }
                     }
-                }else {
-                    System.out.println("报错信息为:"+result.get("data"));
                 }
             }
+            //删除父子表信息
+            askGoodsMapper.delPlugOutRemoval(removalCode);
+            askGoodsMapper.delRemovalz(removalCode);
+            //添加记录到tld_access
+            String names = "出库回传" ;
+            String accessType = "1" ;
+            String returnGsRemoval = returnData.toString() ;
+            askGoodsMapper.addAccess(names,returnGsRemoval,accessType);
         }catch (Exception e){
             e.printStackTrace();
         }

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

@@ -268,15 +268,27 @@ public class WarehousingServiceImpl implements WarehousingService {
 
 
                 HttpClientUtil httpClientUtil1 = new HttpClientUtil();
-                Map<String, Object> result = httpClientUtil1.doPost("http://42.159.85.29:52480/cwbase/sg/V1/ERP/TELD/DEVTEST/API_WMS_PurInStock/CreatePurInStock", returnData);
+                Map<String, Object> result = httpClientUtil1.doPost("http://42.159.85.29:52480/cwbase/sg/V1/ERP/TELD/DEVTEST/API_WMS_PurInStock/CreateProductiveOutStock", returnData);
+                Error error = new Error();
+
                 if(Integer.parseInt(result.get("msg").toString()) != 200){
                     //如果失败存入报错信息跟数据
-                    Error error = new Error()
-                            .setErrorInfo(result.get("data").toString())
-                            .setUrl("http://42.159.85.29:52480/cwbase/sg/V1/ERP/TELD/DEVTEST/API_WMS_PurInStock/CreatePurInStock")
-                            .setDataVal(strJson.toJSONString());
+                    error.setErrorInfo(result.get("data").toString());
+                    error.setUrl("http://42.159.85.29:52480/cwbase/sg/V1/ERP/TELD/DEVTEST/API_WMS_PurInStock/CreateProductiveOutStock");
+                    error.setDataVal(returnData.toJSONString());
                     errorMapper.addError(error);
+                }else {
+                    Map<String,Object> data = (Map<String, Object>) result.get("data");
+                    if ( data.get("State").toString().equals("0") ){
+                        //如果失败存入报错信息跟数据
+                        error.setErrorInfo(result.get("data").toString());
+                        error.setUrl("http://42.159.85.29:52480/cwbase/sg/V1/ERP/TELD/DEVTEST/API_WMS_PurInStock/CreateProductiveOutStock");
+                        error.setDataVal(returnData.toJSONString());
+                        errorMapper.addError(error);
+                    }
                 }
+                //删除父子表信息
+                //添加记录到tld_access
             }
         }catch (Exception e){
             e.printStackTrace();

src/main/resources/mapper/AskGoodsMapper.xml

@@ -245,6 +245,11 @@
         insert into tld_return_gs_removal(document_id,removal_code,source_type,move_type,scrq,delivery_type)
         values(#{documentId},#{removalCode},#{sourceType},#{moveType},now(),#{deliveryType})
     </insert>
+    <!-- 添加 tld_access 记录-->
+    <insert id="addAccess">
+        insert into tld_access (type,data,scrq,access_type)
+        values(#{names},#{returnGsRemoval},now(),#{accessType})
+    </insert>
     <!-- 查询当天出库数量 -->
     <select id="getReturnRemovalCount" resultType="int">
         select count(*) from tld_return_gs_removal where scrq BETWEEN CONCAT(CURDATE(),' 00:00:00') AND CONCAT(CURDATE(),' 23:59:59');
@@ -369,6 +374,14 @@
     <delete id="delAskGoodsVitrual">
         delete from tld_ask_goods_vitrual where id = #{id} and type = #{type}
     </delete>
+    <!-- 删除出库回传主表信息 -->
+    <delete id="delPlugOutRemoval">
+        delete from tld_return_gs_removal where document_id = #{removalCode}
+    </delete>
+    <!-- 删除出库回传子表信息 -->
+    <delete id="delRemovalz">
+        delete from tld_return_gs_removal_z where document_id = #{removalCode}
+    </delete>
     <!-- 修改出库数量 -->
     <update id="updateOutNum">
         update tld_ask_goods