From 920a4ebef6f4f70f097ee9d10c05a5481e2d43ab Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 16 十二月 2023 16:56:22 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java |   69 ++++++++++++++++++++++++----------
 1 files changed, 49 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java
index 83efeb4..ae587de 100644
--- a/src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java
@@ -3,7 +3,6 @@
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.core.common.Cools;
 import com.core.exception.CoolException;
 import com.zy.asrs.entity.*;
 import com.zy.asrs.entity.param.LocDetlAdjustParam;
@@ -13,6 +12,7 @@
 import com.zy.asrs.service.MatService;
 import com.zy.asrs.service.NodeService;
 import com.zy.asrs.utils.SaasUtils;
+import com.zy.system.entity.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -91,8 +91,8 @@
     }
 
     @Override
-    public List<ManLocDetl> queryStock(String matnr, String batch, String orderNo, Set<String> locNos) {
-        return this.baseMapper.queryStock(matnr, batch, orderNo, locNos);
+    public List<ManLocDetl> queryStock(String matnr,String batch) {
+        return this.baseMapper.queryStock(matnr,batch);
     }
 
     @Override
@@ -143,11 +143,12 @@
 
     @Transactional
     @Override
-    public void adjustLocDetl(LocDetlAdjustParam param, Long userId) {
+    public void adjustLocDetl(LocDetlAdjustParam param, Long userId, User user) {
         Date now = new Date();
-        this.baseMapper.delete(new EntityWrapper<ManLocDetl>()
-                .eq("loc_no", param.getLocNo()));
         for (LocDetlAdjustParam.LocDetlAdjust locDetlAdjust : param.getList()) {
+            ManLocDetl manLocDetl = this.baseMapper.selectItem(param.getLocNo(), locDetlAdjust.getMatnr(), locDetlAdjust.getBatch());
+            this.baseMapper.delete(new EntityWrapper<ManLocDetl>()
+                    .eq("loc_no", param.getLocNo()).eq("matnr",locDetlAdjust.getMatnr()));
             Mat mat = matService.selectOne(new EntityWrapper<Mat>()
                     .eq("matnr", locDetlAdjust.getMatnr()));
             if (mat == null) {
@@ -159,24 +160,52 @@
                 throw new CoolException("鏃犳硶鎵惧埌闇�瑕佽皟鏁寸殑搴撲綅,璇疯仈绯荤鐞嗗憳");
 
             }
-            ManLocDetl manLocDetl = new ManLocDetl();
-            manLocDetl.setLocNo(param.getLocNo());
-            manLocDetl.setNodeId(node.getId());
-            manLocDetl.setZpallet(mat.getBarcode());
             manLocDetl.setAnfme(locDetlAdjust.getCount());
-            manLocDetl.setMatnr(mat.getMatnr());
-            manLocDetl.setMaktx(mat.getMaktx());
-            manLocDetl.setName(mat.getName());
-            manLocDetl.setSpecs(mat.getSpecs());
-            manLocDetl.setModel(mat.getModel());
-            manLocDetl.setBatch(locDetlAdjust.getBatch());
-            manLocDetl.setUnit(mat.getUnit());
-            manLocDetl.setBarcode(mat.getBarcode());
-            manLocDetl.setPrice(mat.getPrice());
-            SaasUtils.insertLog(3,manLocDetl.getLocNo(), manLocDetl.getMatnr(),manLocDetl.getAnfme());
+            manLocDetl.setUpdateBy(userId);
+            manLocDetl.setModiTime(now);
+            SaasUtils.insertLog(3,manLocDetl.getLocNo(), manLocDetl.getMatnr(),manLocDetl.getAnfme(),user.getUsername());
             this.baseMapper.insert(manLocDetl);
         }
     }
 
+    @Override
+    public Page<ManLocDetl> selectAllPage(Page<ManLocDetl> param) {
+        Map<String, Object> condition = param.getCondition();
+        List<ManLocDetl> manLocDetls = baseMapper.selectAllPage(condition);
+        param.setRecords(manLocDetls);
+        param.setTotal(baseMapper.selectAllPageSize(condition));
+        return param;
+    }
+
+    @Override
+    public ManLocDetl selectInventory(String LocNo, String Matnr, String batch) {
+        return baseMapper.selectInventory(LocNo,Matnr,batch);
+    }
+
+    @Override
+    public int deleteDatailed(String locNo, String matnr, String batch) {
+        return baseMapper.deleteDatailed(locNo,matnr,batch);
+    }
+
+    @Override
+    public int increase(Double anfme,String locNo, String matnr, String batch,Double weight) {
+        return baseMapper.increase(anfme,locNo,matnr,batch,weight);
+    }
+
+    @Override
+    public List<LocDetlWarningDTO> selectAllWarning() {
+        return baseMapper.selectAllWarning();
+    }
+
+    @Override
+    public List<LocDetl> selectByLocNo(String locNo) {
+        return this.baseMapper.selectByLocNo(locNo);
+    }
+
+    @Override
+    public int updateStockFreeze(String matnr, String locNo, Integer stockFreeze) {
+        return this.baseMapper.updateStockFreeze(matnr, locNo, stockFreeze);
+    }
+
 
 }

--
Gitblit v1.9.1