From 4901728f970314cddd9fa167cf3d3fb9476208e5 Mon Sep 17 00:00:00 2001
From: wang..123 <brook_w@163.com>
Date: 星期五, 18 二月 2022 08:12:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/sxjzasrs' into sxjzasrs
---
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 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 a53840d..fb8b96b 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,10 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.zy.asrs.entity.LocDetl;
+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 +18,8 @@
@Autowired
private LocDetlMapper locDetlMapper;
+ @Autowired
+ private MatCodeService matCodeService;
@Override
@@ -26,11 +30,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;
}
}
@@ -76,4 +84,5 @@
public List<LocDetl> getStockSum() {
return locDetlMapper.getStockSum();
}
+
}
--
Gitblit v1.9.1