From 34e0894214280018ac9de1bd0f8fe1ce5cd5a97f Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期二, 29 十月 2024 16:28:15 +0800
Subject: [PATCH] Merge branch 'refs/heads/phyzwms2' into phyzasrs-erp
---
src/main/java/com/zy/asrs/service/AgvLocDetlService.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/AgvLocDetlService.java b/src/main/java/com/zy/asrs/service/AgvLocDetlService.java
index b6debfe..781e690 100644
--- a/src/main/java/com/zy/asrs/service/AgvLocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/AgvLocDetlService.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.AgvLocDetl;
+import com.zy.asrs.entity.LocDetl;
import com.zy.common.model.LocDto;
import com.zy.common.model.TaskDto;
import org.springframework.web.multipart.MultipartFile;
@@ -14,7 +15,9 @@
public void addLocDetlInfo(String locNo, int taskCode);
- public double queryStockAndSetLocDto(String matnr, String batch, String orderNo, List<LocDto> locDtoList, double issued, String csocode, String isoseq);
+ AgvLocDetl selectItem(String locNo, String matnr, String batch, String csocode, String isoCode);
+
+ public double queryStockAndSetLocDto(String matnr, String batch, String orderNo, List<LocDto> locDtoList, double issued, String csocode, String isoseq, String type);
public void updateStock(String sourceLoc, String targetLoc);
@@ -28,6 +31,8 @@
Double getSumAnfmeDb(String matnr, String threeCode, Integer floor);
+ Double getSumAnfmeback(String matnr, String threeCode, Integer floor);
+
Integer sum();
List<AgvLocDetl> getStockStatisExcel();
--
Gitblit v1.9.1