Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/srq/modules/orderIssure/service/IssureNotifyService.java
#	src/main/java/com/srq/modules/orderIssure/service/impl/IssureNotifyServiceImpl.java

src/main/java/com/srq/modules/orderIssure/controller/IssureNotifyController.java

@@ -45,6 +45,12 @@ public class IssureNotifyController {
         return R.ok().put("rows",rows);
     }
 
+    @PostMapping("/pick/detail/issued")
+    public R pickDetailIssued(@RequestBody List<PickDetail> pickDetailList) {
+        issureNotifyService.pickDetailIssued(pickDetailList);
+        return R.ok("操作成功");
+    }
+
     /**
      * @Description 新增提货单
      * @Title receiveIssureNotify

src/main/java/com/srq/modules/orderIssure/entity/PickDetail.java

@@ -49,4 +49,6 @@ public class PickDetail {
     private String requireQty;
     private String endTime;
     private String status;
+
+    private String handlingUnitId;
 }

src/main/java/com/srq/modules/orderIssure/service/IssureNotifyService.java

@@ -26,4 +26,6 @@ public interface IssureNotifyService {
     void refreshPickOrder(IssureNotifyEntity issureNotifyEntity);
 
     void pickOrderCancelReservation(IssureNotifyEntity issureNotifyEntity);
+
+    void pickDetailIssued(List<PickDetail> pickDetailList);
 }

src/main/java/com/srq/modules/orderIssure/service/impl/IssureNotifyServiceImpl.java

@@ -15,8 +15,10 @@ import org.springframework.stereotype.Service;
 import com.srq.modules.base.utils.HttpClientUtil;
 import com.srq.modules.base.utils.ResponseData;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 
 @Service
@@ -233,4 +235,27 @@ public class IssureNotifyServiceImpl implements IssureNotifyService {
                     pickOrderCancelReservationResponse.getMsg());
         }
     }
+
+    @Override
+    public void pickDetailIssued(List<PickDetail> pickDetailList) {
+        // 后台处理状态为已下发
+        for (PickDetail detail : pickDetailList) {
+            if (StringUtils.isEmpty(detail.getIssueQty()) || "0".equals(detail.getIssueQty())) {
+                throw new RuntimeException("零件"+detail.getRmPartDesc()+"下发数量不能为零");
+            }
+            detail.setStatus("已下发");
+        }
+        String api = apiUrl + "/order/issuePickOrderDetailMerge";
+        List<PickDetail> errorList = new ArrayList<>();
+        // 开始发送请求
+        for (PickDetail detail : pickDetailList) {
+            ResponseData result = HttpClientUtil.doPostByRawWithSRQ(api,detail);
+            if (!"200".equals(result.getCode())) {
+                errorList.add(detail);
+            }
+        }
+        if (!errorList.isEmpty()){
+            throw new RuntimeException("零件\""+errorList.stream().map(PickDetail::getRmPartDesc).collect(Collectors.joining(";"))+"\"下发失败");
+        }
+    }
 }