From b00eeab31bd13ba34a03301aa441b0751d6a93e4 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期五, 19 十二月 2025 17:00:51 +0800
Subject: [PATCH] 第六排成品可以放第七排原材料
---
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 38 +++++++++++++++++++++++++++++++++-----
1 files changed, 33 insertions(+), 5 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 bb4ef0f..4ec2192 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -4,8 +4,11 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.LocDetlWarningDTO;
+import com.zy.asrs.entity.MatCode;
import com.zy.asrs.mapper.LocDetlMapper;
import com.zy.asrs.service.LocDetlService;
+import com.zy.asrs.service.MatCodeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -16,6 +19,8 @@
@Autowired
private LocDetlMapper locDetlMapper;
+ @Autowired
+ private MatCodeService matCodeService;
@Override
@@ -26,11 +31,15 @@
}
@Override
- public boolean updateAnfme(Double qty, String locNo, String matNo) {
+ public boolean updateAnfme(Double qty, String locNo, String matNo,String supplier) {
if (qty <= 0) {
- return delete(new EntityWrapper<LocDetl>().eq("loc_no", locNo).eq("mat_no", matNo));
+ return delete(new EntityWrapper<LocDetl>().eq("loc_no", locNo).eq("mat_no", matNo).eq("supplier",supplier));
} else {
- int res = baseMapper.updateAnfme(qty, locNo, matNo);
+ MatCode matCode = matCodeService.selectById(matNo);
+ Double weight = qty*matCode.getWeight()+30;
+ Double allQty = qty*matCode.getStr6();
+
+ int res = baseMapper.updateAnfme(qty, locNo, matNo,weight,allQty);
return res > 0;
}
}
@@ -64,8 +73,8 @@
}
@Override
- public List<LocDetl> getStockStatisExcel() {
- return this.baseMapper.getStockStatisExcel();
+ public List<LocDetl> getStockStatisExcel(LocDetl locDetl) {
+ return this.baseMapper.getStockStatisExcel(locDetl);
}
/**
@@ -77,4 +86,23 @@
return locDetlMapper.getStockSum();
}
+ @Override
+ public List<LocDetlWarningDTO> selectAllWarning(LocDetlWarningDTO locDetlWarningDTO) {
+ return this.baseMapper.selectAllWarning(locDetlWarningDTO);
+ }
+
+ @Override
+ public int getAllWarningCount(LocDetlWarningDTO locDetlWarningDTO) {
+ return this.baseMapper.getAllWarningCount(locDetlWarningDTO);
+ }
+
+ @Override
+ public List<LocDetl> selectByZpallet(String barcode) {
+ return this.baseMapper.selectByZpallet(barcode);
+ }
+
+ @Override
+ public boolean updateZpallet(String sBarcode,String tBarcode,String batch) {
+ return baseMapper.updateZpallet(sBarcode,tBarcode,batch)>0;
+ }
}
--
Gitblit v1.9.1