From 134af8323aab69b405041823dfe6c0593e876c94 Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期三, 09 七月 2025 14:02:24 +0800
Subject: [PATCH] 完善erp对接

---
 src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java |   74 ++++++++++++++++++++++++++++--------
 1 files changed, 57 insertions(+), 17 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 735f7e6..006216f 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -1,19 +1,33 @@
 package com.zy.asrs.service.impl;
 
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.core.exception.CoolException;
 import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.ManLocDetl;
+import com.zy.asrs.entity.Mat;
+import com.zy.asrs.entity.Node;
+import com.zy.asrs.entity.param.LocDetlAdjustParam;
 import com.zy.asrs.entity.result.StockVo;
 import com.zy.asrs.mapper.LocDetlMapper;
 import com.zy.asrs.service.LocDetlService;
+import com.zy.asrs.service.MatService;
+import com.zy.asrs.utils.SaasUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
 @Service("locDetlService")
 public class LocDetlServiceImpl extends ServiceImpl<LocDetlMapper, LocDetl> implements LocDetlService {
+
+    @Autowired
+    private MatService matService;
 
     @Override
     public Page<LocDetl> getPage(Page<LocDetl> page) {
@@ -38,6 +52,32 @@
         }
     }
 
+    @Transactional
+    @Override
+    public void adjustLocDetl2(LocDetlAdjustParam param, String barcode, Long userId) {
+        Date now = new Date();
+        this.baseMapper.delete(new EntityWrapper<LocDetl>()
+                .eq("loc_no", param.getLocNo()));
+        for (LocDetlAdjustParam.LocDetlAdjust locDetlAdjust : param.getList()) {
+            Mat mat = matService.selectOne(new EntityWrapper<Mat>()
+                    .eq("matnr", locDetlAdjust.getMatnr()));
+            if (mat == null) {
+                throw new CoolException("鏃犳硶鎵惧埌闇�瑕佽皟鏁寸殑鐗╂枡,璇疯仈绯荤鐞嗗憳");
+            }
+
+            LocDetl manLocDetl = new LocDetl();
+            manLocDetl.sync(mat);
+            manLocDetl.setLocNo(param.getLocNo());
+            manLocDetl.setZpallet(barcode);
+            manLocDetl.setAnfme(locDetlAdjust.getCount());
+            manLocDetl.setBatch(locDetlAdjust.getBatch());
+            manLocDetl.setBarcode(barcode);
+            manLocDetl.setDanger(locDetlAdjust.getDanger());
+            SaasUtils.insertLog(3, manLocDetl.getLocNo(), manLocDetl.getMatnr(), manLocDetl.getAnfme());
+            this.baseMapper.insert(manLocDetl);
+        }
+    }
+
 
     @Override
     public boolean updateLocNo(String newLocNo, String oldLocNo) {
@@ -50,8 +90,8 @@
     }
 
     @Override
-    public List<String> getSameDetlToday(String matnr,String batch, Integer start, Integer end) {
-        return this.baseMapper.selectSameDetlTodayBatch(matnr,batch, start, end);
+    public List<String> getSameDetlToday(String matnr, String batch, Integer start, Integer end) {
+        return this.baseMapper.selectSameDetlTodayBatch(matnr, batch, start, end);
     }
 
 
@@ -83,23 +123,23 @@
     }
 
     @Override
-    public List<LocDetl> queryStock(String matnr, String batch, String orderNo, Set<String> locNos,String supp,String temp1,String temp2) {
-        return this.baseMapper.queryStock(matnr, batch, orderNo, locNos,supp,temp1,temp2);
+    public List<LocDetl> queryStock(String matnr, String batch, String orderNo, Set<String> locNos, String supp, String temp1, String temp2) {
+        return this.baseMapper.queryStock(matnr, batch, orderNo, locNos, supp, temp1, temp2);
     }
 
     @Override
-    public List<LocDetl> queryStockCrn(String matnr, String batch, String orderNo, Set<String> locNos,String supp,String temp1,String temp2) {
-        return this.baseMapper.queryStockCrn(matnr, batch, orderNo, locNos,supp,temp1,temp2);
+    public List<LocDetl> queryStockCrn(String matnr, String batch, String orderNo, Set<String> locNos, String supp, String temp1, String temp2) {
+        return this.baseMapper.queryStockCrn(matnr, batch, orderNo, locNos, supp, temp1, temp2);
     }
 
     @Override
-    public List<LocDetl> queryStockFour(String matnr, String batch, String orderNo, Set<String> locNos,String supp,String temp1,String temp2) {
-        return this.baseMapper.queryStockFour(matnr, batch, orderNo, locNos,supp,temp1,temp2);
+    public List<LocDetl> queryStockFour(String matnr, String batch, String orderNo, Set<String> locNos, String supp, String temp1, String temp2) {
+        return this.baseMapper.queryStockFour(matnr, batch, orderNo, locNos, supp, temp1, temp2);
     }
 
     @Override
-    public List<LocDetl> queryStockMinAnfme(String matnr, String batch, String orderNo, Set<String> locNos,String supp,String temp1,String temp2) {
-        return this.baseMapper.queryStockMinAnfme(matnr, batch, orderNo, locNos,supp,temp1,temp2);
+    public List<LocDetl> queryStockMinAnfme(String matnr, String batch, String orderNo, Set<String> locNos, String supp, String temp1, String temp2) {
+        return this.baseMapper.queryStockMinAnfme(matnr, batch, orderNo, locNos, supp, temp1, temp2);
     }
 
     @Override
@@ -139,23 +179,23 @@
     }
 
     @Override
-    public void updateMatTurn(String matnrOld,String matnr){
-        this.baseMapper.updateMatTurn(matnrOld,matnr);
+    public void updateMatTurn(String matnrOld, String matnr) {
+        this.baseMapper.updateMatTurn(matnrOld, matnr);
     }
 
     @Override
     public List<Map<String, Object>> selectLocDetlUnilateralMoveShuttleMap(Integer crnNo) {
-        if (crnNo==1){
+        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);
+    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);
+        return this.baseMapper.selectLocDetlUnilateralMoveShuttleN(matnr, batch, grade);
     }
 }

--
Gitblit v1.9.1