From 6ec9e19c91c93204a8f5b7190fb6f54a204e7ff7 Mon Sep 17 00:00:00 2001
From: zc <zc>
Date: 星期一, 29 七月 2024 11:36:19 +0800
Subject: [PATCH] 订单组托代码

---
 src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java |   56 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 52 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
index b2141f1..ff7f8a8 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -1,18 +1,28 @@
 package com.zy.asrs.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.StockStatisDTO;
 import com.zy.asrs.entity.result.StockVo;
 import com.zy.asrs.mapper.LocDetlMapper;
 import com.zy.asrs.service.LocDetlService;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 @Service("locDetlService")
 public class LocDetlServiceImpl extends ServiceImpl<LocDetlMapper, LocDetl> implements LocDetlService {
+
+    @Override
+    public Page<LocDetl> getPage(Page<LocDetl> page) {
+        page.setRecords(baseMapper.listByPage(page.getCondition()));
+        page.setTotal(baseMapper.listByPageCount(page.getCondition()));
+        return page;
+    }
 
     @Override
     public Page<LocDetl> getStockOut(Page<LocDetl> page) {
@@ -30,6 +40,7 @@
         }
     }
 
+
     @Override
     public boolean updateLocNo(String newLocNo, String oldLocNo) {
         return baseMapper.updateLocNo(newLocNo, oldLocNo) > 0;
@@ -40,11 +51,16 @@
         return this.baseMapper.selectSameDetlToday(matnr, start, end);
     }
 
+    @Override
+    public List<String> getSameDetlToday(String matnr, String batch, Integer start, Integer end) {
+        return this.baseMapper.selectSameDetlTodayBatch(matnr, batch, start, end);
+    }
+
 
     @Override
-    public Page<LocDetl> getStockStatis(Page<LocDetl> page) {
-        page.setRecords(baseMapper.getStockStatis(page.getCondition()));
-        page.setTotal(baseMapper.getStockStatisCount(page.getCondition()));
+    public Page<StockStatisDTO> getStockStatis(Page<StockStatisDTO> page) {
+        page.setRecords(baseMapper.asrsAndErpList(page.getCondition()));
+        page.setTotal(baseMapper.asrsAndErpCount(page.getCondition()));
         return page;
     }
 
@@ -70,7 +86,12 @@
 
     @Override
     public List<LocDetl> queryStock(String matnr, String batch, String orderNo, Set<String> locNos) {
-        return this.baseMapper.queryStock(matnr, batch, orderNo, locNos);
+        return this.baseMapper.queryStock(null, matnr, batch, orderNo, locNos);
+    }
+
+    @Override
+    public List<LocDetl> queryStock(String spgNo) {
+        return this.baseMapper.queryStock(spgNo, null, null, null, null);
     }
 
     @Override
@@ -85,6 +106,7 @@
 
     /**
      * 鑾峰彇搴撳瓨鎬绘暟
+     *
      * @return
      */
     @Override
@@ -103,4 +125,30 @@
     public LocDetl selectItem(String locNo, String matnr, String batch) {
         return this.baseMapper.selectItem(locNo, matnr, batch);
     }
+
+    @Override
+    public Double getLocDetlSumQty(String locNo) {
+        return this.baseMapper.selectLocDetlSumQty(locNo);
+    }
+
+    @Override
+    public void updateMatTurn(String matnrOld, String matnr) {
+        this.baseMapper.updateMatTurn(matnrOld, matnr);
+    }
+
+    @Override
+    public List<Map<String, Object>> selectLocDetlUnilateralMoveShuttleMap(Integer crnNo) {
+        if (crnNo == 1) {
+            return this.baseMapper.selectLocDetlUnilateralMoveShuttleMapY(crnNo);
+        }
+        return this.baseMapper.selectLocDetlUnilateralMoveShuttleMapN(crnNo);
+    }
+
+    @Override
+    public List<LocDetl> selectLocDetlUnilateralMoveShuttle(String matnr, String batch, String grade, Integer crnNo) {
+        if (crnNo == 1) {
+            return this.baseMapper.selectLocDetlUnilateralMoveShuttleY(matnr, batch, grade);
+        }
+        return this.baseMapper.selectLocDetlUnilateralMoveShuttleN(matnr, batch, grade);
+    }
 }

--
Gitblit v1.9.1