增加清除数据源逻辑，质量来料、成品报告导出修改

op-common/op-common-core/src/main/java/com/op/common/core/utils/poi/ExcelCPReportMapUtil.java

@@ -67,7 +67,7 @@ public class ExcelCPReportMapUtil {
 		// 合并C3到I4的单元格，并设置样式
 		mergeAndStyleCells(sheet, new CellRangeAddress(2, 3, 2, 8), detailMap.get("title"));
 		// 合并J3到L4的单元格，并设置样式
-		mergeAndStyleCells(sheet, new CellRangeAddress(2, 3, 9, 12), "编码"+detailMap.get("standardNo"));
+		mergeAndStyleCells(sheet, new CellRangeAddress(2, 3, 9, 12), "编码"+detailMap.get("fileNo"));
 		/**左右表格1**/
 		//画边框
 		for(int r5=4;r5<12;r5++){
@@ -121,7 +121,7 @@ public class ExcelCPReportMapUtil {
 		// 合并E5到F6的单元格，并设置样式和内容
 		mergeAndStyleCells2(sheet,row9, new CellRangeAddress(8, 9, 4, 5), "检验依据", true, true, IndexedColors.GREY_25_PERCENT);
 		// 合并G5到I6的单元格，并设置样式（无背景色，只有边框和内容居中）
-		mergeAndStyleCells2(sheet,row9, new CellRangeAddress(8, 9,6, 8), detailMap.get("quality"), true, false, null);
+		mergeAndStyleCells2(sheet,row9, new CellRangeAddress(8, 9,6, 8), detailMap.get("standardNo"), true, false, null);
 		// 合并J5到K6的单元格，并设置样式和内容
 		mergeAndStyleCells2(sheet,row9, new CellRangeAddress(8, 9, 9, 10), "检验日期 ", true, true, IndexedColors.GREY_25_PERCENT);
 		// 合并L5到N6的单元格，并设置样式（无背景色，只有边框和内容居中）

op-common/op-common-core/src/main/java/com/op/common/core/utils/poi/ExcelReportMapUtil.java

@@ -67,7 +67,7 @@ public class ExcelReportMapUtil {
 		// 合并C3到I4的单元格，并设置样式
 		mergeAndStyleCells(sheet, new CellRangeAddress(2, 3, 2, 8), detailMap.get("title"));
 		// 合并J3到L4的单元格，并设置样式
-		mergeAndStyleCells(sheet, new CellRangeAddress(2, 3, 9, 12), "编码："+detailMap.get("standardNo"));
+		mergeAndStyleCells(sheet, new CellRangeAddress(2, 3, 9, 12), "编码："+detailMap.get("fileNo"));
 		/**左右表格1**/
 		//画边框
 		for(int r5=4;r5<13;r5++){
@@ -256,6 +256,15 @@ public class ExcelReportMapUtil {
 		mergeAndStyleCellsNoBorder(sheet,rowEnd2, new CellRangeAddress(rowNum+5, rowNum+5, 10, 11), "品管员", true, true, IndexedColors.GREY_25_PERCENT);
 		mergeAndStyleCellsNoBorder(sheet,rowEnd2, new CellRangeAddress(rowNum+5, rowNum+5, 12, 13), detailMap.get("checkManName"), true, false, null);
 
+		Row rowEnd3 = sheet.createRow(rowNum+4);
+		mergeAndStyleCellsNoBorder(sheet, rowEnd3, new CellRangeAddress(rowNum+4, rowNum+4, 0, 1), "备注", true, true, IndexedColors.GREY_25_PERCENT);
+		mergeAndStyleCellsNoBorder(sheet, rowEnd3, new CellRangeAddress(rowNum+4, rowNum+4, 2, 13), detailMap.get("remark"), true, false, null);
+
+//		Row rowEnd3 = sheet.createRow(rowNum+8);
+//		mergeAndStyleCellsNoBorder(sheet,rowEnd3, new CellRangeAddress(rowNum+5, rowNum+5, 0, 1), "品管经理/主任", true, true, IndexedColors.GREY_25_PERCENT);
+//		mergeAndStyleCellsNoBorder(sheet,rowEnd2, new CellRangeAddress(rowNum+6, rowNum+6, 0, 1), "备注", true, true, IndexedColors.GREY_25_PERCENT);
+//		mergeAndStyleCellsNoBorder(sheet,rowEnd2, new CellRangeAddress(rowNum+6, rowNum+6, 2, 13), detailMap.get("remark"), true, false, null);
+
 
 		return workbook;
 	}

op-modules/op-energy/src/main/java/com/op/energy/record/service/impl/RecordAlarmDataServiceImpl.java

@@ -327,6 +327,7 @@ public class RecordAlarmDataServiceImpl implements IRecordAlarmDataService {
 
     public void deviceOfflineTimingTaskDetail(String poolName) {
         DynamicDataSourceContextHolder.push(poolName);// 这是数据源的key
+        try {
             Date date = new Date();
             RecordAlarmRule alarmRule = new RecordAlarmRule();
             alarmRule.setTriggerRule(1L);
@@ -363,6 +364,10 @@ public class RecordAlarmDataServiceImpl implements IRecordAlarmDataService {
                     }
                 }
             }
+        }finally {
+            DynamicDataSourceContextHolder.poll();
+        }
+
     }
 
     /**

op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesBoradServiceImpl.java

@@ -52,9 +52,14 @@ public class MesBoradServiceImpl implements IMesBoradService {
     @Override
     public List<BoardDTO> getLineList(BoardDTO boardDTO) {
         DynamicDataSourceContextHolder.push(boardDTO.getFactoryCode());
+        try {
             boardDTO.setEquipmentTypeCode("equ_type_bzx");
             List<BoardDTO> lineList = mesMapper.getLineList(boardDTO);
             return lineList;
+        }finally {
+            DynamicDataSourceContextHolder.poll();
+        }
+
     }
 
     @Override

op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportProductController.java

@@ -111,6 +111,7 @@ public class QcCheckReportProductController extends BaseController {
         List<List<Map>> list =  qcCheckReportProductService.getCkeckProjectMap(qcCheckTaskIncome.getRecordId());
         QcCheckReportIncome detailInfo = qcCheckReportProductService.selectQcCheckReportIncomeByRecordId(qcCheckTaskIncome.getRecordId());
         Map<String,String> detailMap = new HashMap<>();
+        detailMap.put("fileNo",detailInfo.getFileNo());
         detailMap.put("orderType",detailInfo.getOrderType());
         detailMap.put("title","成品检验报告");
         detailMap.put("checkNo",detailInfo.getCheckNo());

op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskIncomeController.java

@@ -148,6 +148,7 @@ public class QcCheckTaskIncomeController extends BaseController {
         }else{
             detailMap.put("title","包材检验报告");
         }
+        detailMap.put("fileNo",detailInfo.getFileNo());
         detailMap.put("productGroupName",detailInfo.getProductGroupName());
         detailMap.put("incomeBatchNo",detailInfo.getIncomeBatchNo());
         detailMap.put("checkNo",detailInfo.getCheckNo());
@@ -162,11 +163,12 @@ public class QcCheckTaskIncomeController extends BaseController {
         detailMap.put("incomeTime",DateUtils.parseDateToStr("yyyy-MM-dd",detailInfo.getIncomeTime()));
         detailMap.put("checkResult",detailInfo.getCheckResult().equals("Y")?"√合格":"×不合格");
         detailMap.put("checkManName",detailInfo.getCheckManName());
-
+        detailMap.put("remark",detailInfo.getRemark());
         //表格结构数据
         ArrayList<ExcelCol> excelCols = new ArrayList<>();
         excelCols.add(new ExcelCol("检验项目", "ruleName", 30));
         excelCols.add(new ExcelCol("标准要求", "checkStandard", 30));
+        excelCols.add(new ExcelCol("抽检数", "samplePlan", 30));
         excelCols.add(new ExcelCol("实测结果", "actualValue", 30));
         excelCols.add(new ExcelCol("判定", "status", 30));
         excelCols.add(new ExcelCol("附件", "fileUrls", 30));

op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckUnqualifiedController.java

@@ -145,8 +145,12 @@ public class QcCheckUnqualifiedController extends BaseController {
     public List<QcCheckUnqualified> getUnqualifiedListMobile(QcCheckUnqualified qcCheckUnqualified) {
         qcCheckUnqualified.setDelFlag("0");
         DynamicDataSourceContextHolder.push(qcCheckUnqualified.getFactoryCode());
+        try {
             List<QcCheckUnqualified> list = qcCheckUnqualifiedService.selectQcCheckUnqualifiedList(qcCheckUnqualified);
             return list;
+        }finally {
+            DynamicDataSourceContextHolder.poll();
+        }
     }
     /**
      * 查询oa审批详情
@@ -155,6 +159,7 @@ public class QcCheckUnqualifiedController extends BaseController {
     public List<OAInfo> getOAInfoListMobile(QcCheckUnqualified qcCheckUnqualified) {
         List<OAInfo> list = qcCheckUnqualifiedService.getOAInfoList(qcCheckUnqualified);
         DynamicDataSourceContextHolder.push("master");
+        try {
             SysDictData sData = new SysDictData();
             sData.setDictType("logtype");
             Map<String, SysDictData> dictMap = qcCheckTypeProjectMapper.getDictMap(sData);
@@ -167,5 +172,9 @@ public class QcCheckUnqualifiedController extends BaseController {
                 }
             }
             return list;
+        }finally {
+            DynamicDataSourceContextHolder.poll();
+        }
+
     }
 }

op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java

@@ -234,6 +234,7 @@ public class QuaController extends BaseController {
 //        if(CollectionUtils.isEmpty(qcCheckTaskIncome.getQcCheckTaskDetails())){
 //            return error("[List<QcCheckTaskDetail>]不能为空");
 //        }
+        try {
             if(StringUtils.isBlank(qcCheckTaskIncome.getUpdateBy())){
                 return error("[updateBy]不能为空");
             }
@@ -241,6 +242,10 @@ public class QuaController extends BaseController {
                 return error("[updateByName]不能为空");
             }
             return toAjax(qcCheckTaskIncomeService.commitCheckResults(qcCheckTaskIncome));
+        }finally {
+            DynamicDataSourceContextHolder.poll();
+        }
+
     }
     @PostMapping(value = "commitCheckResultsCg")
     public AjaxResult commitCheckResultsCg(@RequestBody QcCheckTaskIncome qcCheckTaskIncome) {
@@ -248,6 +253,7 @@ public class QuaController extends BaseController {
 //        if(CollectionUtils.isEmpty(qcCheckTaskIncome.getQcCheckTaskDetails())){
 //            return error("[List<QcCheckTaskDetail>]不能为空");
 //        }
+        try {
             if(StringUtils.isBlank(qcCheckTaskIncome.getUpdateBy())){
                 return error("[updateBy]不能为空");
             }
@@ -255,6 +261,10 @@ public class QuaController extends BaseController {
                 return error("[updateByName]不能为空");
             }
             return toAjax(qcCheckTaskIncomeService.commitCheckResultsCg(qcCheckTaskIncome));
+        }finally {
+            DynamicDataSourceContextHolder.poll();
+        }
+
     }
 
     @PostMapping(value = "getUserIdList")
@@ -285,7 +295,12 @@ public class QuaController extends BaseController {
     @GetMapping("/pdaMaterialTree")
     public AjaxResult pdaMaterialTree(QcMaterialGroup materialGroup) {
         DynamicDataSourceContextHolder.push(materialGroup.getFactoryCode());
+        try {
             return success(qcMaterialGroupService.selectQcMaterialTreeList(materialGroup));
+        }finally {
+            DynamicDataSourceContextHolder.poll();
+        }
+
     }
 
     /**
@@ -295,68 +310,114 @@ public class QuaController extends BaseController {
     @GetMapping("/getCheckTypeProjectList")
     public TableDataInfo list(QcCheckTypeProject qcCheckTypeProject) {
         DynamicDataSourceContextHolder.push(qcCheckTypeProject.getFactoryCode());
+        try {
             startPage();
             List<QcCheckTypeProject> list = qcMaterialGroupService.getCheckTypeProjectList(qcCheckTypeProject);
             return getDataTable(list);
+        }finally {
+            DynamicDataSourceContextHolder.poll();
+        }
+
     }
 
     @GetMapping("/getUnqualifiedList")
     public TableDataInfo getUnqualifiedList(QcCheckUnqualified qcCheckUnqualified) {
         DynamicDataSourceContextHolder.push(qcCheckUnqualified.getFactoryCode());
+        try {
             startPage();
             qcCheckUnqualified.setDelFlag("0");
             List<QcCheckUnqualified> list = qcCheckUnqualifiedService.selectQcCheckUnqualifiedList(qcCheckUnqualified);
             return getDataTable(list);
+        }finally {
+            DynamicDataSourceContextHolder.poll();
+        }
+
     }
 
     /**获取来料工单列表**/
     @GetMapping("/getLLWorkOrder")
     public TableDataInfo getLLWorkOrder(QcCheckTaskIncome qcCheckTaskIncome) {
         DynamicDataSourceContextHolder.push(qcCheckTaskIncome.getFactoryCode());
+        try {
             startPage();
             List<QcCheckTaskIncome> list = qcCheckTaskIncomeService.getLLWorkOrder(qcCheckTaskIncome);
             return getDataTable(list);
+        }finally {
+            DynamicDataSourceContextHolder.poll();
+        }
+
     }
 
     /**不良类型**/
     @PostMapping("/getDefectListPDA")
     public List<QcDefectType> getDefectListPDA(@RequestBody QcDefectType qcDefectType) {
         DynamicDataSourceContextHolder.push(qcDefectType.getFactoryCode());
+        try {
             return qcCheckTaskIncomeService.getDefectListPDA(qcDefectType);
+        }finally {
+            DynamicDataSourceContextHolder.poll();
+        }
+
     }
 
     /**检测地点编码名称**/
     @PostMapping("/getCheckLocList")
     public List<QcDefectType> getCheckLocList(@RequestBody QcDefectType qcDefectType) {
         DynamicDataSourceContextHolder.push(qcDefectType.getFactoryCode());
+        try {
             return qcCheckTaskIncomeService.getCheckLocList(qcDefectType);
+        }finally {
+            DynamicDataSourceContextHolder.poll();
+        }
+
     }
 
     /**获取生产工单列表**/
     @GetMapping("/getWorkOrder")
     public TableDataInfo getWorkOrder(QcCheckTaskIncome qcCheckTaskIncome) {
         DynamicDataSourceContextHolder.push(qcCheckTaskIncome.getFactoryCode());
+        try {
             startPage();
             List<QcCheckTaskIncome> list = qcCheckTaskIncomeService.getWorkOrder(qcCheckTaskIncome);
             return getDataTable(list);
+        }finally {
+            DynamicDataSourceContextHolder.poll();
+        }
+
+
     }
 
     @PostMapping("/getBatchList")
     public List<QcCheckTaskIncome> getBatchList(@RequestBody QcCheckTaskIncome qcCheckTaskIncome) {
         DynamicDataSourceContextHolder.push(qcCheckTaskIncome.getFactoryCode());
+        try {
             return qcCheckTaskIncomeService.getBatchList(qcCheckTaskIncome);
+        }finally {
+            DynamicDataSourceContextHolder.poll();
+        }
+
     }
 
     /**当前正在生产的线体，正在运行的订单**/
     @PostMapping("/getLineProOrder")
     public List<QcCheckTaskIncome> getLineProOrder(@RequestBody QcCheckTaskIncome qcCheckTaskIncome) {
         DynamicDataSourceContextHolder.push(qcCheckTaskIncome.getFactoryCode());
+        try {
             return qcCheckTaskIncomeService.getLineProOrder(qcCheckTaskIncome);
+        }finally {
+            DynamicDataSourceContextHolder.poll();
+        }
+
     }
     /**成品抽检提交**/
     @PostMapping(value = "/commitCPCJCheck")
     public AjaxResult commitCPCJCheck(@RequestBody QcCheckTaskIncome qcCheckTaskIncome) {
         DynamicDataSourceContextHolder.push(qcCheckTaskIncome.getFactoryCode());
+        try {
             return toAjax(qcCheckTaskIncomeService.commitCPCJCheck(qcCheckTaskIncome));
+        }finally {
+            DynamicDataSourceContextHolder.poll();
+        }
+
     }
 }

op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskDetailServiceImpl.java

@@ -169,6 +169,7 @@ public class QcCheckTaskDetailServiceImpl implements IQcCheckTaskDetailService {
 
     private void resendWXFunc(String poolName){
         DynamicDataSourceContextHolder.push(poolName);                                             //这是数据源的key
+        try {
             List<QcCheckReportIncome> noCheckList = qcCheckTaskDetailMapper.selectNoCheckList();
             //发企业微信--------------------开始
             SysNoticeGroup noticeQo = new SysNoticeGroup();
@@ -208,6 +209,10 @@ public class QcCheckTaskDetailServiceImpl implements IQcCheckTaskDetailService {
                 noticeQo.setNoticeId(19L);
                 sendWeChartMessage(noticeQo,SC,noCheckListSC.size()+"个首件检验",noCheckListSC);
             }
+        }finally {
+            DynamicDataSourceContextHolder.poll();
+        }
+
     }
 
     private void sendWeChartMessage(SysNoticeGroup noticeQo,String checkNoList,String message,List<QcCheckReportIncome> noCheckList){

op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java

@@ -152,6 +152,7 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
 	public int insertQcCheckTaskIncome(QcCheckTaskIncome qcCheckTaskIncome) {
 		logger.info("impl创建检验任务接收参数："+JSONObject.toJSONString(qcCheckTaskIncome));
 		DynamicDataSourceContextHolder.push("ds_" + qcCheckTaskIncome.getFactoryCode());
+		try {
 			String bpDD = DateUtils.parseDateToStr(DateUtils.YYYYMMDD, DateUtils.getNowDate());
 			int liushuiNum = qcCheckTaskIncomeMapper.getTodayMaxNum(qcCheckTaskIncome);
 			String liushuiStr = String.format("%04d", liushuiNum);
@@ -305,6 +306,10 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
 				//发企业微信--------------------结束
 			}
 			return s;
+		}finally {
+			DynamicDataSourceContextHolder.poll();
+		}
+
 	}
 
 	/**
@@ -845,6 +850,7 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
 		if(StringUtils.isNotBlank(income.getFactoryCode())){
 			DynamicDataSourceContextHolder.push(income.getFactoryCode());
 		}
+		try {
 			String recordIds = income.getRecordId();
 			int m = 1;
 			//检测是否有已经检验的任务
@@ -880,6 +886,10 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
 			qcCheckTaskIncomeMapper.deleteTaskDetail(deleteIds);
 			qcCheckTaskIncomeMapper.deleteTaskUser(deleteIds);
 			return m;
+		}finally {
+			DynamicDataSourceContextHolder.poll();
+		}
+
 	}
 
 	@Override
@@ -1330,7 +1340,12 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
 	@Override
 	public List<QcCheckTaskIncome> getIncomeBatchList(String poolName) {
 		DynamicDataSourceContextHolder.push(poolName);//这是数据源的key
+		try {
 			return qcCheckTaskIncomeMapper.getIncomeBatchList();
+		}finally {
+			DynamicDataSourceContextHolder.poll();
+		}
+
 	}
 
 	@Override

op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java

@@ -484,6 +484,7 @@ public class QcCheckTaskProduceServiceImpl implements IQcCheckTaskProduceService
 	}
 	public void createProduceXJFunc(String poolName){
 		DynamicDataSourceContextHolder.push(poolName);// 这是数据源的key
+		try {
 			ProOrderWorkorderDTO qoWork = new ProOrderWorkorderDTO();
 			qoWork.setStatus("w2");
 			//活动中
@@ -522,6 +523,10 @@ public class QcCheckTaskProduceServiceImpl implements IQcCheckTaskProduceService
 				}
 			}
 			logger.info("++++++++++++" + poolName + "++++过程检验巡检结束++++++++++");
+		}finally {
+			DynamicDataSourceContextHolder.poll();
+		}
+
 	}
 
 	public static void main(String args[]) throws ParseException {

op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskWarehousingServiceImpl.java

@@ -138,7 +138,7 @@ public class QcCheckTaskWarehousingServiceImpl implements IQcCheckTaskWarehousin
 	@Override
 	//@Transactional(rollbackFor = Exception.class)不能加
 	public int insertQcCheckTaskWarehousing(QcCheckTaskWarehousing qcCheckTaskWarehousing) {
-
+		try {
 			if(StringUtils.isNotBlank(qcCheckTaskWarehousing.getFactoryCode())){
 				DynamicDataSourceContextHolder.push("ds_"+qcCheckTaskWarehousing.getFactoryCode());
 			}else{
@@ -311,6 +311,10 @@ public class QcCheckTaskWarehousingServiceImpl implements IQcCheckTaskWarehousin
 			}
 			logger.info("qc_check_task_detail:"+s+"成功");
 			return 1;
+		}finally {
+			DynamicDataSourceContextHolder.poll();
+		}
+
 	}
 
 	/**
@@ -421,6 +425,7 @@ public class QcCheckTaskWarehousingServiceImpl implements IQcCheckTaskWarehousin
 
 	public void createCPFunc(String poolName){
 		DynamicDataSourceContextHolder.push(poolName);// 这是数据源的key
+		try {
 			ProOrderWorkorderDTO qoWork = new ProOrderWorkorderDTO();
 			qoWork.setStatus("w3");
 			//报工的
@@ -435,6 +440,10 @@ public class QcCheckTaskWarehousingServiceImpl implements IQcCheckTaskWarehousin
 				logger.info("++++++++++++入库检验任务生成" + m + "++++++++++++++");
 			}
 			logger.info("++++++++++++" + poolName + "++++入库检验巡检结束++++++++++");
+		}finally {
+			DynamicDataSourceContextHolder.poll();
+		}
+
 	}
 
 //	//抽样方案

op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTypeProjectServiceImpl.java

@@ -72,6 +72,7 @@ public class QcCheckTypeProjectServiceImpl implements IQcCheckTypeProjectService
     public List<QcCheckTypeProject> selectQcCheckTypeProjectList(QcCheckTypeProject qcCheckTypeProject) {
         List<QcCheckTypeProject> dtos = qcCheckTypeProjectMapper.selectQcCheckTypeProjectList(qcCheckTypeProject);
         DynamicDataSourceContextHolder.push("master");
+        try {
             SysDictData sData = new SysDictData();
             sData.setDictType("unit");
             Map<String, SysDictData> dictMap = qcCheckTypeProjectMapper.getDictMap(sData);
@@ -84,6 +85,10 @@ public class QcCheckTypeProjectServiceImpl implements IQcCheckTypeProjectService
                 }
             }
             return dtos;
+        }finally {
+            DynamicDataSourceContextHolder.poll();
+        }
+
     }
 
     /**

op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTypeServiceImpl.java

@@ -118,7 +118,12 @@ public class QcCheckTypeServiceImpl implements IQcCheckTypeService {
     @Override
     public List<QcCheckType> getCheckType(QcCheckType qcCheckType) {
         DynamicDataSourceContextHolder.push(qcCheckType.getFactoryCode());// 这是数据源的key
+        try {
             return qcCheckTypeMapper.selectQcCheckTypeList(qcCheckType);
+        }finally {
+            DynamicDataSourceContextHolder.poll();
+        }
+
     }
 
     @Override

op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcInterfaceServiceImpl.java

@@ -101,22 +101,31 @@ public class QcInterfaceServiceImpl implements IQcInterfaceService {
     @Override
     public List<QcInterface> getCheckProjectsPie(QcInterface qcInterface) {
         DynamicDataSourceContextHolder.push(qcInterface.getFactoryCode());
-
+        try {
             String nowYMD = DateUtils.getDate();
             qcInterface.setYmd(nowYMD);
             List<QcInterface> dtos = qcInterfaceMapper.getCheckProjectsPie1(qcInterface);
             return dtos;
+        }finally {
+            DynamicDataSourceContextHolder.poll();
+        }
+
+
     }
 
     @Override
     public List<QcInterface> getCheckProjectsPieLL(QcInterface qcInterface) {
         DynamicDataSourceContextHolder.push(qcInterface.getFactoryCode());
-
+        try {
             String nowYMD = DateUtils.getDate();
             qcInterface.setYmd(nowYMD);
             qcInterface.setCheckType("checkTypeLL");
             List<QcInterface> dtos = qcInterfaceMapper.getCheckProjectsPieLL(qcInterface);
             return dtos;
+        }finally {
+            DynamicDataSourceContextHolder.poll();
+        }
+
     }
 
     @Override
@@ -192,6 +201,7 @@ public class QcInterfaceServiceImpl implements IQcInterfaceService {
     @Override
     public Map<String, String> getProduceStaticInfo(QcInterface qcInterface) {
         DynamicDataSourceContextHolder.push(qcInterface.getFactoryCode());
+        try {
             String nowYMD = DateUtils.getDate();
             qcInterface.setYmd(nowYMD);
 
@@ -241,33 +251,34 @@ public class QcInterfaceServiceImpl implements IQcInterfaceService {
                     dtoMap.put("monthOkRate", "0%");
                 }
             }
-//        /**质量看板测试开始**/
-//        dtoMap.put("todayPro", "3800");
-//        dtoMap.put("todaySample", "50");
-//        dtoMap.put("todayNoOk", "2");
-//        dtoMap.put("todayOkRate", "96.00%");
-//        dtoMap.put("monthPro", "83600");
-//        dtoMap.put("monthNoOk", "30");
-//        dtoMap.put("monthOkRate", "99.96%");
-//        /**质量看板测试结束**/
             return dtoMap;
+        }finally {
+            DynamicDataSourceContextHolder.poll();
+        }
+
     }
 
     @Override
     public List<QcInterface> getProduceNoOkList(QcInterface qcInterface) {
         DynamicDataSourceContextHolder.push(qcInterface.getFactoryCode());
+        try {
+            List<QcInterface> dtos = qcInterfaceMapper.getProduceNoOkList1(qcInterface);
+            return dtos;
+        }finally {
+            DynamicDataSourceContextHolder.poll();
+        }
 //        String nowYMD = DateUtils.getDate();
 //        qcInterface.setYmd(nowYMD);
 //        List<QcInterface> dtos = qcInterfaceMapper.getProduceNoOkList(qcInterface);
-        List<QcInterface> dtos = qcInterfaceMapper.getProduceNoOkList1(qcInterface);
+
-        return dtos;
+
     }
 
     @Override
     public Map<String, List<String>> getProMonthNoOk(QcInterface qcInterface) {
         DynamicDataSourceContextHolder.push(qcInterface.getFactoryCode());
         Map<String, List<String>> dtoMap = new HashMap<>();
-
+        try {
             String nowYMD = DateUtils.getDate();
             String[] nowYMDs = nowYMD.split("-");
             int nowMonth = Integer.parseInt(nowYMDs[1]);
@@ -302,6 +313,10 @@ public class QcInterfaceServiceImpl implements IQcInterfaceService {
 //        dtoMap.put("month", monthNames0);
 //        dtoMap.put("monthData", monthData0);
 //        /**质量看板测试结束**/
+
+        }finally {
+            DynamicDataSourceContextHolder.poll();
+        }
         return dtoMap;
     }
 
@@ -362,7 +377,7 @@ public class QcInterfaceServiceImpl implements IQcInterfaceService {
     public List<QcInterface> getMonthOfYearContrast(QcInterface qcInterface) {
         DynamicDataSourceContextHolder.push(qcInterface.getFactoryCode());
         List<QcInterface> dtos = new ArrayList<>();
-
+        try {
             QcInterface nowYM = new QcInterface();
             QcInterface lastYM = new QcInterface();
             String nowYMD = DateUtils.getDate();
@@ -414,21 +429,6 @@ public class QcInterfaceServiceImpl implements IQcInterfaceService {
                     dataLine1.add("0.00");
                 }
             }
-//        /**质量看板测试开始**/
-//        List<String> dataBar0 = new ArrayList<>();//不合规数量
-//        List<String> dataLine0 = new ArrayList<>();//不合格率
-//        List<String> dataBar1 = new ArrayList<>();//不合规数量
-//        List<String> dataLine1 = new ArrayList<>();//不合格率
-//        dataBar0.add("4");dataBar0.add("9");dataBar0.add("7");dataBar0.add("13");dataBar0.add("11");dataBar0.add("7");
-//        dataBar0.add("8");dataBar0.add("4");dataBar0.add("5");dataBar0.add("2");dataBar0.add("10");dataBar0.add("6");
-//        dataBar1.add("3");dataBar1.add("14");dataBar1.add("17");dataBar1.add("3");dataBar1.add("9");dataBar1.add("3");
-//        dataBar1.add("8");dataBar1.add("5");dataBar1.add("4");dataBar1.add("2");dataBar1.add("9");dataBar1.add("5");
-//
-//        dataLine0.add("1");dataLine0.add("2");dataLine0.add("0.5");dataLine0.add("0.9");dataLine0.add("1");dataLine0.add("1.9");
-//        dataLine0.add("1.1");dataLine0.add("1");dataLine0.add("0.7");dataLine0.add("0.9");dataLine0.add("1.5");dataLine0.add("1.3");
-//        dataLine1.add("0.5");dataLine1.add("1.5");dataLine1.add("0.9");dataLine1.add("1");dataLine1.add("0.7");dataLine1.add("1.9");
-//        dataLine1.add("1.4");dataLine1.add("0.5");dataLine1.add("0.9");dataLine1.add("1");dataLine1.add("1.3");dataLine1.add("1.2");
-//        /**质量看板测试结束**/
 
             lastYM.setDataBarArrays(dataBar0);
             lastYM.setDataLineArrays(dataLine0);
@@ -438,6 +438,9 @@ public class QcInterfaceServiceImpl implements IQcInterfaceService {
 
             dtos.add(lastYM);
             dtos.add(nowYM);
+        }finally {
+            DynamicDataSourceContextHolder.poll();
+        }
         return dtos;
     }
 

op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProCheckServiceImpl.java

@@ -129,7 +129,12 @@ public class QcProCheckServiceImpl implements QcProCheckService {
     @Override
     public List<QcProCheck> getEquipmentList(QcProCheck qcProCheck) {
         DynamicDataSourceContextHolder.push("ds_" + qcProCheck.getFactoryCode());
+        try {
             return qcProCheckMapper.getEquipmentList(qcProCheck);
+        }finally {
+            DynamicDataSourceContextHolder.poll();
+        }
+
     }
 
     @Override
@@ -211,6 +216,7 @@ public class QcProCheckServiceImpl implements QcProCheckService {
     @Override
     public QcCheckTaskIncome getCheckTaskDetailListCg(QcCheckTaskDetail qcCheckTaskDetail) {
         DynamicDataSourceContextHolder.push(qcCheckTaskDetail.getFactoryCode());
+        try {
             QcCheckTaskIncome dto = qcCheckTaskIncomeMapper.getTaskInfoCg(qcCheckTaskDetail.getBelongTo());
             if (dto == null) {
                 return null;
@@ -247,6 +253,10 @@ public class QcProCheckServiceImpl implements QcProCheckService {
             dto.setDefects(defects);
 
             return dto;
+        }finally {
+            DynamicDataSourceContextHolder.poll();
+        }
+
     }
 
     @Override
@@ -314,7 +324,12 @@ public class QcProCheckServiceImpl implements QcProCheckService {
     @Override
     public String getWeightInfo(QcCheckTaskDetail qcCheckTaskDetail) {
         DynamicDataSourceContextHolder.push(qcCheckTaskDetail.getFactoryCode());
+        try {
             return qcProCheckMapper.getWeightInfo(qcCheckTaskDetail);
+        }finally {
+            DynamicDataSourceContextHolder.poll();
+        }
+
     }
 
     @Override
@@ -323,6 +338,7 @@ public class QcProCheckServiceImpl implements QcProCheckService {
         if(StringUtils.isNotBlank(qcCheckTaskDetail.getFactoryCode())){
             DynamicDataSourceContextHolder.push(qcCheckTaskDetail.getFactoryCode());
         }
+        try {
             QcCheckTaskDetail dto = new QcCheckTaskDetail();
 
             QcCheckTaskIncome qincome = new QcCheckTaskIncome();
@@ -369,6 +385,10 @@ public class QcProCheckServiceImpl implements QcProCheckService {
             }
             dto.setStatus(status);
             return dto;
+        }finally {
+            DynamicDataSourceContextHolder.poll();
+        }
+
     }
     public static void main(String args[]){
         int m = 0;

op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml

@@ -102,7 +102,7 @@
                qct.quality, qct.unit,qct.supplier_code, qct.supplier_name, qct.income_time, qct.check_loc,
                qct.check_status, qct.check_man_code, qct.check_man_name,
                qct.check_time, qct.check_result, qct.status, qct.check_type, qct.attr1, qct.attr2, qct.attr3, qct.attr4,
-               qct.create_by, qct.create_time, qct.update_by, qct.update_time,
+               qct.create_by, qct.create_time, qct.update_by, qct.update_time,qct.remark,
                qct.factory_code, qct.del_flag,qct.reason,qct.product_type,qct.order_type,bp.product_group_name,qct.jgy,qct.pgy,qct.cxzz,
                ISNULL(bp.mvgr5, '09JS08S-048B') standardNo
         from qc_check_task qct

op-modules/op-sap/src/main/java/com/op/sap/controller/SapController.java

@@ -222,6 +222,7 @@ public class SapController extends BaseController {
     @PostMapping("/sapSupplierSync")
     @Log(title = "供应商主数据", businessType = BusinessType.SAP)
     public R sapSupplierSync() {
+        try {
             SapSupplierQuery sapSupplierQuery = new SapSupplierQuery();
             // 加载sf-cloud库的sys_datasource
             SysUser sysUser = new SysUser();
@@ -253,6 +254,10 @@ public class SapController extends BaseController {
                 }
                 logger.error("++++++++++++" + dateSource.get("poolName") + "++++供应商主数据结束++++++++++");
             });
+        }finally {
+            DynamicDataSourceContextHolder.poll();
+        }
+
         return R.ok();
     }
 

op-modules/op-sap/src/main/java/com/op/sap/service/impl/OADataInterfaceServiceImpl.java

@@ -22,6 +22,11 @@ public class OADataInterfaceServiceImpl implements OADataInterfaceService {
     @Override
     public Map selectOAUserByEmployeeID(String id) {
         DynamicDataSourceContextHolder.push("slave");// 这是数据源的key
+        try {
             return oaDataInterfaceMapper.selectOAUserByEmployeeID(id);
+        }finally {
+            DynamicDataSourceContextHolder.poll();
+        }
+
     }
 }

op-modules/op-system/src/main/java/com/op/system/service/impl/SysPostServiceImpl.java

@@ -182,7 +182,7 @@ public class SysPostServiceImpl implements ISysPostService {
     @Override
     public R sysPostInfoTask() {
         DynamicDataSourceContextHolder.push("master");// 这是数据源的key
-
+        try {
             Date maxTime0 = postMapper.getMaxTime();
             if(maxTime0 != null){
                 Calendar calendar = Calendar.getInstance();
@@ -207,6 +207,10 @@ public class SysPostServiceImpl implements ISysPostService {
                     return R.fail("无最新需要更新的岗位数据");
                 }
             }
+        }finally {
+            DynamicDataSourceContextHolder.poll();
+        }
+
 
         return R.ok();
     }

op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java

@@ -460,6 +460,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
     public String DesignatedPalletOutbound(WMSDesignatedPalle wmsDesignatedPalle) {
         DynamicDataSourceContextHolder.push("ds_" + wmsDesignatedPalle.getFactoryCode());
         String result = "";
+        try {
             if ("1".equals(wmsDesignatedPalle.getType())) {//类型１是托盘出库，２是空托出库计划下发
                 String meg = DesignatedPalletOutboundWCS(wmsDesignatedPalle);
                 if ("OK".equals(meg)) {//成功 rfidNo
@@ -511,7 +512,9 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
                     return result;
                 }
             }
-
+        }finally {
+            DynamicDataSourceContextHolder.poll();
+        }
         return result;
     }
 

op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutTrayServiceImpl.java

@@ -71,7 +71,12 @@ public class WmsProductPutTrayServiceImpl implements IWmsProductPutTrayService {
     public List<WmsProductPutTray> selectWmsProductPutTrayList(WmsProductPutTray wmsProductPutTray) {
         //todo 需要修改
         DynamicDataSourceContextHolder.push("ds_1000");
+        try {
             return wmsProductPutTrayMapper.selectWmsProductPutTrayList(wmsProductPutTray);
+        }finally {
+            DynamicDataSourceContextHolder.poll();
+        }
+
     }
 
     /**

op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsSellOutEmbryoServiceImpl.java

@@ -91,8 +91,13 @@ public class WmsSellOutEmbryoServiceImpl implements IWmsSellOutEmbryoService {
     public int updateWmsSellOutEmbryo(WmsSellOutEmbryo wmsSellOutEmbryo) {
         //todo 需要修改
         DynamicDataSourceContextHolder.push("ds_1000");
+        try {
             wmsSellOutEmbryo.setUpdateTime(DateUtils.getNowDate());
             return wmsSellOutEmbryoMapper.updateWmsSellOutEmbryo(wmsSellOutEmbryo);
+        }finally {
+            DynamicDataSourceContextHolder.poll();
+        }
+
     }
 
     /**
@@ -145,10 +150,14 @@ public class WmsSellOutEmbryoServiceImpl implements IWmsSellOutEmbryoService {
     public WmsSellOutEmbryo selectWmsSellOutEmbryoByOrderCodeAndProductCode(String deliveryOrder, String productCode) {
         //todo 需要修改
         DynamicDataSourceContextHolder.push("ds_1000");
+        try {
             ValueOperations<String, String> opsForValue = redisTemplate.opsForValue();
             opsForValue.set("deliveryOrder", deliveryOrder);
             opsForValue.set("productCode", productCode);
             return wmsSellOutEmbryoMapper.selectWmsSellOutEmbryoByOrderCodeAndProductCode(deliveryOrder, productCode);
+        }finally {
+            DynamicDataSourceContextHolder.poll();
+        }
     }
 
     @Override