拉取单据

src/main/java/com/glxp/api/http/ErpBasicClient.java

@@ -12,6 +12,7 @@ import com.glxp.api.entity.basic.BasicSkProjectEntity;
 import com.glxp.api.entity.basic.BasicSkSickerEntity;
 import com.glxp.api.entity.collect.IoCollectOrder;
 import com.glxp.api.entity.thrsys.ThrManufacturerEntity;
+import com.glxp.api.entity.thrsys.ThrOrderEntity;
 import com.glxp.api.entity.thrsys.ThrSystemBusApiEntity;
 import com.glxp.api.entity.thrsys.ThrSystemEntity;
 import com.glxp.api.exception.JsonException;
@@ -32,6 +33,7 @@ import com.glxp.api.res.basic.BasicSkSickerResponse;
 import com.glxp.api.res.chs.YbHcflEntityResponse;
 import com.glxp.api.res.collect.IoCollectOrderResponse;
 import com.glxp.api.res.thrsys.ThrCorpsResponse;
+import com.glxp.api.res.thrsys.ThrOrderResponse;
 import com.glxp.api.res.thrsys.ThrProductsResponse;
 import com.glxp.api.res.thrsys.UdiwmsWarehouseDetail;
 import com.glxp.api.service.thrsys.ThrSystemService;
@@ -233,6 +235,28 @@ public class ErpBasicClient {
     }
 
 
+    /**
+     * 获取三方单据信息
+     * @param filterThrOrderRequest
+     * @return
+     */
+    public BaseResponse<PageSimpleResponse<ThrOrderResponse>> getThrOrders(FilterThrOrderRequest filterThrOrderRequest) {
+        ThrSystemEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId(filterThrOrderRequest.getThirdSys());
+        String url = basicThirdSysEntity.getThridUrl() + "/udiwms/erp/getThrOrders";
+        try {
+            String response = httpOkClient.uCloudPost(url, filterThrOrderRequest);
+            BaseResponse<PageSimpleResponse<ThrOrderResponse>> listBaseResponse =
+                    JSONObject.parseObject(response, new TypeReference<BaseResponse<PageSimpleResponse<ThrOrderResponse>>>() {
+                    });
+
+            return listBaseResponse;
+        } catch (Exception e) {
+            log.error("获取三方单据信息", e);
+            return ResultVOUtils.error(500, "连接第三方系统接口服务出错");
+        }
+    }
+
+
     /**
      * 获取医保单据
      *

src/main/java/com/glxp/api/req/thrsys/FilterThrOrderRequest.java

@@ -33,5 +33,13 @@ public class FilterThrOrderRequest extends ListPageRequest {
     private String thirdAction;
     private String thirdOrderFk;
     private Integer allocateStatus;
+    /**
+     * 工位编码
+     */
+    private Long workPlaceCode;
+    /**
+     * 来源业务
+     */
+    private String fromType;
     private List<ThrOrderResponse> erpOrderResponses;
 }

src/main/java/com/glxp/api/res/thrsys/ThrOrderResponse.java

