.

src/main/java/com/miyzh/config/SheduledConfig.java

@@ -1,5 +1,6 @@
 package com.miyzh.config;
 
+import com.miyzh.service.BaseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.EnableScheduling;
@@ -15,11 +16,11 @@ import org.springframework.scheduling.annotation.Scheduled;
 @EnableScheduling
 public class SheduledConfig {
 
-//    @Autowired
-//    private UploadService uploadService;
-//
-//    @Scheduled(fixedRate = 1 * 60 * 1000)
-//    private void rertyUpload() {
-//        uploadService.retryUpload();
-//    }
+    @Autowired
+    private BaseService baseService;
+
+    @Scheduled(cron = "0 0 0 * * ?")
+    private void runservice() {
+        baseService.runService();
+    }
 }

src/main/java/com/miyzh/dao/MedicineReturnDao.java

@@ -1,5 +1,6 @@
 package com.miyzh.dao;
 
+import com.miyzh.entity.MedicineReturnTemp;
 import com.miyzh.entity.dto.MedicineReturnDto;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -8,18 +9,28 @@ import java.util.List;
 @Mapper
 public interface MedicineReturnDao {
 
-    List<MedicineReturnDto> getPurchasePager();
+    // 西药销售出库记录
+    List<MedicineReturnTemp> listMedicineOutbound(String clinicId);
 
-    List<MedicineReturnDto> getStockDetailPager();
+    // 中药销售出库记录
+    List<MedicineReturnTemp> listChinaMedicineOutbound(String clinicId);
 
-    List<MedicineReturnDto> getChinaStockProfitPager();
+    // 西药损耗/领用出库记录
+    List<MedicineReturnTemp> listMedicineOutTreasury(String clinicId);
 
-    List<MedicineReturnDto> getStockOutbound();
+    // 中药损耗/领用出库记录
+    List<MedicineReturnTemp> listChinaMedicineOutTreasury(String clinicId);
 
-    List<MedicineReturnDto> getChinaStockOutbound();
+    // 西药采购退货出库记录
+    List<MedicineReturnTemp> listMedicineBack(String clinicId);
 
-    List<MedicineReturnDto> getInventory();
+    // 中药采购退货出库记录
+    List<MedicineReturnTemp> listChinaMedicineBack(String clinicId);
 
-    List<MedicineReturnDto> getInventoryDetail();
+    // 西药盘点盘亏出库记录
+    List<MedicineReturnTemp> listMedicineInventory(String clinicId);
+
+    // 中药盘点盘亏出库记录
+    List<MedicineReturnTemp> listChinaMedicineInventory(String clinicId);
 
 }

src/main/java/com/miyzh/dao/MedicineStorageDao.java

@@ -1,6 +1,7 @@
 package com.miyzh.dao;
 
 import com.miyzh.entity.MedicineStorage;
+import com.miyzh.entity.MedicineStorageTemp;
 import com.miyzh.entity.dto.MedicineReturnDto;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -10,21 +11,21 @@ import java.util.List;
 public interface MedicineStorageDao {
 
     // 西药采购入库记录
-    List<MedicineStorage> listMedicinePurchase(String clinicId);
+    List<MedicineStorageTemp> listMedicinePurchase(String clinicId);
 
     // 中药采购入库记录
-    List<MedicineStorage> listChinaMedicinePurchase(String clinicId);
+    List<MedicineStorageTemp> listChinaMedicinePurchase(String clinicId);
 
     // 西药销售退回入库记录
-    List<MedicineStorage> listMedicineOutbound(String clinicId);
+    List<MedicineStorageTemp> listMedicineOutbound(String clinicId);
 
     // 中药销售退回入库记录
-    List<MedicineStorage> listChinaMedicineOutbound(String clinicId);
+    List<MedicineStorageTemp> listChinaMedicineOutbound(String clinicId);
 
     // 西药盘点盘盈入库记录
-    List<MedicineStorage> listMedicineInventory(String clinicId);
+    List<MedicineStorageTemp> listMedicineInventory(String clinicId);
 
     // 中药盘点盘盈入库记录
-    List<MedicineStorage> listChinaMedicineInventory(String clinicId);
+    List<MedicineStorageTemp> listChinaMedicineInventory(String clinicId);
 
 }

src/main/java/com/miyzh/dao/UploadExcepctionLogMapper.java

@@ -1,22 +0,0 @@
-package com.miyzh.dao;
-
-import com.miyzh.entity.UploadExceptionLog;
-import io.lettuce.core.dynamic.annotation.Param;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-/**
- * description: UploadExpectionLogDao
- * date: 2020/6/18 12:07
- * author: SZQ
- */
-@Mapper
-public interface UploadExcepctionLogMapper {
-
-    List<UploadExceptionLog> selectListLimit(@Param("limit") int limit);
-
-    Integer insert(UploadExceptionLog uploadExceptionLog);
-
-    Integer update(UploadExceptionLog uploadExceptionLog);
-}

src/main/java/com/miyzh/entity/MedicineReturn.java

@@ -5,9 +5,7 @@ import lombok.Data;
 @Data
 public class MedicineReturn extends Medicine {
 
-    private String currentNum; //当前数量
-
-    private String approvalNumber; //批准文号
+    private String returnQuantity; //退货数量
 
 }
 

src/main/java/com/miyzh/entity/MedicineReturnTemp.java

@@ -0,0 +1,18 @@
+package com.miyzh.entity;
+
+import lombok.Data;
+
+@Data
+public class MedicineReturnTemp extends MedicineReturn {
+
+    private String storeReturnCode; //机构出库编码
+
+    private String storeStorageCode; //机构入库编码
+
+    private String returnMan; //出库人
+
+    private String returnTime; //出库时间
+
+}
+
+

src/main/java/com/miyzh/entity/dto/MedicineReturnDto.java

@@ -1,29 +1,22 @@
 package com.miyzh.entity.dto;
 
 import com.miyzh.entity.MedicineReturn;
+import com.miyzh.entity.MedicineReturnTemp;
 import lombok.Data;
 
 import java.util.List;
 
 @Data
