From a75b2d52ab0dcdb180705727dd2176bc5094d3a9 Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期五, 12 三月 2021 09:26:24 +0800
Subject: [PATCH] 1.0.3 优化平仓管理，增加id主键传入，出库权限判断，增加出库和移除确认弹窗
---
src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java | 40 ++++++++++++++++++++++++++++++++++------
1 files changed, 34 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java
index cfdbba9..1a27ccd 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java
@@ -21,17 +21,45 @@
}
@Override
- public void updateLocNormal(String matnr, Double anfme, Long modiUser, Date modiTime) {
- baseMapper.updateLocNormal(matnr, anfme, modiUser, modiTime);
+ public void updateLocNormal(String matnr, BigDecimal anfme, Long modiUser, Date modiTime, Integer id) {
+ baseMapper.updateLocNormal(matnr, anfme, modiUser, modiTime, id);
}
@Override
- public void outLocNormal(String matnr, Long modiUser, Date modiTime) {
- baseMapper.outLocNormal(matnr, modiUser, modiTime);
+ public void outLocNormal(String matnr, Long modiUser, Date modiTime, Integer id) {
+ baseMapper.outLocNormal(matnr, modiUser, modiTime, id);
}
@Override
- public void removeLocNormal(String matnr, Long modiUser, Date modiTime) {
- baseMapper.removeLocNormal(matnr, modiUser, modiTime);
+ public void removeLocNormal(String matnr, Long modiUser, Date modiTime, Integer id) {
+ baseMapper.removeLocNormal(matnr, modiUser, modiTime, id);
+ }
+
+ @Override
+ public void locNormalIn(List<LocNormal> list) {
+ baseMapper.locNormalIn(list);
+ }
+
+ @Override
+ public void pdaLocNormalIn(List<LocNormal> list) {
+ baseMapper.pdaLocNormalIn(list);
+ }
+
+ @Override
+ public List<LocNormal> pdaLocNormalQuery(String matnr, String warehouse) {
+ return baseMapper.pdaLocNormalQuery(matnr, warehouse);
+ }
+
+ @Override
+ public void pdaLocNormalOut(List<LocNormal> list) {
+ for (Integer i = 0; i < list.size(); i++) {
+ if (list.get(i).getAnfme().equals(list.get(i).getAnfmeOut())) {
+ baseMapper.pdaLocNormalOut1(list.get(i).getId(), list.get(i).getMatnr(), list.get(i).getModiUser(), list.get(i).getModiTime(), list.get(i).getWarehouse());
+ }
+ if (list.get(i).getAnfmeOut().compareTo(list.get(i).getAnfme()) == -1) {
+ BigDecimal diff = (list.get(i).getAnfme()).subtract(list.get(i).getAnfmeOut());
+ baseMapper.pdaLocNormalOut2(list.get(i).getId(), list.get(i).getMatnr(), diff, list.get(i).getModiUser(), list.get(i).getModiTime(), list.get(i).getWarehouse());
+ }
+ }
}
}
--
Gitblit v1.9.1