diff --git a/src/main/java/com/gaotao/modules/shopOrder/controller/WorkOrderAllocController.java b/src/main/java/com/gaotao/modules/shopOrder/controller/WorkOrderAllocController.java index 0442826..c653ff7 100644 --- a/src/main/java/com/gaotao/modules/shopOrder/controller/WorkOrderAllocController.java +++ b/src/main/java/com/gaotao/modules/shopOrder/controller/WorkOrderAllocController.java @@ -92,7 +92,7 @@ public class WorkOrderAllocController extends AbstractController { */ @PostMapping("/executeSync") public R executeSync(@RequestBody WorkOrderSyncRequest request) { - ResponseData response = workOrderAllocService.executeWorkOrderSync(request.getSite(), request.getOrderList()); + ResponseData response = workOrderAllocService.executeWorkOrderSync(request.getSite(), request.getUserName(), request.getOrderList()); if (response.isSuccess()) { return R.ok(response.getMsg()); } else { @@ -116,6 +116,7 @@ public class WorkOrderAllocController extends AbstractController { @lombok.Data public static class WorkOrderSyncRequest { private String site; + private String userName; private List orderList; // 包含orderNo和site的列表 } diff --git a/src/main/java/com/gaotao/modules/shopOrder/service/Impl/WorkOrderAllocServiceImpl.java b/src/main/java/com/gaotao/modules/shopOrder/service/Impl/WorkOrderAllocServiceImpl.java index b52a8ab..8d1be01 100644 --- a/src/main/java/com/gaotao/modules/shopOrder/service/Impl/WorkOrderAllocServiceImpl.java +++ b/src/main/java/com/gaotao/modules/shopOrder/service/Impl/WorkOrderAllocServiceImpl.java @@ -94,10 +94,10 @@ public class WorkOrderAllocServiceImpl implements WorkOrderAllocService { log.info("已插入{}条选中的工单到临时表", orderList.size()); } - // 2. 调用存储过程,orderNo传空字符串 + // 2. 调用存储过程,orderNo传* List params = new ArrayList<>(); params.add(query.getSite() != null ? query.getSite() : ""); - params.add(""); // orderNo传空字符串 + params.add("*"); // orderNo传"*"表示存储过程内不再过滤订单号,直接使用临时表数据 params.add(currentUser); List> resultList = procedureDao.getProcedureData("UspInsertWorkOrderAlloc", params); @@ -135,7 +135,7 @@ public class WorkOrderAllocServiceImpl implements WorkOrderAllocService { @Override @Transactional(rollbackFor = Exception.class) - public ResponseData executeWorkOrderSync(String site, List orderList) { + public ResponseData executeWorkOrderSync(String site, String userName, List orderList) { ResponseData responseData = new ResponseData(); try { log.info("开始执行工单数据回传"); @@ -156,7 +156,7 @@ public class WorkOrderAllocServiceImpl implements WorkOrderAllocService { } else { // 没有选中行时,使用默认site查询 UspWorkOrderAllocData queryData = new UspWorkOrderAllocData(); - queryData.setSite(site); + queryData.setCurrentUser(userName); unSyncedList = workOrderAllocMapper.selectUnSyncedData(queryData); } diff --git a/src/main/java/com/gaotao/modules/shopOrder/service/WorkOrderAllocService.java b/src/main/java/com/gaotao/modules/shopOrder/service/WorkOrderAllocService.java index 7bfb242..6756fb6 100644 --- a/src/main/java/com/gaotao/modules/shopOrder/service/WorkOrderAllocService.java +++ b/src/main/java/com/gaotao/modules/shopOrder/service/WorkOrderAllocService.java @@ -45,5 +45,5 @@ public interface WorkOrderAllocService { * @param orderList 工单列表(包含orderNo和site) * @return 执行结果 */ - ResponseData executeWorkOrderSync(String site, List orderList); + ResponseData executeWorkOrderSync(String site, String userName, List orderList); } diff --git a/src/main/resources/mapper/shopOrder/WorkOrderAllocMapper.xml b/src/main/resources/mapper/shopOrder/WorkOrderAllocMapper.xml index bf38e8e..a1ae7d8 100644 --- a/src/main/resources/mapper/shopOrder/WorkOrderAllocMapper.xml +++ b/src/main/resources/mapper/shopOrder/WorkOrderAllocMapper.xml @@ -187,11 +187,11 @@ AND site = #{site} - - AND orderNo IN - - #{item} - + + AND site in (select site from AccessSite where userID = #{currentUser}) + + + AND orderNo = #{orderNo} ORDER BY allocDate ASC