管理系统创建入库检验任务修改

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

@@ -6,6 +6,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.op.common.core.utils.DateUtils;
 import com.op.common.core.utils.bean.BeanUtils;
 import com.op.quality.domain.QcCheckTaskIncome;
@@ -101,10 +102,8 @@ public class QcCheckTaskWarehousingController extends BaseController {
 	@RequiresPermissions("quality:qcWarehousing:add")
 	@Log(title = "成品入库检验任务", businessType = BusinessType.INSERT)
 	@PostMapping
+	@DS("#header.poolName")
 	public AjaxResult add(@RequestBody QcCheckTaskWarehousing qcCheckTaskWarehousing) {
-		HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
-		String key = "#header.poolName";
-		qcCheckTaskWarehousing.setFactoryCode(request.getHeader(key.substring(8)).replace("ds_",""));
 		int r = qcCheckTaskWarehousingService.insertQcCheckTaskWarehousing(qcCheckTaskWarehousing);
 		if(r>0){
 			return toAjax(r);

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

@@ -86,10 +86,15 @@ public class QcCheckTaskWarehousingServiceImpl implements IQcCheckTaskWarehousin
 	 * @return 结果
 	 */
 	@Override
+	@Transactional(rollbackFor = Exception.class)
 	public int insertQcCheckTaskWarehousing(QcCheckTaskWarehousing qcCheckTaskWarehousing) {
 
 		if(StringUtils.isNotBlank(qcCheckTaskWarehousing.getFactoryCode())){
 			DynamicDataSourceContextHolder.push("ds_"+qcCheckTaskWarehousing.getFactoryCode());
+		}else{
+			HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+			String key = "#header.poolName";
+			qcCheckTaskWarehousing.setFactoryCode(request.getHeader(key.substring(8)).replace("ds_",""));
 		}
 
 		String bpDD = DateUtils.parseDateToStr(DateUtils.YYYYMMDD, DateUtils.getNowDate());
@@ -145,6 +150,7 @@ public class QcCheckTaskWarehousingServiceImpl implements IQcCheckTaskWarehousin
 				qcCheckTaskUser.setCheckManCode(splitCodes[i]);
 				qcCheckTaskUser.setCheckNo(qcCheckTaskWarehousing.getCheckNo());
 				qcCheckTaskUser.setBelongTo(beLongId);
+				qcCheckTaskUser.setFactoryCode(factoryCode);
 				qcCheckTaskUserList.add(qcCheckTaskUser);
 			}
             //检验人插入