From 2661204a95f968acd5b4ead369960b7f6bbeb88c Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Sat, 6 Dec 2025 16:02:43 +0800 Subject: [PATCH 1/2] =?UTF-8?q?demand:=20=20=20=20=E5=AE=9E=E6=97=B6?= =?UTF-8?q?=E6=89=AB=E6=8F=8F=E6=BC=8F=E7=BB=84=E6=89=B9=E6=AC=A1=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xdadan/erp/web/emis/EmisTmsSiteBatchController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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("发送成功"); From 2096f447d27c26b4cf8da054a0431935834775af Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Sat, 6 Dec 2025 16:26:27 +0800 Subject: [PATCH 2/2] =?UTF-8?q?demand:=20=20=20=20=E5=AE=9E=E6=97=B6?= =?UTF-8?q?=E6=89=AB=E6=8F=8F=E6=BC=8F=E7=BB=84=E6=89=B9=E6=AC=A1=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../emis/service/impl/EmisTmsSiteBatchMissServiceImpl.java | 2 +- emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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}