diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsSiteBatchController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsSiteBatchController.java index 0e33c2614..2b2d8f93e 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsSiteBatchController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsSiteBatchController.java @@ -28,6 +28,7 @@ import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import com.xdadan.erp.common.annotation.Log; @@ -127,7 +128,7 @@ public class EmisTmsSiteBatchController extends EmisBaseController */ @GetMapping("/scanSiteBatchV2") // @PreAuthorize("@ss.hasPermi('emis:emisTmsSiteBatch:scanSiteBatch')") - public AjaxResult scanSiteBatchV2(String batchNo) { + public AjaxResult scanSiteBatchV2(@RequestParam("batchNo") String batchNo) { emisTmsSiteBatchService.scanSiteBatchV2(batchNo); return AjaxResult.success("发送成功"); diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchMissServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchMissServiceImpl.java index 5c111effe..87638efdc 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchMissServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchMissServiceImpl.java @@ -724,7 +724,7 @@ public class EmisTmsSiteBatchMissServiceImpl extends EmisBaseService implements List failedBillCodes = new ArrayList<>(); // 获取所有线路规划 - List treeRules = this.selectEmisTransPlanRuleTree(lineCodes); + List treeRules = emisTransPlanRuleMapper.selectEmisTransPlanRuleByLineCodes(lineCodes); if (treeRules.isEmpty()) { log.info("No trans plan rules found, skip auto scan v2"); return; diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml index dbafce4cd..038b5675a 100644 --- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml @@ -2584,8 +2584,8 @@ and dispatch_underling_site_code=#{dispatchUnderlingSiteCode} and destination_center_code=#{destinationCenterCode} and market_man_code = #{marketManCode} - and payee=#{payee} - and salesmen like concat('%', #{salesmen}, '%') + and a.payee=#{payee} + and a.salesmen like concat('%', #{salesmen}, '%') and operate_employee_code=#{operateEmployeeCode} and bl_is_question=#{blIsQuestion} and problem_type=#{problemType}