问题修改

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

@@ -30,7 +30,7 @@ public class GsPlugOutController {
     }
 
     /**
-     * 出库回传---生产领用单
+     * 出库回传---生产领用单/非生产领用出库单
      * @param removalCode 参数
      */
     @GetMapping("plugOutRemoval")

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

@@ -79,6 +79,14 @@ public class AskGoods implements Serializable {
      * 部门
      */
     private String department;
+    /**
+     * 部门名称
+     */
+    private String name;
+    /**
+     * 部门编号
+     */
+    private String code;
     /**
      * 来源类型
      */

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

@@ -257,7 +257,7 @@ public class AskGoodsServiceImpl implements AskGoodsService {
 
     /**
      * 出库回传
-     * @param removalCode
+     * @param removalCode  单据id
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -275,8 +275,8 @@ public class AskGoodsServiceImpl implements AskGoodsService {
                     strJson.put("WMSCode", mapList.get(0).get("removalCode").toString());//出库单编号
                     strJson.put("WareHouse", warehouseWhere);//仓库ID
                     strJson.put("SourceBillDate",DateUtil.dateConversion(mapList.get(0).get("scrq").toString()));//业务日期
-                    strJson.put("sourceType", mapList.get(0).get("sourceType").toString());//来源类型
-                    strJson.put("moveType", mapList.get(0).get("moveType").toString());//移动类型
+                    strJson.put("SourceType", mapList.get(0).get("sourceType").toString());//来源类型
+                    strJson.put("MoveType", mapList.get(0).get("moveType").toString());//移动类型
                     strJson.put("IsRed", 0);//是否红单1
                     strJson.put("Creator", "测试");//制单人姓名1
                     //子表
@@ -297,18 +297,30 @@ public class AskGoodsServiceImpl implements AskGoodsService {
                     retunList.add(strJson);
                 }
             }
-            returnData.put("strJson", JSON.toJSONString(retunList));
+            JSONObject ReqOutStocks = new JSONObject();
+            ReqOutStocks.put("ReqOutStocks",retunList);
+            returnData.put("strJson", JSON.toJSONString(ReqOutStocks));
             System.out.println(returnData);
             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);
+            System.out.println("result："+result);
             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(JSON.toJSONString(retunList));
-                errorMapper.addError(error);
+                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()
+                                    .setErrorInfo(datum.toString())
+                                    .setUrl("http://42.159.85.29:52480/cwbase/sg/V1/ERP/TELD/DEVTEST/API_WMS_PurInStock/CreateProductiveOutStock")
+                                    .setDataVal(JSON.toJSONString(returnData));
+                            errorMapper.addError(error);
+                        }
+                    }
+                }else {
+                    System.out.println("报错信息为:"+result.get("data"));
+                }
             }
         }catch (Exception e){
             e.printStackTrace();

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

@@ -266,22 +266,22 @@ public class InviteServiceImpl implements InviteService {
                     AskGoods ag = new AskGoods();
                     //父表
                     ag.setAskGoodsId(jsonMap.get("requestOrderId").toString());
-                    ag.setUniqueCode(jsonMap.get("requestOrderNo").toString());
+                    ag.setAskGoodsCode(jsonMap.get("requestOrderNo").toString());
                     ag.setCompanyNumber(jsonMap.get("companyNo").toString());
-                    ag.setSqrq(jsonMap.get("requestDate").toString());//申请日期
-                    ag.setDepartmentId(jsonMap.get("useDepartment").toString());
+                    ag.setSqrq(jsonMap.get("applicationDate").toString());//申请日期
+                    ag.setDepartment(jsonMap.get("useDepartment").toString());
                     ag.setSourceType(jsonMap.get("sourceType").toString());
                     ag.setMoveType(jsonMap.get("moveType").toString());
-
                     ag.setAskGoodsApplyType(jsonMap.get("requestOrderType").toString());
                     //子表
                     ag.setEntryNumber(element.get("entryNumber").toString());
-                    ag.setProductionCode(element.get("prodOrderNo").toString());
+                    ag.setProductionCode(element.get("prodOrderNo").toString());//
                     ag.setMaterialId(element.get("materialId").toString());
-                    ag.setWbs(element.get("WBS").toString());
+                    ag.setWbs(element.get("WBS").toString());//
                     ag.setMeasurementId(element.get("measUnitId").toString());
                     ag.setNum(element.get("orderCount").toString());
-
+                    ag.setOutNum("0");
+                    ag.setAskGoodsType("0");
                     askGoodsList.add(ag);
                 }
             }

src/main/java/com/tld/util/HttpClientUtil.java

@@ -128,14 +128,29 @@ public class HttpClientUtil {
             // 执行http请求
             String responseVal = EntityUtils.toString(requestTemp, "utf-8");
             JSONObject jsonObject = JSON.parseObject(responseVal);
-            if(JSON.parseObject(jsonObject.get("result").toString()).get("State").equals("0")){
-                //如果失败存入报错信息跟数据
-                Error error = new Error()
-                        .setErrorInfo(resultString)
-                        .setUrl(url)
-                        .setDataVal(param.toString());
-                errorMapper.addError(error);
-            }
+            System.out.println("jsonObject输出为："+jsonObject);
+//            String detail = jsonObject.get("result").toString();
+//            System.out.println("输出为："+detail);
+//            List<Map<String,Object>> result = (List<Map<String, Object>>) JSON.parseObject(jsonObject.get("result").toString());
+//            for (Map<String, Object> stringObjectMap : result) {
+//                if (stringObjectMap.get("State").equals("0")){
+//                    //如果失败存入报错信息跟数据
+//                    Error error = new Error()
+//                            .setErrorInfo(resultString)
+//                            .setUrl(url)
+//                            .setDataVal(param.toString());
+//                    errorMapper.addError(error);
+//                }
+//            }
+
+//            if(JSON.parseObject(jsonObject.get("result").toString()).get("State").equals("0")){
+//                //如果失败存入报错信息跟数据
+//                Error error = new Error()
+//                        .setErrorInfo(resultString)
+//                        .setUrl(url)
+//                        .setDataVal(param.toString());
+//                errorMapper.addError(error);
+//            }
             resultString = EntityUtils.toString(requestTemp, "utf-8");
             map.put("msg", response.getStatusLine().getStatusCode());
             map.put("data", resultString);

src/main/resources/mapper/AskGoodsMapper.xml

@@ -61,7 +61,9 @@
             e.NAME AS materialName,
             e.CODE AS materialCode,
             b.ask_goods_code,
-            b.company_number
+            b.company_number,
+            c.name ,
+            c.code
         FROM
             tld_ask_goods a
             JOIN tld_ask_goods_f b ON a.ask_goods_id = b.ask_goods_id
@@ -568,6 +570,5 @@
             JOIN tld_storage_location b ON a.storage_location_code = b.storage_location_code
         WHERE
             a.document_id = #{removalCode}
-
     </select>
 </mapper>

src/main/resources/mapper/ErrorMapper.xml

@@ -4,6 +4,6 @@
 <mapper namespace="com.tld.mapper.ErrorMapper">
     <!-- 如果失败存入报错信息跟数据 -->
     <insert id="addError">
-        insert into tld_error(url,error_info,data_val,scrq) value(#{url},#{errorInfo},#{dataVal},now())
+        insert into tld_error (url,error_info,data_val,scrq) value (#{url},#{errorInfo},#{dataVal},now())
     </insert>
 </mapper>

src/main/resources/mapper/InviteMapper.xml

@@ -15,8 +15,8 @@
     </update>
     <!-- 新增要料申请单 -->
     <insert id="addAskGoods">
-        insert into tld_invite(ask_goods_id,entry_number,production_code,material_id,wbs,measurement_id,num,out_num)
-        values(#{askGoodsId},#{entryNumber},#{productionCode},#{materialId},#{wbs},#{measurementId},#{outNum})
+        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},#{outNum},#{askGoodsType})
     </insert>
     <!-- 新增要料申请单父级 -->
     <insert id="addAskGoodsf">
@@ -26,7 +26,7 @@
     <!-- 新增要料日志 -->
     <insert id="addAskGoodsLog">
         insert into tld_ask_goods_log(ask_goods_id,entry_number,production_code,material_id,wbs,measurement_id,num,out_num,ask_goods_code,company_number,sqrq,department_id,source_type,move_type,ask_goods_type)
-        values(#{askGoodsId},#{entryNumber},#{productionCode},#{materialId},#{wbs},#{measurementId},#{outNum},#{askGoodsCode},#{companyNumber},#{sqrq},#{departmentId},#{sourceType},#{moveType},#{askGoodsType})
+        values(#{askGoodsId},#{entryNumber},#{productionCode},#{materialId},#{wbs},#{measurementId},#{num},#{outNum},#{askGoodsCode},#{companyNumber},#{sqrq},#{departmentId},#{sourceType},#{moveType},#{askGoodsType})
     </insert>
     <!-- 查询次要货单是否存在 -->
     <select id="getAskGoodsf" resultType="int">
@@ -66,7 +66,8 @@
             e.NAME AS materialName,
             e.CODE AS materialCode,
             b.ask_goods_code,
-            b.company_number
+            b.company_number,
+            b.department
         FROM
             tld_invite a
             JOIN tld_invite_f b ON a.ask_goods_id = b.ask_goods_id