-public class MedicineReturnDto {
+public class MedicineReturnDto extends MedicineReturnTemp {
 
     private String storeCode; // 医药机构编码
 
-    private String storeReturnCode; //机构出库编码
-
     private String storePrecordCode; // 采购记录编码(医药机构)
 
-    private String storStorageCode; // 入库编码(医药机构)
-
-    private String returnTime; //出库时间
-
     private String stockoutType; //出库类型
 
     private String returnAnnotation; //出库原因
 
-    private String returnMan; //出库人
-
     private List<MedicineReturn> medicineInfos; //药品/耗材列表
 
 }

src/main/java/com/miyzh/entity/dto/MedicineStorageDto.java

@@ -1,23 +1,18 @@
 package com.miyzh.entity.dto;
 
 import com.miyzh.entity.MedicineStorage;
+import com.miyzh.entity.MedicineStorageTemp;
 import lombok.Data;
 
 import java.util.List;
 
 @Data
-public class MedicineStorageDto {
+public class MedicineStorageDto extends MedicineStorageTemp {
 
     private String storeCode; //医药机构编码
 
-    private String storeStorageCode; //机构入库编码
-
     private String storePrecordCode; //机构采购记录编码
 
-    private String storageTime; //入库时间
-
-    private String storageMan; //入库人
-
     private String storageType; //入库类型
 
     private String storePurchaseType; // 采购平台标识

src/main/java/com/miyzh/service/BaseService.java

@@ -1,6 +1,7 @@
 package com.miyzh.service;
 
 import com.miyzh.entity.Clinic;
+import com.miyzh.entity.MedicineReturn;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -16,22 +17,65 @@ public class BaseService {
 
     @Autowired
     private MedicineStoreService medicineStoreService;
+
     @Autowired
     private MedicineStorageService medicineStorageService;
 
+    @Autowired
+    private MedicineReturnService medicineReturnService;
+
+    private class OutStore {
+        private static final String MED_OUT = "1"; //西药销售出库记录
+        private static final String CHI_MED_OUT = "2"; //中药销售出库记录
+        private static final String MED_OUTTREASURY = "3"; //西药损耗/领用出库记录
+        private static final String CHI_MED_OUTTREASURY = "4"; //中药损耗/领用出库记录
+        private static final String MED_BACK = "5"; //西药采购退货出库记录
+        private static final String CHI_MED_BACK = "6"; //中药采购退货出库记录
+        private static final String MED_INV = "7"; //西药盘点盘亏出库记录
+        private static final String CHI_MED_INV = "8"; //中药盘点盘亏出库记录
+    }
+
+    private class InStore {
+        private static final String MED_PUR = "1"; //西药采购入库
+        private static final String CHI_MED_PUR = "2"; //中药采购入库
+        private static final String MED_MED_INBOUND = "3"; //西药销售退回入库
+        private static final String CHI_MED_INBOUND = "4"; //中药销售退回
+        private static final String MED_INV = "5"; //西药盘盈入库
+        private static final String CHI_MED_INV = "6"; //中药盘盈入库
+    }
+
+    private class OrderDetail {
+
+    }
+
 
     public void runService () {
         try{
             long startTime = System.currentTimeMillis();
             List<Clinic> clinicList = clinicService.listClinic();
+            // 库存同步
 //            medicineStoreService.uploadMedicine(clinicList);
 //            medicineStoreService.uploadChinaMedicine(clinicList);
-            medicineStorageService.uploadMedicine(clinicList, "1");
-            medicineStorageService.uploadMedicine(clinicList, "2");
-//            medicineStorageService.uploadMedicine(clinicList, "3");
-//            medicineStorageService.uploadMedicine(clinicList, "4");
-//            medicineStorageService.uploadMedicine(clinicList, "5");
-//            medicineStorageService.uploadMedicine(clinicList, "6");
+
+            // 入库
+//            medicineStorageService.uploadMedicine(clinicList, InStore.MED_PUR);
+//            medicineStorageService.uploadMedicine(clinicList, InStore.CHI_MED_PUR);
+//            medicineStorageService.uploadMedicine(clinicList, InStore.MED_MED_INBOUND);
+//            medicineStorageService.uploadMedicine(clinicList, InStore.CHI_MED_INBOUND);
+//            medicineStorageService.uploadMedicine(clinicList, InStore.MED_INV);
+//            medicineStorageService.uploadMedicine(clinicList, InStore.CHI_MED_INV);
+
+            //出库
+            medicineReturnService.uploadMedicine(clinicList, OutStore.MED_OUT);
+//            medicineReturnService.uploadMedicine(clinicList, OutStore.CHI_MED_OUT);
+//            medicineReturnService.uploadMedicine(clinicList, OutStore.MED_OUTTREASURY);
+//            medicineReturnService.uploadMedicine(clinicList, OutStore.CHI_MED_OUTTREASURY);
+//            medicineReturnService.uploadMedicine(clinicList, OutStore.MED_BACK);
+//            medicineReturnService.uploadMedicine(clinicList, OutStore.CHI_MED_BACK);
+//            medicineReturnService.uploadMedicine(clinicList, OutStore.MED_INV);
+//            medicineReturnService.uploadMedicine(clinicList, OutStore.CHI_MED_INV);
+
+            // 销售明细
 
             long syncTime = System.currentTimeMillis();
             log.info("总耗时--{}", startTime - syncTime);
@@ -43,5 +87,4 @@ public class BaseService {
     }
 
 
-
 }

src/main/java/com/miyzh/service/MedicineReturnService.java

@@ -4,23 +4,22 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.miyzh.dao.ClinicDao;
-import com.miyzh.dao.MedicineStoreDao;
-import com.miyzh.entity.Clinic;
-import com.miyzh.entity.MedicineStore;
-import com.miyzh.entity.dto.MedicineStoreDto;
+import com.miyzh.dao.MedicineReturnDao;
+import com.miyzh.entity.*;
+import com.miyzh.entity.dto.MedicineReturnDto;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
- * 库存信息同步
+ * 出库信息同步
  */
 
 @Slf4j
@@ -28,72 +27,216 @@ import java.util.List;
 public class MedicineReturnService {
 
     @Autowired
-    private ClinicDao clinicDao;
-    @Autowired
-    private MedicineStoreDao medicineStoreDao;
-    @Value ("${postApi.storeUrl}")
+    private MedicineReturnDao medicineReturnDao;
+    @Value ("${postApi.returnUrl}")
     private String url;
     @Value("${postApi.pageSize}")
     private int pageSize;
 
+    private class StockoutType {
+        private static final String SELL = "1"; //销售
+        private static final String LOSS = "2"; //损耗
+        private static final String OUT_BOUND = "3"; //采购退货
+        private static final String OTHER = "4"; // 其他
+        private static final String ALLOT = "5"; // 调拨
+    }
+
+    private static final String MED_OUT = "1"; //西药销售出库记录
+    private static final String CHI_MED_OUT = "2"; //中药销售出库记录
+    private static final String MED_OUTTREASURY = "3"; //西药损耗/领用出库记录
+    private static final String CHI_MED_OUTTREASURY = "4"; //中药损耗/领用出库记录
+    private static final String MED_BACK = "5"; //西药采购退货出库记录
+    private static final String CHI_MED_BACK = "6"; //中药采购退货出库记录
+    private static final String MED_INV = "7"; //西药盘点盘亏出库记录
+    private static final String CHI_MED_INV = "8"; //中药盘点盘亏出库记录
+
     @Async
-    public void uploadMedicine(List<Clinic> clinicList) throws InterruptedException, JsonProcessingException {
+    public void uploadMedicine(List<Clinic> clinicList, String flag) throws InterruptedException, JsonProcessingException {
         long startTime = System.currentTimeMillis();
-        MedicineStoreDto storeInfo = new MedicineStoreDto();
-        storeInfo.setCheckMan("");
-        storeInfo.setCheckTime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd hh:mm:ss")));
+        PageInfo<MedicineReturnTemp> page = new PageInfo<>();
         for(Clinic clinic : clinicList) {
-            storeInfo.setStoreCode(clinic.getStoreCode());
-            PageInfo<MedicineStore> page = PageHelper.startPage(1, pageSize).doSelectPageInfo(() -> {
-                medicineStoreDao.listMedicineStore(clinic.getClinicId());
-            });
-            storeInfo.setMedicineInfos(page.getList());
-            this.upload(storeInfo);
-            if (page.getPages() > 1) {
-                for(int i = 2; i <= page.getPages(); i++) {
-                    PageHelper.startPage(i, pageSize).doSelectPageInfo(() -> {
-                        medicineStoreDao.listMedicineStore(clinic.getClinicId());
+            switch (flag) {
+                case MED_OUT:
+                    page = PageHelper.startPage(1, pageSize).doSelectPageInfo(() -> {
+                        medicineReturnDao.listMedicineOutbound(clinic.getClinicId());
+                    });
+                    break;
+                case CHI_MED_OUT:
+                    page = PageHelper.startPage(1, pageSize).doSelectPageInfo(() -> {
+                        medicineReturnDao.listChinaMedicineOutbound(clinic.getClinicId());
+                    });
+                    break;
+                case MED_OUTTREASURY:
+                    page = PageHelper.startPage(1, pageSize).doSelectPageInfo(() -> {
+                        medicineReturnDao.listMedicineOutTreasury(clinic.getClinicId());
+                    });
+                    break;
+                case CHI_MED_OUTTREASURY:
+                    page = PageHelper.startPage(1, pageSize).doSelectPageInfo(() -> {
+                        medicineReturnDao.listChinaMedicineOutTreasury(clinic.getClinicId());
+                    });
+                    break;
+                case MED_BACK:
+                    page = PageHelper.startPage(1, pageSize).doSelectPageInfo(() -> {
+                        medicineReturnDao.listMedicineBack(clinic.getClinicId());
+                    });
+                    break;
+                case CHI_MED_BACK:
+                    page = PageHelper.startPage(1, pageSize).doSelectPageInfo(() -> {
+                        medicineReturnDao.listChinaMedicineBack(clinic.getClinicId());
+                    });
+                    break;
+                case MED_INV:
+                    page = PageHelper.startPage(1, pageSize).doSelectPageInfo(() -> {
+                        medicineReturnDao.listMedicineInventory(clinic.getClinicId());
                     });
-                    storeInfo.setMedicineInfos(page.getList());
-                    this.upload(storeInfo);
+                    break;
+                case CHI_MED_INV:
+                    page = PageHelper.startPage(1, pageSize).doSelectPageInfo(() -> {
+                        medicineReturnDao.listChinaMedicineInventory(clinic.getClinicId());
+                    });
+                    break;
+            }
+            if (page.getTotal() == 0) {
+                continue;
+            }
+            Map<String, List<MedicineReturnTemp>> map =  page.getList()
+                    .stream()
+                    .collect(Collectors.groupingBy(MedicineReturnTemp::getStoreReturnCode));
+            for(Map.Entry<String, List<MedicineReturnTemp>> msMap:map.entrySet()){
+                MedicineReturnDto medicineReturnDto = new MedicineReturnDto();
+                medicineReturnDto.setStoreCode(clinic.getStoreCode());
+                switch (flag) {
+                    case MED_OUT:
+                    case CHI_MED_OUT:
+                        medicineReturnDto.setStockoutType(StockoutType.SELL);
+                        break;
+                    case MED_OUTTREASURY:
+                    case CHI_MED_OUTTREASURY:
+                        medicineReturnDto.setStockoutType(StockoutType.ALLOT);
+                        break;
+                    case MED_BACK:
+                    case CHI_MED_BACK:
+                        medicineReturnDto.setStockoutType(StockoutType.OUT_BOUND);
+                        break;
+                    case MED_INV:
+                    case CHI_MED_INV:
+                        medicineReturnDto.setStockoutType(StockoutType.LOSS);
+                        break;
                 }
+                medicineReturnDto.setStorePrecordCode("00000000");
+                medicineReturnDto.setReturnMan(msMap.getValue().get(0).getReturnMan());
+                medicineReturnDto.setReturnTime(msMap.getValue().get(0).getReturnTime());
+                medicineReturnDto.setStoreCode(clinic.getStoreCode());
+                medicineReturnDto.setStoreReturnCode(msMap.getKey());
+                List<MedicineReturn> list = msMap.getValue()
+                        .stream()
+                        .map(e -> {
+                            MedicineReturn medicineReturn = new MedicineReturn();
+                            BeanUtils.copyProperties(e, medicineReturn);
+                            return medicineReturn;
+                        })
+                        .collect(Collectors.toList());
+                medicineReturnDto.setMedicineInfos(list);
+                this.upload(medicineReturnDto);
             }
-        };
-        long syncTime = System.currentTimeMillis();
-        log.info("1方法执行用时--{}", startTime - syncTime);
-    };
-
-    @Async
-    public void uploadChinaMedicine(List<Clinic> clinicList) throws JsonProcessingException {
-        long startTime = System.currentTimeMillis();
-        MedicineStoreDto storeInfo = new MedicineStoreDto();
-        storeInfo.setCheckMan("");
-        storeInfo.setCheckTime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd hh:mm:ss")));
-        for(Clinic clinic : clinicList) {
-            storeInfo.setStoreCode(clinic.getStoreCode());
-            PageInfo<MedicineStore> page = PageHelper.startPage(1, pageSize).doSelectPageInfo(() -> {
-                medicineStoreDao.listChinaMedicineStore(clinic.getClinicId());
-            });
-            storeInfo.setMedicineInfos(page.getList());
-            this.upload(storeInfo);
             if (page.getPages() > 1) {
+                PageInfo<MedicineReturnTemp> page1 = new PageInfo<>();
                 for(int i = 2; i <= page.getPages(); i++) {
-                    PageHelper.startPage(i, pageSize).doSelectPageInfo(() -> {
-                        medicineStoreDao.listChinaMedicineStore(clinic.getClinicId());
-                    });
-                    storeInfo.setMedicineInfos(page.getList());
-                    this.upload(storeInfo);
+                    switch (flag) {
+                        case MED_OUT:
+                            page = PageHelper.startPage(1, pageSize).doSelectPageInfo(() -> {
+                                medicineReturnDao.listMedicineOutbound(clinic.getClinicId());
+                            });
+                            break;
+                        case CHI_MED_OUT:
+                            page = PageHelper.startPage(1, pageSize).doSelectPageInfo(() -> {
+                                medicineReturnDao.listChinaMedicineOutbound(clinic.getClinicId());
+                            });
+                            break;
+                        case MED_OUTTREASURY:
+                            page = PageHelper.startPage(1, pageSize).doSelectPageInfo(() -> {
+                                medicineReturnDao.listMedicineOutTreasury(clinic.getClinicId());
+                            });
+                            break;
+                        case CHI_MED_OUTTREASURY:
+                            page = PageHelper.startPage(1, pageSize).doSelectPageInfo(() -> {
+                                medicineReturnDao.listChinaMedicineOutTreasury(clinic.getClinicId());
+                            });
+                            break;
+                        case MED_BACK:
+                            page = PageHelper.startPage(1, pageSize).doSelectPageInfo(() -> {
+                                medicineReturnDao.listMedicineBack(clinic.getClinicId());
+                            });
+                            break;
+                        case CHI_MED_BACK:
+                            page = PageHelper.startPage(1, pageSize).doSelectPageInfo(() -> {
+                                medicineReturnDao.listChinaMedicineBack(clinic.getClinicId());
+                            });
+                            break;
+                        case MED_INV:
+                            page = PageHelper.startPage(1, pageSize).doSelectPageInfo(() -> {
+                                medicineReturnDao.listMedicineInventory(clinic.getClinicId());
+                            });
+                            break;
+                        case CHI_MED_INV:
+                            page = PageHelper.startPage(1, pageSize).doSelectPageInfo(() -> {
+                                medicineReturnDao.listChinaMedicineInventory(clinic.getClinicId());
+                            });
+                            break;
+                    }
+                    Map<String, List<MedicineReturnTemp>> map1 =  page1.getList()
+                            .stream()
+                            .collect(Collectors.groupingBy(MedicineReturnTemp::getStoreReturnCode));
+                    for(Map.Entry<String, List<MedicineReturnTemp>> msMap:map1.entrySet()){
+                        MedicineReturnDto medicineReturnDto = new MedicineReturnDto();
+                        medicineReturnDto.setStoreCode(clinic.getStoreCode());
+                        switch (flag) {
+                            case MED_OUT:
+                            case CHI_MED_OUT:
+                                medicineReturnDto.setStockoutType(StockoutType.SELL);
+                                break;
+                            case MED_OUTTREASURY:
+                            case CHI_MED_OUTTREASURY:
+                                medicineReturnDto.setStockoutType(StockoutType.ALLOT);
+                                break;
+                            case MED_BACK:
+                            case CHI_MED_BACK:
+                                medicineReturnDto.setStockoutType(StockoutType.OUT_BOUND);
+                                break;
+                            case MED_INV:
+                            case CHI_MED_INV:
+                                medicineReturnDto.setStockoutType(StockoutType.LOSS);
+                                break;
+                        }
+                        medicineReturnDto.setStorePrecordCode("00000000");
+                        medicineReturnDto.setReturnMan(msMap.getValue().get(0).getReturnMan());
+                        medicineReturnDto.setReturnTime(msMap.getValue().get(0).getReturnTime());
+                        medicineReturnDto.setStoreCode(clinic.getStoreCode());
+                        medicineReturnDto.setStoreReturnCode(msMap.getKey());
+                        List<MedicineReturn> list = msMap.getValue()
+                                .stream()
+                                .map(e -> {
+                                    MedicineReturn medicineReturn = new MedicineReturn();
+                                    BeanUtils.copyProperties(e, medicineReturn);
+                                    return medicineReturn;
+                                })
+                                .collect(Collectors.toList());
+                        medicineReturnDto.setMedicineInfos(list);
+                        this.upload(medicineReturnDto);
+                    }
                 }
             }
         };
         long syncTime = System.currentTimeMillis();
-        log.info("2方法执行用时--{}", startTime - syncTime);
+        log.info("执行用时--{}", startTime - syncTime);
     };
 
     public void upload (Object o) throws JsonProcessingException {
         ObjectMapper objectMapper = new ObjectMapper();
         String params = objectMapper.writeValueAsString(o);
-//            System.out.println(objectMapper.writeValueAsString(RestTemplateUtil.postHttp(url, params)));
+        System.out.println(params);
+//        System.out.println(objectMapper.writeValueAsString(RestTemplateUtil.postHttp(url, params)));
     }
 
 }

src/main/java/com/miyzh/service/MedicineStorageService.java

@@ -35,6 +35,12 @@ public class MedicineStorageService {
     @Value("${postApi.pageSize}")
     private int pageSize;
 
+    private class StorageType {
+        private static final String PUR = "1"; //采购入库
+        private static final String OTHER = "2"; //其他
+        private static final String INBOUND = "3"; //销售退货
+        private static final String CHI_MED_INBOUND = "4"; // 退溢
+    }
     private static final String MED_PUR = "1"; //西药采购入库
     private static final String CHI_MED_PUR = "2"; //中药采购入库
     private static final String MED_MED_INBOUND = "3"; //西药销售退回入库
@@ -91,15 +97,15 @@ public class MedicineStorageService {
                 switch (flag) {
                     case MED_PUR:
                     case CHI_MED_PUR:
-                        medicineStorageDto.setStorageType("1");
+                        medicineStorageDto.setStorageType(StorageType.PUR);
                         break;
                     case MED_MED_INBOUND:
                     case CHI_MED_INBOUND:
-                        medicineStorageDto.setStorageType("3");
+                        medicineStorageDto.setStorageType(StorageType.INBOUND);
                         break;
                     case MED_INV:
                     case CHI_MED_INV:
-                        medicineStorageDto.setStorageType("4");
+                        medicineStorageDto.setStorageType(StorageType.CHI_MED_INBOUND);
                         break;
                 }
                 medicineStorageDto.setStorePrecordCode("00000000");
@@ -162,15 +168,15 @@ public class MedicineStorageService {
                         switch (flag) {
                             case MED_PUR:
                             case CHI_MED_PUR:
-                                medicineStorageDto.setStorageType("1");
+                                medicineStorageDto.setStorageType(StorageType.PUR);
                                 break;
                             case MED_MED_INBOUND:
                             case CHI_MED_INBOUND:
-                                medicineStorageDto.setStorageType("3");
+                                medicineStorageDto.setStorageType(StorageType.INBOUND);
                                 break;
                             case MED_INV:
                             case CHI_MED_INV:
-                                medicineStorageDto.setStorageType("4");
+                                medicineStorageDto.setStorageType(StorageType.CHI_MED_INBOUND);
                                 break;
                         }
                         medicineStorageDto.setStorePrecordCode("00000000");
@@ -196,11 +202,6 @@ public class MedicineStorageService {
         log.info("1方法执行用时--{}", startTime - syncTime);
     };
 
-    @Async
-    public void uploadChinaMedicine(List<Clinic> clinicList) throws JsonProcessingException {
-
-    };
-
     public void upload (Object o) throws JsonProcessingException {
         ObjectMapper objectMapper = new ObjectMapper();
         String params = objectMapper.writeValueAsString(o);

src/main/java/com/miyzh/service/UploadExceptionLogService.java

@@ -1,32 +0,0 @@
-package com.miyzh.service;
-
-import com.miyzh.entity.UploadExceptionLog;
-import com.miyzh.dao.UploadExcepctionLogMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * description: UploadExceptionLogService
- * date: 2020/6/18 15:36
- * author: SZQ
- */
-@Service
-public class UploadExceptionLogService {
-
-    @Autowired
-    private UploadExcepctionLogMapper uploadExcepctionLogMapper;
-
-    public List<UploadExceptionLog> listUploadExceptionLogLimit(int count) {
-        return uploadExcepctionLogMapper.selectListLimit(count);
-    }
-
-    public Integer update(UploadExceptionLog uploadExceptionLog) {
-        return uploadExcepctionLogMapper.update(uploadExceptionLog);
-    }
-
-    public Integer inster(UploadExceptionLog uploadExceptionLog) {
-        return uploadExcepctionLogMapper.insert(uploadExceptionLog);
-    }
-}

src/main/resources/application-szq.yml

@@ -81,7 +81,7 @@ postApi:
   pageSize: 2000
   storeUrl: http://15.72.176.14/mhis-pisp/api/pis/inventory-balance/upload
   sorageUrl: http://15.72.176.14/mhis-pisp/api/pis/storagein-records/upload
-  outStoreUrl: http://15.72.176.14/mhis-pisp/api/pis/storageout-records/upload
+  returnUrl: http://15.72.176.14/mhis-pisp/api/pis/storageout-records/upload
   orderDetailUrl: http://15.72.176.14/mhis-pisp/api/pis/order-details/upload
 
 

src/main/resources/mapper/MedicineReturnMapper.xml

@@ -2,97 +2,62 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.miyzh.dao.MedicineReturnDao">
 
-    <resultMap id="BaseResultMap" type="com.miyzh.entity.MedicineStore" extends="com.miyzh.dao.MedicineDao.BaseResultMap">
-        <!--剩余数量-->
-        <result column="current_num" jdbcType="VARCHAR" property="currentNum" />
+    <resultMap id="BaseResultMap" type="com.miyzh.entity.MedicineReturnTemp" extends="com.miyzh.dao.MedicineDao.BaseResultMap">
+        <!--退货数量-->
+        <result column="return_quantity" jdbcType="VARCHAR" property="returnQuantity" />
+        <!--机构出库编码-->
+        <result column="store_return_code" jdbcType="VARCHAR" property="storeReturnCode" />
+        <!--机构入库编码-->
+        <result column="store_storage_code" jdbcType="VARCHAR" property="storeStorageCode" />
+        <!--出库人-->
+        <result column="return_man" jdbcType="VARCHAR" property="returnMan" />
+        <!--出库时间-->
+        <result column="return_time" jdbcType="VARCHAR" property="returnTime" />
     </resultMap>
 
-    <select id="listMedicineStore" resultMap="BaseResultMap" parameterType="java.lang.String">
-        select
-        cm.medicine_category as item_type,
-        cm.med_ins_backup_id as store_medicine_code,
-        cm.medicine_c_name as store_medicine_name,
-        cm.medicine_name_goods as store_medicine_trade_name,
-        ifnull(idm.formulation, " ") as dosage_id,
-        cm.medicine_dosage_forms as dosage_name,
-        cm.medicine_specifications as specification,
-        cm.medicine_manufacturer_name as manufacturer,
-        cm.medicine_place as place,
-        idm.medicine_package as pack,
-        " " as model,
-        csd.stock_batch_number as batch_no,
-        csd.create_time as medicine_deadline,
-        csd.medicine_deadline as manufacture_time,
-        cm.medicine_barcode as bar_code,
-        "" as regist_no,
-        csd.stock_channel as delivery_company,
-        "999999999" as distributor,
-        csd.stock_bid as price,
-        idm.sale_price as retail_price,
-        "" as plat_item_code,
-        "" as plat_item_name,
-        idm.standard_menu_code as item_code,
-        idm.insurance_medicine_name as item_name,
-        "999999999" as approval_number,
-        csd.remain_number as current_num
-        from
-            clc_stock_detail csd
-        left join
-            clc_medicine cm
-        on
-            cm.clinic_id = csd.clinic_id and csd.medicine_id=cm.medicine_id
-        left join
-            ins_d_medicine idm
-        on
-            csd.clinic_id = idm.clinic_id and csd.medicine_id=idm.medicine_id
-        where
-            csd.clinic_id = #{clinicId}
-        GROUP BY
-            csd.medicine_id
+    <!--西药销售出库记录-->
+    <select id="listMedicineOutbound" resultMap="BaseResultMap" parameterType="java.lang.String">
+
+    </select>
+
+    <!--中药销售出库记录-->
+    <select id="listChinaMedicineOutbound" resultMap="BaseResultMap" parameterType="java.lang.String">
+
+    </select>
+
+    <!--西药损耗/领用出库记录-->
+    <select id="listMedicineOutTreasury" resultMap="BaseResultMap" parameterType="java.lang.String">
+
+    </select>
+
+    <!--中药损耗/领用出库记录-->
+    <select id="listChinaMedicineOutTreasury" resultMap="BaseResultMap" parameterType="java.lang.String">
+
     </select>
 
+    <!--西药销售出库记录-->
     <select id="listChinaMedicineStore" resultMap="BaseResultMap" parameterType="java.lang.String">
-        select
-        ccm.medicine_category as item_type,
-        ccm.med_ins_backup_id as store_medicine_code,
-        ccm.medicine_name as store_medicine_name,
-        ccm.medicine_name as store_medicine_trade_name,
-        ifnull(idm.formulation, " ") as dosage_id,
-        ccm.medicine_rate_last as dosage_name,
-        ccm.medicine_specifications as specification,
-        ccm.medicine_manufacturer_name as manufacturer,
-        ccm.medicine_address as place,
-        idm.medicine_package as pack,
-        " " as model,
-        ccsp.stock_batch_number as batch_no,
-        ccm.create_time as medicine_deadline,
-        ccsp.medicine_deadline as manufacture_time,
-        "0000000000000" as bar_code,
-        "" as regist_no,
-        ccsp.stock_channel as delivery_company,
-        "999999999" as distributor,
-        ccsp.stock_bid as price,
-        idm.sale_price as retail_price,
-        "" as plat_item_code,
-        "" as plat_item_name,
-        idm.standard_menu_code as item_code,
-        idm.insurance_medicine_name as item_name,
-        "999999999" as approval_number,
-        ccsp.remain_number as current_num
-        from
-            clc_china_stock_profit ccsp
-        left join
-            clc_china_medicine ccm
-        on
-            ccm.clinic_id = ccsp.clinic_id and ccsp.medicine_id=ccm.medicine_id
-        left join
-            ins_d_medicine idm
-        on
-            ccsp.clinic_id = idm.clinic_id and ccsp.medicine_id=idm.medicine_id
-        where
-            ccsp.clinic_id = #{clinicId}
-        GROUP BY
-            ccsp.medicine_id
+
+    </select>
+
+    <!--西药采购退货出库记录-->
+    <select id="listMedicineBack" resultMap="BaseResultMap" parameterType="java.lang.String">
+
+    </select>
+
+    <!--中药采购退货出库记录-->
+    <select id="listChinaMedicineBack" resultMap="BaseResultMap" parameterType="java.lang.String">
+
+    </select>
+
+    <!--西药盘点盘亏出库记录-->
+    <select id="listMedicineInventory" resultMap="BaseResultMap" parameterType="java.lang.String">
+
+    </select>
+
+    <!--中药盘点盘亏出库记录-->
+    <select id="listChinaMedicineInventory" resultMap="BaseResultMap" parameterType="java.lang.String">
+
     </select>
 
 

src/main/resources/mapper/MedicineStorageMapper.xml

@@ -13,6 +13,7 @@
         <result column="storage_time" jdbcType="VARCHAR" property="storageTime" />
     </resultMap>
 
+    <!--西药采购入库记录-->
     <select id="listMedicinePurchase" resultMap="BaseResultMap" parameterType="java.lang.String">
         SELECT DISTINCT
             cm.medicine_category as item_type,
@@ -75,31 +76,32 @@
             csd.medicine_id
     </select>
 
+    <!--中药采购入库记录-->
     <select id="listChinaMedicinePurchase" resultMap="BaseResultMap" parameterType="java.lang.String">
         SELECT DISTINCT
-            cm.medicine_category as item_type,
+            ccm.medicine_category as item_type,
             IF
-            ( length( cm.med_ins_backup_id )> 0, cm.med_ins_backup_id, cm.medicine_id ) AS store_medicine_code,
-            cm.medicine_c_name as store_medicine_name,
-            cm.medicine_name_goods as store_medicine_trade_name,
+            ( length( ccm.med_ins_backup_id )> 0, ccm.med_ins_backup_id, ccm.medicine_id ) AS store_medicine_code,
+            ccm.medicine_name as store_medicine_name,
+            ccm.medicine_name as store_medicine_trade_name,
             ifnull(idm.formulation, " ") as dosage_id,
-            cm.medicine_dosage_forms as dosage_name,
-            cm.medicine_specifications AS specification,
-            cm.medicine_manufacturer_name as manufacturer,
-            cm.medicine_place as place,
-            cm.medicine_unit AS pack,
+            ccm.medicine_rate_last as dosage_name,
+            ccm.medicine_specifications AS specification,
+            ccm.medicine_manufacturer_name as manufacturer,
+            ccm.medicine_address as place,
+            idm.medicine_package AS pack,
             " " as model,
-            csd.stock_batch_number as batch_no,
-            csd.create_time as medicine_deadline,
-            csd.medicine_deadline as manufacture_time,
-            cm.medicine_barcode as bar_code,
+            ccsp.stock_batch_number as batch_no,
+            ccm.create_time as medicine_deadline,
+            ccsp.medicine_deadline as manufacture_time,
+            '0000000000000' as bar_code,
             "" as regist_no,
-            csd.stock_channel as delivery_company,
+            ccsp.stock_channel as delivery_company,
             "999999999" as distributor,
             cp.purchase_no as store_storage_code,
-            sum( csd.stock_change_number ) AS storage_quantity,
-            csd.stock_bid AS price,
-            cs.medicine_retail_price AS retail_price,
+            sum( ccsp.stock_change_number ) AS storage_quantity,
+            ccsp.stock_bid AS price,
+            ccs.medicine_retail_price AS retail_price,
             "" as plat_item_code,
             "" as plat_item_name,
             idm.standard_menu_code as item_code,
@@ -107,282 +109,54 @@
             cp.create_username AS storage_man,
             cp.create_time as storage_time
         FROM
-            clc_stock_detail csd,
-            clc_medicine cm,
-            clc_stock cs,
+            clc_china_stock_profit ccsp,
+            clc_china_medicine ccm,
+            clc_china_stock ccs,
             clc_stock_inbound csi,
             clc_purchase cp,
             ins_d_medicine idm
         WHERE
-            csd.medicine_id = cm.medicine_id
-            AND csd.clinic_id = cm.clinic_id
-            AND csd.clinic_id = cs.clinic_id
-            AND csd.medicine_id = cs.medicine_id
-            AND cs.warehouse_code = '1'
-            AND csd.clinic_id = csi.clinic_id
-            AND csd.id = csi.id
-            AND csd.clinic_id = cp.clinic_id
+            ccsp.medicine_id = ccm.medicine_id
+            AND ccsp.clinic_id = ccm.clinic_id
+            AND ccsp.clinic_id = ccs.clinic_id
+            AND ccsp.medicine_id = ccs.medicine_id
+            AND ccs.warehouse_code = '1'
+            AND ccsp.clinic_id = csi.clinic_id
+            AND ccsp.id = csi.id
+            AND ccsp.clinic_id = cp.clinic_id
             AND cp.id = csi.purchase_id
-            AND csd.clinic_id = #{clinicId}
+            AND ccsp.clinic_id = #{clinicId}
             AND timestamp_number != 'default'
-            AND cm.is_base = 1
+            AND cp.biz_type = '1'
             and cp.purchase_no is not null
-            AND idm.medicine_id = cm.medicine_id
-            AND idm.clinic_id = cm.clinic_id
+            AND idm.medicine_id = ccm.medicine_id
+            AND idm.clinic_id = ccm.clinic_id
         GROUP BY
             cp.id,
-            csd.medicine_id
+            ccsp.medicine_id
         ORDER BY
             cp.create_time,
-            csd.medicine_id
+            ccsp.medicine_id
     </select>
 
+    <!--西药销售退回入库记录-->
     <select id="listMedicineOutbound" resultMap="BaseResultMap" parameterType="java.lang.String">
-        SELECT DISTINCT
-            cm.medicine_category as item_type,
-            IF
-            ( length( cm.med_ins_backup_id )> 0, cm.med_ins_backup_id, cm.medicine_id ) AS store_medicine_code,
-            cm.medicine_c_name as store_medicine_name,
-            cm.medicine_name_goods as store_medicine_trade_name,
-            ifnull(idm.formulation, " ") as dosage_id,
-            cm.medicine_dosage_forms as dosage_name,
-            cm.medicine_specifications AS specification,
-            cm.medicine_manufacturer_name as manufacturer,
-            cm.medicine_place as place,
-            cm.medicine_unit AS pack,
-            " " as model,
-            csd.stock_batch_number as batch_no,
-            csd.create_time as medicine_deadline,
-            csd.medicine_deadline as manufacture_time,
-            cm.medicine_barcode as bar_code,
-            "" as regist_no,
-            csd.stock_channel as delivery_company,
-            "999999999" as distributor,
-            cp.purchase_no as store_storage_code,
-            sum( csd.stock_change_number ) AS storage_quantity,
-            csd.stock_bid AS price,
-            cs.medicine_retail_price AS retail_price,
-            "" as plat_item_code,
-            "" as plat_item_name,
-            idm.standard_menu_code as item_code,
-            idm.insurance_medicine_name as item_name,
-            cp.create_username AS storage_man,
-            cp.create_time as storage_time
-        FROM
-            clc_stock_detail csd,
-            clc_medicine cm,
-            clc_stock cs,
-            clc_stock_inbound csi,
-            clc_purchase cp,
-            ins_d_medicine idm
-        WHERE
-            csd.medicine_id = cm.medicine_id
-            AND csd.clinic_id = cm.clinic_id
-            AND csd.clinic_id = cs.clinic_id
-            AND csd.medicine_id = cs.medicine_id
-            AND cs.warehouse_code = '1'
-            AND csd.clinic_id = csi.clinic_id
-            AND csd.id = csi.id
-            AND csd.clinic_id = cp.clinic_id
-            AND cp.id = csi.purchase_id
-            AND csd.clinic_id = #{clinicId}
-            AND timestamp_number != 'default'
-            AND cm.is_base = 1
-            and cp.purchase_no is not null
-            AND idm.medicine_id = cm.medicine_id
-            AND idm.clinic_id = cm.clinic_id
-        GROUP BY
-            cp.id,
-            csd.medicine_id
-        ORDER BY
-            cp.create_time,
-            csd.medicine_id
+
     </select>
 
+    <!--中药销售退回入库记录-->
     <select id="listChinaMedicineOutbound" resultMap="BaseResultMap" parameterType="java.lang.String">
-        SELECT DISTINCT
-            cm.medicine_category as item_type,
-            IF
-            ( length( cm.med_ins_backup_id )> 0, cm.med_ins_backup_id, cm.medicine_id ) AS store_medicine_code,
-            cm.medicine_c_name as store_medicine_name,
-            cm.medicine_name_goods as store_medicine_trade_name,
-            ifnull(idm.formulation, " ") as dosage_id,
-            cm.medicine_dosage_forms as dosage_name,
-            cm.medicine_specifications AS specification,
-            cm.medicine_manufacturer_name as manufacturer,
-            cm.medicine_place as place,
-            cm.medicine_unit AS pack,
-            " " as model,
-            csd.stock_batch_number as batch_no,
-            csd.create_time as medicine_deadline,
-            csd.medicine_deadline as manufacture_time,
-            cm.medicine_barcode as bar_code,
-            "" as regist_no,
-            csd.stock_channel as delivery_company,
-            "999999999" as distributor,
-            cp.purchase_no as store_storage_code,
-            sum( csd.stock_change_number ) AS storage_quantity,
-            csd.stock_bid AS price,
-            cs.medicine_retail_price AS retail_price,
-            "" as plat_item_code,
-            "" as plat_item_name,
-            idm.standard_menu_code as item_code,
-            idm.insurance_medicine_name as item_name,
-            cp.create_username AS storage_man,
-            cp.create_time as storage_time
-        FROM
-            clc_stock_detail csd,
-            clc_medicine cm,
-            clc_stock cs,
-            clc_stock_inbound csi,
-            clc_purchase cp,
-            ins_d_medicine idm
-        WHERE
-            csd.medicine_id = cm.medicine_id
-            AND csd.clinic_id = cm.clinic_id
-            AND csd.clinic_id = cs.clinic_id
-            AND csd.medicine_id = cs.medicine_id
-            AND cs.warehouse_code = '1'
-            AND csd.clinic_id = csi.clinic_id
-            AND csd.id = csi.id
-            AND csd.clinic_id = cp.clinic_id
-            AND cp.id = csi.purchase_id
-            AND csd.clinic_id = #{clinicId}
-            AND timestamp_number != 'default'
-            AND cm.is_base = 1
-            and cp.purchase_no is not null
-            AND idm.medicine_id = cm.medicine_id
-            AND idm.clinic_id = cm.clinic_id
-        GROUP BY
-            cp.id,
-            csd.medicine_id
-        ORDER BY
-            cp.create_time,
-            csd.medicine_id
+
     </select>
 
+    <!--西药盘点盘盈入库记录-->
     <select id="listMedicineInventory" resultMap="BaseResultMap" parameterType="java.lang.String">
-        SELECT DISTINCT
-            cm.medicine_category as item_type,
-            IF
-            ( length( cm.med_ins_backup_id )> 0, cm.med_ins_backup_id, cm.medicine_id ) AS store_medicine_code,
-            cm.medicine_c_name as store_medicine_name,
-            cm.medicine_name_goods as store_medicine_trade_name,
-            ifnull(idm.formulation, " ") as dosage_id,
-            cm.medicine_dosage_forms as dosage_name,
-            cm.medicine_specifications AS specification,
-            cm.medicine_manufacturer_name as manufacturer,
-            cm.medicine_place as place,
-            cm.medicine_unit AS pack,
-            " " as model,
-            csd.stock_batch_number as batch_no,
-            csd.create_time as medicine_deadline,
-            csd.medicine_deadline as manufacture_time,
-            cm.medicine_barcode as bar_code,
-            "" as regist_no,
-            csd.stock_channel as delivery_company,
-            "999999999" as distributor,
-            cp.purchase_no as store_storage_code,
-            sum( csd.stock_change_number ) AS storage_quantity,
-            csd.stock_bid AS price,
-            cs.medicine_retail_price AS retail_price,
-            "" as plat_item_code,
-            "" as plat_item_name,
-            idm.standard_menu_code as item_code,
-            idm.insurance_medicine_name as item_name,
-            cp.create_username AS storage_man,
-            cp.create_time as storage_time
-        FROM
-            clc_stock_detail csd,
-            clc_medicine cm,
-            clc_stock cs,
-            clc_stock_inbound csi,
-            clc_purchase cp,
-            ins_d_medicine idm
-        WHERE
-            csd.medicine_id = cm.medicine_id
-            AND csd.clinic_id = cm.clinic_id
-            AND csd.clinic_id = cs.clinic_id
-            AND csd.medicine_id = cs.medicine_id
-            AND cs.warehouse_code = '1'
-            AND csd.clinic_id = csi.clinic_id
-            AND csd.id = csi.id
-            AND csd.clinic_id = cp.clinic_id
-            AND cp.id = csi.purchase_id
-            AND csd.clinic_id = #{clinicId}
-            AND timestamp_number != 'default'
-            AND cm.is_base = 1
-            and cp.purchase_no is not null
-            AND idm.medicine_id = cm.medicine_id
-            AND idm.clinic_id = cm.clinic_id
-        GROUP BY
-            cp.id,
-            csd.medicine_id
-        ORDER BY
-            cp.create_time,
-            csd.medicine_id
+
     </select>
 
+    <!--中药盘点盘盈入库记录-->
     <select id="listChinaMedicineInventory" resultMap="BaseResultMap" parameterType="java.lang.String">
-        SELECT DISTINCT
-            cm.medicine_category as item_type,
-            IF
-            ( length( cm.med_ins_backup_id )> 0, cm.med_ins_backup_id, cm.medicine_id ) AS store_medicine_code,
-            cm.medicine_c_name as store_medicine_name,
-            cm.medicine_name_goods as store_medicine_trade_name,
-            ifnull(idm.formulation, " ") as dosage_id,
-            cm.medicine_dosage_forms as dosage_name,
-            cm.medicine_specifications AS specification,
-            cm.medicine_manufacturer_name as manufacturer,
-            cm.medicine_place as place,
-            cm.medicine_unit AS pack,
-            " " as model,
-            csd.stock_batch_number as batch_no,
-            csd.create_time as medicine_deadline,
-            csd.medicine_deadline as manufacture_time,
-            cm.medicine_barcode as bar_code,
-            "" as regist_no,
-            csd.stock_channel as delivery_company,
-            "999999999" as distributor,
-            cp.purchase_no as store_storage_code,
-            sum( csd.stock_change_number ) AS storage_quantity,
-            csd.stock_bid AS price,
-            cs.medicine_retail_price AS retail_price,
-            "" as plat_item_code,
-            "" as plat_item_name,
-            idm.standard_menu_code as item_code,
-            idm.insurance_medicine_name as item_name,
-            cp.create_username AS storage_man,
-            cp.create_time as storage_time
-        FROM
-            clc_stock_detail csd,
-            clc_medicine cm,
-            clc_stock cs,
-            clc_stock_inbound csi,
-            clc_purchase cp,
-            ins_d_medicine idm
-        WHERE
-            csd.medicine_id = cm.medicine_id
-            AND csd.clinic_id = cm.clinic_id
-            AND csd.clinic_id = cs.clinic_id
-            AND csd.medicine_id = cs.medicine_id
-            AND cs.warehouse_code = '1'
-            AND csd.clinic_id = csi.clinic_id
-            AND csd.id = csi.id
-            AND csd.clinic_id = cp.clinic_id
-            AND cp.id = csi.purchase_id
-            AND csd.clinic_id = #{clinicId}
-            AND timestamp_number != 'default'
-            AND cm.is_base = 1
-            and cp.purchase_no is not null
-            AND idm.medicine_id = cm.medicine_id
-            AND idm.clinic_id = cm.clinic_id
-        GROUP BY
-            cp.id,
-            csd.medicine_id
-        ORDER BY
-            cp.create_time,
-            csd.medicine_id
+
     </select>
 
 

src/main/resources/mapper/UploadExpectionLogMapping.xml

@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.miyzh.dao.UploadExcepctionLogMapper">
-
-    <resultMap id="BaseResultMap" type="com.miyzh.entity.UploadExceptionLog">
-        <result column="id" jdbcType="BIGINT" property="id" />
-        <result column="trade_code" jdbcType="VARCHAR" property="tradeCode" />
-        <result column="serial_number" jdbcType="VARCHAR" property="serialNumber" />
-        <result column="upload_info" jdbcType="LONGVARCHAR" property="uploadInfo" />
-        <result column="error_msg" jdbcType="VARCHAR" property="errorMsg" />
-        <result column="retry_count" jdbcType="INTEGER" property="retryCount" />
-        <result column="status" jdbcType="INTEGER" property="status" />
-        <result column="is_del" jdbcType="INTEGER" property="isDel" />
-        <result column="create_date" jdbcType="TIMESTAMP" property="createDate" />
-        <result column="modify_date" jdbcType="TIMESTAMP" property="modifyDate" />
-    </resultMap>
-
-    <select id="selectListLimit" resultMap="BaseResultMap">
-        select
-            id, trade_code, serial_number, upload_info, error_msg, retry_count, status, is_del, create_date, modify_date
-        from
-            upload_exception_log
-        where
-            is_del = 1
-            and status = 0
-            order by modify_date asc
-            limit 0, #{limit}
-    </select>
-
-    <insert id="insert" parameterType="com.miyzh.entity.UploadExceptionLog">
-        insert into upload_exception_log
-        (trade_code, serial_number, upload_info, error_msg, retry_count, status, is_del,modify_date,create_date)
-        values
-        (#{tradeCode},#{serialNumber}, #{uploadInfo}, #{errorMsg}, 1, #{status}, #{isDel}, now(), now())
-    </insert>
-    <update id="update" parameterType="com.miyzh.entity.UploadExceptionLog">
-        update upload_exception_log
-        set
-        <if test="serialNumber">
-            serial_number = #{serialNumber},
-        </if>
-        <if test="errorMsg">
-            error_msg = #{errorMsg},
-        </if>
-        <if test="status">
-            status = #{status},
-        </if>
-        <if test="isDel">
-            is_del = #{isDel},
-        </if>
-        modify_date = now(),
-        retry_count = retry_count+1
-        where id=#{id}
-    </update>
-
-</mapper>