Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z

src/main/java/com/glxp/api/req/basic/WorkBindBusTypeRequest.java

@@ -14,7 +14,7 @@ import java.util.List;
 @Data
 public class WorkBindBusTypeRequest extends ListPageRequest {
 //    private List<String> documentTypeCode;
-    private String workplaceCode;
+    private Long workplaceCode;
     private String code;
     private String busKey;
     private String workKey;

src/main/java/com/glxp/api/service/collect/DownloadFactory.java

@@ -1,5 +1,6 @@
 package com.glxp.api.service.collect;
 
+import cn.hutool.core.util.StrUtil;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.constant.BusTypeConstant;
@@ -29,23 +30,22 @@ public class DownloadFactory {
      */
     public BaseResponse downloadOrder(CollectOrderRequest collectOrderRequest) {
         String busType = collectOrderRequest.getBusType();
-//        if (busType == null) {
-//            return ResultVOUtils.error("下载失败，未配置业务类型");
-//        }
-//        if (busType.equals(BusTypeConstant.YPCF002.getBusType())) {
-//            return ypcf002Download.downloadOrder(collectOrderRequest);
-//        } else if (busType.equals(BusTypeConstant.CGJH001.getBusType())) {
-//            return thrOrderDownload.downloadOrder(collectOrderRequest);
-//        } else if (busType.equals(BusTypeConstant.LYRK.getBusType())) {
-//            return thrOrderDownload.downloadOrder(collectOrderRequest);
-//        } else if (busType.equals(BusTypeConstant.GMRK.getBusType())) {
-//            return thrOrderDownload.downloadOrder(collectOrderRequest);
-//        } else if (busType.equals(BusTypeConstant.LYCK.getBusType())) {
-//            return thrOrderDownload.downloadOrder(collectOrderRequest);
-//        }
-
-        return thrOrderDownload.downloadOrder(collectOrderRequest);
-//        return ResultVOUtils.error("下载失败，未配置业务类型");
+        if (StrUtil.isBlank(busType)) {
+            return ResultVOUtils.error("下载失败，未配置业务类型");
+        }
+        if (busType.equals(BusTypeConstant.YPCF002.getBusType())) {
+            return ypcf002Download.downloadOrder(collectOrderRequest);
+        } else if (busType.equals(BusTypeConstant.CGJH001.getBusType())) {
+            return thrOrderDownload.downloadOrder(collectOrderRequest);
+        } else if (busType.equals(BusTypeConstant.LYRK.getBusType())) {
+            return thrOrderDownload.downloadOrder(collectOrderRequest);
+        } else if (busType.equals(BusTypeConstant.GMRK.getBusType())) {
+            return thrOrderDownload.downloadOrder(collectOrderRequest);
+        } else if (busType.equals(BusTypeConstant.LYCK.getBusType())) {
+            return thrOrderDownload.downloadOrder(collectOrderRequest);
+        }
+
+        return ResultVOUtils.error("下载失败，未配置业务类型");
     }
 
 }

src/main/java/com/glxp/api/service/collect/IoCollectOriginService.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.dao.basic.SysWorkplaceDocumentDao;
 import com.glxp.api.entity.basic.BasicSkPrescribeEntity;
 import com.glxp.api.entity.basic.BasicSkPrescribeItemEntity;
 import com.glxp.api.entity.collect.IoCollectOrder;
@@ -16,10 +17,12 @@ import com.glxp.api.entity.collect.IoCollectOrderBiz;
 import com.glxp.api.exception.JsonException;
 import com.glxp.api.http.ErpBasicClient;
 import com.glxp.api.req.basic.GetSickPrescribeRequest;
+import com.glxp.api.req.basic.WorkBindBusTypeRequest;
 import com.glxp.api.req.collect.CollectOrderRequest;
 import com.glxp.api.req.inout.FilterOrderRequest;
 import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.res.basic.BasicSkPrescribeResponse;
+import com.glxp.api.res.basic.SysWorkplaceDocumentResponse;
 import com.glxp.api.service.basic.*;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -49,6 +52,8 @@ public class IoCollectOriginService {
     IoCollectOrderBizService collectOrderBizService;
     @Resource
     private DownloadFactory downloadFactory;
+    @Resource
+    private SysWorkplaceDocumentDao sysWorkplaceDocumentDao;
 
     public BaseResponse downloadOrder(CollectOrderRequest collectOrderRequest) {
 
@@ -93,7 +98,23 @@ public class IoCollectOriginService {
 
     public BaseResponse downloadOrderV2(CollectOrderRequest collectOrderRequest) {
         //条件
-        return downloadFactory.downloadOrder(collectOrderRequest);
+        String busType = collectOrderRequest.getBusType();
+        if(StrUtil.isBlank(busType)){
+            //下载工位下的类型
+            WorkBindBusTypeRequest workBindBusTypeRequest = new WorkBindBusTypeRequest();
+            workBindBusTypeRequest.setWorkplaceCode(collectOrderRequest.getWorkPlaceCode());
+            List<SysWorkplaceDocumentResponse> sysWorkplaceDocumentResponses = sysWorkplaceDocumentDao.filterList(workBindBusTypeRequest);
+            if(CollUtil.isNotEmpty(sysWorkplaceDocumentResponses)){
+                for (SysWorkplaceDocumentResponse sysWorkplaceDocumentResponse :sysWorkplaceDocumentResponses){
+                    String documentTypeCode = sysWorkplaceDocumentResponse.getDocumentTypeCode();
+                    collectOrderRequest.setBusType(documentTypeCode);
+                    downloadFactory.downloadOrder(collectOrderRequest);
+                }
+            }
+            return ResultVOUtils.success("下载成功");
+        }else{
+            return downloadFactory.downloadOrder(collectOrderRequest);
+        }
 
     }