@@ -1,6 +1,7 @@
 package com.glxp.api.res.thrsys;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.glxp.api.entity.thrsys.ThrOrderDetailEntity;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -20,7 +21,7 @@ public class ThrOrderResponse {
     private String fromInvCode;  //往来仓库
 
     private String thirdSysFk;
-
+    private List<ThrOrderDetailEntity> detailList;
     private List<ThrOrderResponse.SubErpOrder> subErpOrders;
 
     //增加字段

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

@@ -17,6 +17,9 @@ public class DownloadFactory {
 
     @Resource
     private YPCF002Download ypcf002Download;
+
+    @Resource
+    private CGJH001Download cgjh001Download;
     @Resource
     private LYRKDownload lyrkDownload;
     @Resource
@@ -37,7 +40,7 @@ public class DownloadFactory {
         if(busType.equals(BusTypeConstant.YPCF002.getBusType())){
             return ypcf002Download.downloadOrder(collectOrderRequest);
         } else if(busType.equals(BusTypeConstant.CGJH001.getBusType())){
-            return ResultVOUtils.error("下载失败，未配置业务类型");
+            return cgjh001Download.downloadOrder(collectOrderRequest);
         } else if(busType.equals(BusTypeConstant.LYRK.getBusType())){
             return lyrkDownload.downloadOrder(collectOrderRequest);
         } else if(busType.equals(BusTypeConstant.GMRK.getBusType())){

src/main/java/com/glxp/api/service/collect/down/CGJH001Download.java

@@ -0,0 +1,41 @@
+package com.glxp.api.service.collect.down;
+
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.http.ErpBasicClient;
+import com.glxp.api.req.collect.CollectOrderRequest;
+import com.glxp.api.req.thrsys.FilterThrOrderRequest;
+import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.res.thrsys.ThrOrderResponse;
+import com.glxp.api.service.collect.IoCollectOrderService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+
+@Service
+public class CGJH001Download implements IDownload{
+    @Resource
+    private ErpBasicClient erpBasicClient;
+    @Resource
+    private IoCollectOrderService collectOrderService;
+
+    @Override
+    public BaseResponse downloadOrder(CollectOrderRequest collectOrderRequest) {
+        FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest();
+        filterThrOrderRequest.setPage(1);
+        filterThrOrderRequest.setLimit(100);
+        filterThrOrderRequest.setBillNo(collectOrderRequest.getBillNo());
+        filterThrOrderRequest.setThirdSys("thirdId");
+        filterThrOrderRequest.setWorkPlaceCode(collectOrderRequest.getWorkPlaceCode());
+        filterThrOrderRequest.setFromType(collectOrderRequest.getFromType());
+        BaseResponse<PageSimpleResponse<ThrOrderResponse>> baseResponse = erpBasicClient.getThrOrders(filterThrOrderRequest);
+        if (baseResponse.getCode() == 20000) {
+            List<ThrOrderResponse> list = baseResponse.getData().getList();
+//            collectOrderService.importPrescribe(list,collectOrderRequest.getBusType());
+            return ResultVOUtils.success("下载成功");
+        }
+        return ResultVOUtils.error("下载失败");
+    }
+}

src/main/java/com/glxp/api/service/collect/down/GMRKDownload.java

@@ -2,14 +2,38 @@ package com.glxp.api.service.collect.down;
 
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.http.ErpBasicClient;
 import com.glxp.api.req.collect.CollectOrderRequest;
+import com.glxp.api.req.thrsys.FilterThrOrderRequest;
+import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.res.thrsys.ThrOrderResponse;
+import com.glxp.api.service.collect.IoCollectOrderService;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.List;
+
 @Service
 public class GMRKDownload implements IDownload{
-
+    @Resource
+    private ErpBasicClient erpBasicClient;
+    @Resource
+    private IoCollectOrderService collectOrderService;
     @Override
     public BaseResponse downloadOrder(CollectOrderRequest collectOrderRequest) {
+        FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest();
+        filterThrOrderRequest.setPage(1);
+        filterThrOrderRequest.setLimit(100);
+        filterThrOrderRequest.setBillNo(collectOrderRequest.getBillNo());
+        filterThrOrderRequest.setThirdSys("thirdId");
+        filterThrOrderRequest.setWorkPlaceCode(collectOrderRequest.getWorkPlaceCode());
+        filterThrOrderRequest.setFromType(collectOrderRequest.getFromType());
+        BaseResponse<PageSimpleResponse<ThrOrderResponse>> baseResponse = erpBasicClient.getThrOrders(filterThrOrderRequest);
+        if (baseResponse.getCode() == 20000) {
+            List<ThrOrderResponse> list = baseResponse.getData().getList();
+//            collectOrderService.importPrescribe(list,collectOrderRequest.getBusType());
+            return ResultVOUtils.success("下载成功");
+        }
         return  ResultVOUtils.error("下载失败");
     }
 }

src/main/java/com/glxp/api/service/collect/down/LYCKDownload.java

@@ -6,7 +6,9 @@ import com.glxp.api.entity.collect.IoCollectOrder;
 import com.glxp.api.http.ErpBasicClient;
 import com.glxp.api.req.basic.GetSickPrescribeRequest;
 import com.glxp.api.req.collect.CollectOrderRequest;
+import com.glxp.api.req.thrsys.FilterThrOrderRequest;
 import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.res.thrsys.ThrOrderResponse;
 import com.glxp.api.service.collect.IoCollectOrderService;
 import org.springframework.stereotype.Service;
 
@@ -22,17 +24,17 @@ public class LYCKDownload implements IDownload{
 
     @Override
     public BaseResponse downloadOrder(CollectOrderRequest collectOrderRequest) {
-        GetSickPrescribeRequest getSickPrescribeRequest = new GetSickPrescribeRequest();
+        FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest();
-        getSickPrescribeRequest.setPage(1);
+        filterThrOrderRequest.setPage(1);
-        getSickPrescribeRequest.setLimit(100);
+        filterThrOrderRequest.setLimit(100);
-        getSickPrescribeRequest.setCode(collectOrderRequest.getBillNo());
+        filterThrOrderRequest.setBillNo(collectOrderRequest.getBillNo());
-        getSickPrescribeRequest.setThirdSys("thirdId");
+        filterThrOrderRequest.setThirdSys("thirdId");
-        getSickPrescribeRequest.setWorkPlaceCode(collectOrderRequest.getWorkPlaceCode());
+        filterThrOrderRequest.setWorkPlaceCode(collectOrderRequest.getWorkPlaceCode());
-        getSickPrescribeRequest.setFromType(collectOrderRequest.getFromType());
+        filterThrOrderRequest.setFromType(collectOrderRequest.getFromType());
-        BaseResponse<PageSimpleResponse<IoCollectOrder>> baseResponse = erpBasicClient.getPrescribeV2(getSickPrescribeRequest);
+        BaseResponse<PageSimpleResponse<ThrOrderResponse>> baseResponse = erpBasicClient.getThrOrders(filterThrOrderRequest);
         if (baseResponse.getCode() == 20000) {
-            List<IoCollectOrder> list = baseResponse.getData().getList();
+            List<ThrOrderResponse> list = baseResponse.getData().getList();
-            collectOrderService.importPrescribe(list,collectOrderRequest.getBusType());
+//            collectOrderService.importPrescribe(list,collectOrderRequest.getBusType());
             return ResultVOUtils.success("下载成功");
         }
         return ResultVOUtils.error("下载失败");

src/main/java/com/glxp/api/service/collect/down/LYRKDownload.java

@@ -2,14 +2,38 @@ package com.glxp.api.service.collect.down;
 
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.http.ErpBasicClient;
 import com.glxp.api.req.collect.CollectOrderRequest;
+import com.glxp.api.req.thrsys.FilterThrOrderRequest;
+import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.res.thrsys.ThrOrderResponse;
+import com.glxp.api.service.collect.IoCollectOrderService;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.List;
+
 @Service
 public class LYRKDownload implements IDownload {
-
+    @Resource
+    private ErpBasicClient erpBasicClient;
+    @Resource
+    private IoCollectOrderService collectOrderService;
     @Override
     public BaseResponse downloadOrder(CollectOrderRequest collectOrderRequest) {
+        FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest();
+        filterThrOrderRequest.setPage(1);
+        filterThrOrderRequest.setLimit(100);
+        filterThrOrderRequest.setBillNo(collectOrderRequest.getBillNo());
+        filterThrOrderRequest.setThirdSys("thirdId");
+        filterThrOrderRequest.setWorkPlaceCode(collectOrderRequest.getWorkPlaceCode());
+        filterThrOrderRequest.setFromType(collectOrderRequest.getFromType());
+        BaseResponse<PageSimpleResponse<ThrOrderResponse>> baseResponse = erpBasicClient.getThrOrders(filterThrOrderRequest);
+        if (baseResponse.getCode() == 20000) {
+            List<ThrOrderResponse> list = baseResponse.getData().getList();
+//            collectOrderService.importPrescribe(list,collectOrderRequest.getBusType());
+            return ResultVOUtils.success("下载成功");
+        }
         return ResultVOUtils.error("下载失败");
     }
 }