From f5b7a2eb5125b17d470c9b8e0b9bb6ac1654dbae Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期六, 02 十一月 2024 11:16:02 +0800
Subject: [PATCH] 合并代码，解决冲突
---
src/main/java/com/zy/asrs/service/AgvLocDetlService.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/AgvLocDetlService.java b/src/main/java/com/zy/asrs/service/AgvLocDetlService.java
index 781e690..759d93d 100644
--- a/src/main/java/com/zy/asrs/service/AgvLocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/AgvLocDetlService.java
@@ -52,6 +52,8 @@
public AgvLocDetl selectByMatnrAndBatchAndCsocodeAndisoCode(String locNo, String matnr, String batch, String csocode, String isocode);
+ public AgvLocDetl selectByMatnrAndBatchAndCsocodeAndisoCode2(String locNo, String matnr, String orderNo, String batch, String csocode, String isocode);
+
public Double selectSumAnfmeByLocNo(String locNo);
public Double selectSumAnfmeByMatnr(String matnr);
--
Gitblit v1.9.1