From 9b6a50bf1288d2f7f06a67bec0c902d1256e44fe Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期六, 05 七月 2025 11:15:54 +0800
Subject: [PATCH] 1.订单出库改物料多的先出 2.新增订单明细打印功能

---
 zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/LocDetlServiceImpl.java |   60 +++++++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 49 insertions(+), 11 deletions(-)

diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/LocDetlServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/LocDetlServiceImpl.java
index 2cdd85f..de92afa 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/LocDetlServiceImpl.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/LocDetlServiceImpl.java
@@ -3,16 +3,14 @@
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zy.asrs.common.domain.dto.QueryStockPreDo;
+import com.zy.asrs.common.domain.dto.ReportStockDto;
 import com.zy.asrs.common.wms.mapper.LocDetlMapper;
 import com.zy.asrs.common.wms.entity.LocDetl;
 import com.zy.asrs.common.wms.service.LocDetlService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 @Service("locDetlService")
 public class LocDetlServiceImpl extends ServiceImpl<LocDetlMapper, LocDetl> implements LocDetlService {
@@ -33,13 +31,53 @@
     }
 
     @Override
-    public List<LocDetl> queryStock(String matnr, String batch, String orderNo, Set<String> locNos) {
-        List<LocDetl> result = new ArrayList<>();
-        List<QueryStockPreDo> preDos = this.baseMapper.queryStockPre(matnr);
-        for (QueryStockPreDo preDo : preDos) {
-            List<LocDetl> locDetls = this.baseMapper.queryStock(matnr, preDo.getNo(), preDo.getOrderBy(), preDo.getBay());
-            result.addAll(locDetls);
-        }
+    public List<LocDetl> queryStock(String matnr, String batch, Long hostId) {
+        List<LocDetl> result = this.baseMapper.queryStock(matnr, batch, hostId);
         return result;
     }
+
+    @Override
+    public LocDetl selectItem(String locNo, String matnr, String batch, Long hostId) {
+        return this.baseMapper.selectItem(locNo, matnr, batch, hostId);
+    }
+
+    @Override
+    public boolean updateAnfme(Double anfme, String locNo, String matnr, String batch, Long hostId) {
+        if (anfme <= 0) {
+            return this.baseMapper.deleteItem(locNo, matnr, batch, hostId) > 0;
+        } else {
+            return baseMapper.updateAnfme(anfme, locNo, matnr, batch, hostId) > 0;
+        }
+    }
+
+    @Override
+    public boolean updateLocNo(String newLocNo, String oldLocNo, Long hostId) {
+        return baseMapper.updateLocNo(newLocNo, oldLocNo, hostId) > 0;
+    }
+
+    @Override
+    public IPage<LocDetl> getStockOut(Integer curr, Integer limit, Map<String, Object> param) {
+        Page<LocDetl> page = new Page<>(curr, limit);
+        return this.baseMapper.getStockOutPage(page, param);
+    }
+
+    @Override
+    public List<ReportStockDto> getReportStockDto(Long hostId) {
+        return this.baseMapper.getReportStockDto(hostId);
+    }
+
+    @Override
+    public List<String> getSameDetl(String matnr, String batch, Long hostId) {
+        return this.baseMapper.selectSameDetl(matnr, batch, hostId);
+    }
+
+    @Override
+    public List<LocDetl> getStockStatisExcel() {
+        return this.baseMapper.getStockStatisExcel();
+    }
+
+    @Override
+    public List<ReportStockDto> getStock(List<String> matnr) {
+        return this.baseMapper.getStock(matnr);
+    }
 }

--
Gitblit v1.9.1