代码备份

src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java

@@ -0,0 +1,27 @@
+package com.glxp.api.controller.collect;
+
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.req.collect.CollectOrderRequest;
+import com.glxp.api.service.collect.IoCollectOriginService;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * 原始单据下载
+ */
+
+@RestController
+public class IoCollectOriginController {
+
+
+    @Resource
+    IoCollectOriginService collectOriginService;
+
+    @GetMapping("/udiwms/basic/collect/origin/order/download")
+    public BaseResponse downloadOrder(@RequestBody CollectOrderRequest collectOrderRequest) {
+        return collectOriginService.downloadOrder(collectOrderRequest);
+    }
+}

src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java

@@ -81,7 +81,7 @@ public class ThrProductsController {
                 BaseResponse<PageSimpleResponse<ThrProductsResponse>> udiDlDeviceResponse = erpBasicClient.getErpProducts(filterThrProductsRequest);
                 return udiDlDeviceResponse;
             } else {
-                if (filterThrProductsRequest.getProductType() == null){
+                if (filterThrProductsRequest.getProductType() == null) {
                     filterThrProductsRequest.setProductType(1);
                 }
                 List<ThrProductsResponse> thrCorpEntities = thrProductsService.filterJoinThrProducts(filterThrProductsRequest);

src/main/java/com/glxp/api/entity/basic/BasicSkPrescribeEntity.java

@@ -155,4 +155,8 @@ public class BasicSkPrescribeEntity {
     @TableField(value = "addr")
     private String addr;
 
+    @TableField(value = "stooutNo")
+    private String stooutNo;
+
+
 }

src/main/java/com/glxp/api/res/basic/BasicSkPrescribeResponse.java

@@ -86,6 +86,8 @@ public class BasicSkPrescribeResponse {
 
     private Long workPlaceCode;
     private String workPlaceName;
+    private String addr;
+    private String stooutNo;
     /**
      * 处方明细
      */

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

@@ -53,20 +53,20 @@ public class ThrProductsResponse {
     private String supCode;
     private String prcitmcode;
     private String invCode;
+    private Integer productType;
 
     public String getSpec() {
-        if(StrUtil.isNotEmpty(spec)){
+        if (StrUtil.isNotEmpty(spec)) {
             return spec;
         }
-        if(StrUtil.isNotEmpty(standard)){
+        if (StrUtil.isNotEmpty(standard)) {
             return standard;
         }
-        if(StrUtil.isNotEmpty(model)){
+        if (StrUtil.isNotEmpty(model)) {
             return model;
         }
         return "";
     }
 
 
-
 }

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

@@ -92,6 +92,17 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
     IoCollectCodeService collectCodeService;
     @Resource
     UdiCalCountUtil udiCalCountUtil;
+    @Resource
+    IBasicBussinessTypeService bussinessTypeService;
+    @Resource
+    private GennerOrderUtils gennerOrderUtils;
+    @Resource
+    private IoCodeTempDao codesTempDao;
+    @Resource
+    IoAddInoutService addInoutService;
+    @Resource
+    @Lazy
+    IoCheckInoutService ioCheckInoutService;
 
     public IoCollectOrder getByBillNo(String billNo) {
         return collectOrderMapper.selectOne(new LambdaQueryWrapper<IoCollectOrder>().eq(IoCollectOrder::getBillNo, billNo).last("limit 1"));
@@ -368,6 +379,7 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
                     .billTime(MsDateUtil.localToDate(basicSkPrescribeEntity.getCreateTime()))
                     .createTime(new Date())
                     .createUser(basicSkPrescribeEntity.getCreateUser())
+                    .backupOrderRemark1(basicSkPrescribeEntity.getStooutNo())
                     .updateTime(new Date())
                     .orderCirType(sysWorkplaceDocumentEntity.getOrderCirType())
                     .splitStatus(0)
@@ -518,17 +530,6 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
         });
     }
 
-    @Resource
-    IBasicBussinessTypeService bussinessTypeService;
-    @Resource
-    private GennerOrderUtils gennerOrderUtils;
-    @Resource
-    private IoCodeTempDao codesTempDao;
-    @Resource
-    IoAddInoutService addInoutService;
-    @Resource
-    @Lazy
-    IoCheckInoutService ioCheckInoutService;
 
     /**
      * @param billNo

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

@@ -0,0 +1,75 @@
+package com.glxp.api.service.collect;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.IdUtil;
+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.entity.basic.BasicSkPrescribeDiEntity;
+import com.glxp.api.entity.basic.BasicSkPrescribeEntity;
+import com.glxp.api.entity.basic.BasicSkPrescribeItemEntity;
+import com.glxp.api.http.ErpBasicClient;
+import com.glxp.api.req.basic.GetSickPrescribeRequest;
+import com.glxp.api.req.collect.CollectOrderRequest;
+import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.res.basic.BasicSkPrescribeResponse;
+import com.glxp.api.service.basic.BasicSkPrescirbeDetailService;
+import com.glxp.api.service.basic.BasicSkPrescribeService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 原始单据下载
+ */
+@Service
+public class IoCollectOriginService {
+    @Resource
+    private ErpBasicClient erpBasicClient;
+    @Resource
+    BasicSkPrescribeService basicSkPrescribeService;
+    @Resource
+    BasicSkPrescirbeDetailService basicSkPrescirbeDetailService;
+
+    public BaseResponse downloadOrder(CollectOrderRequest collectOrderRequest) {
+
+        //拉取药品处方
+        if (collectOrderRequest.getBusType().equals("YPCF002")) {
+            GetSickPrescribeRequest getSickPrescribeRequest = new GetSickPrescribeRequest();
+            getSickPrescribeRequest.setPage(1);
+            getSickPrescribeRequest.setLimit(100);
+            getSickPrescribeRequest.setCode(collectOrderRequest.getBillNo());
+            BaseResponse<PageSimpleResponse<BasicSkPrescribeResponse>> baseResponse = erpBasicClient.getPrescribe(getSickPrescribeRequest);
+
+            if (baseResponse.getCode() == 20000) {
+                List<BasicSkPrescribeResponse> list = baseResponse.getData().getList();
+                List<BasicSkPrescribeEntity> basicSkPrescribeEntities = new ArrayList<>();
+                list.forEach(item -> {
+                    BasicSkPrescribeEntity basicSkPrescribeEntity = new BasicSkPrescribeEntity();
+                    BeanUtil.copyProperties(item, basicSkPrescribeEntity);
+                    basicSkPrescribeEntity.setSickerCode(item.getSickCode());
+                    basicSkPrescribeEntity.setUpdateTime(LocalDateTime.now());
+                    List<BasicSkPrescribeItemEntity> skPrescribeItemEntities = item.getItemList();
+                    if (CollUtil.isNotEmpty(skPrescribeItemEntities)) {
+                        basicSkPrescirbeDetailService.remove(new QueryWrapper<BasicSkPrescribeItemEntity>().eq("prescribeCode", item.getCode()));
+                        for (BasicSkPrescribeItemEntity skPrescribeItemEntity : skPrescribeItemEntities) {
+                            skPrescribeItemEntity.setPrescribeCode(item.getCode());
+                            skPrescribeItemEntity.setSickerCode(item.getSickCode());
+                            skPrescribeItemEntity.setAdNum(basicSkPrescribeEntity.getAdNum());
+                            skPrescribeItemEntity.setId(IdUtil.getSnowflakeNextId());
+                            basicSkPrescirbeDetailService.save(skPrescribeItemEntity);
+                        }
+                    }
+                    basicSkPrescribeEntities.add(basicSkPrescribeEntity);
+                    basicSkPrescribeService.saveOrUpdate(basicSkPrescribeEntity);
+                });
+            }
+        }
+
+        return ResultVOUtils.success("下载成功");
+    }
+}

src/main/resources/application-dev.yml

@@ -4,7 +4,7 @@ server:
 spring:
   datasource:
     driver-class-name: com.p6spy.engine.spy.P6SpyDriver
-    jdbc-url: jdbc:p6spy:mysql://192.168.0.166:3306/udi_wms_ct?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+    jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_ct?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
     password: 123456
     hikari: