推送进口订单修改

mhd_oms/src/main/java/com/mhd/oms/domain/gwLog/entity/GwLog.java

@@ -61,4 +61,7 @@ public class GwLog implements Serializable {
 
     @ApiModelProperty("删除标记：1-正常，0-删除")
     private Integer delFlag;
+
+//    @ApiModelProperty("推送人姓名")
+//    private String pushByName;
 }

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderApplicationService.java

@@ -1987,7 +1987,7 @@ public class ReservationStockInOrderApplicationService {
             gwStockInOrder.setOrderList(orderList);
 
             GwLog gwLog = new GwLog();
-            gwLog.setType("企业国别");
+            gwLog.setType("保税仓-进口订单");
             gwLog.setBusinessId(id);
             gwLog.setRequestBody(com.alibaba.fastjson.JSONObject.toJSONString(gwStockInOrder));
             gwLog.setResponseBody("");
@@ -1997,6 +1997,7 @@ public class ReservationStockInOrderApplicationService {
             gwLog.setTopOrganizationId(topOrganizationId);
             gwLog.setOrganizationName(organizationName);
             gwLog.setCreateBy(pushBy);
+//            gwLog.setPushByName(pushByName);
             gwLog.setCreateTime(new Date());
             gwLog.setDelFlag(1);
             gwLogMapper.insert(gwLog);
@@ -2025,7 +2026,7 @@ public class ReservationStockInOrderApplicationService {
                     gwLog.setErrorMsg(responseString);
                     updatePushStatus(id, 4, new Date(), pushBy,pushByName);
                     failCount++;
-                    failMsg.append("erpCountryCode:").append(id).append("失败;");
+                    failMsg.append("入库单id:").append(id).append("失败;");
                 }
                 gwLogMapper.updateById(gwLog);
                 response.close();
@@ -2036,8 +2037,8 @@ public class ReservationStockInOrderApplicationService {
                 gwLogMapper.updateById(gwLog);
                 updatePushStatus(id, 4, new Date(), pushBy,pushByName);
                 failCount++;
-                failMsg.append("erpCountryCode:").append(id).append("异常:").append(e.getMessage()).append(";");
+                failMsg.append("id:").append(id).append("异常:").append(e.getMessage()).append(";");
-                log.error("企业国别推送异常: id={}, error={}", id, e.getMessage());
+                log.error("进口订单推送异常: id={}, error={}", id, e.getMessage());
             } finally {
                 try {
                     httpClient.close();

mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/reservationStockInOrder/ReservationStockInOrderApi.java

@@ -210,4 +210,15 @@ public class ReservationStockInOrderApi extends BaseController {
         }
     }
 
+
+    @ApiOperation("批量推送")
+    @PostMapping("/batchPush")
+    public AjaxResult batchPush(@RequestBody List<Long> idList){
+        if(idList == null || idList.isEmpty()){
+            return AjaxResult.error("没有数据需要推送");
+        }
+        return stockInOrderApplicationService.batchPush(idList);
+
+    }
+
 }