From b11c837f8ff994757be13f49123fa8c458bc92a5 Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期一, 26 四月 2021 16:40:12 +0800
Subject: [PATCH] 小太阳出库通知接口调整
---
src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java | 55 +++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 47 insertions(+), 8 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 1bc6ece..73e8760 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java
@@ -6,6 +6,8 @@
import com.zy.asrs.entity.LocNormal;
import com.zy.asrs.mapper.LocNormalMapper;
import com.zy.asrs.service.LocNormalService;
+import com.zy.common.service.erp.ErpSqlServer;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
@@ -14,6 +16,8 @@
@Service("locNormalService")
public class LocNormalServiceImpl extends ServiceImpl<LocNormalMapper, LocNormal> implements LocNormalService {
+ @Autowired
+ ErpSqlServer erpSqlServer;
@Override
public List<LocNormal> getLocNormalData() {
@@ -21,18 +25,30 @@
}
@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) {
+ // 骞充粨鍏ュ簱鍚庢洿鏂颁腑闂磋〃鏁版嵁锛孎flag_finish鏀逛负1锛岃〃绀哄钩浠撳叆搴撴垚鍔�
+ if (list.size() > 0) {
+ for (Integer i = 0; i < list.size(); i++) {
+ String sql = "update CPICMO set Fflag_finish = 1 where FBillNo = '" + list.get(i).getWarehouse() + "' and Fnumber = '" + list.get(i).getMatnr() +"'";
+ erpSqlServer.update(sql);
+ }
+ }
+ baseMapper.locNormalIn(list);
}
@Override
@@ -41,7 +57,30 @@
}
@Override
- public void locNormalIn(List<LocNormal> list) {
- baseMapper.locNormalIn(list);
+ public List<LocNormal> pdaLocNormalQuery(String matnr, String warehouse, String billNo) {
+ return baseMapper.pdaLocNormalQuery(matnr, warehouse, billNo);
+ }
+
+ @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());
+ }
+ }
+ }
+
+ @Override
+ public List<LocNormal> pdaLocNormalWarehouseQuery(String warehouse, String matnr) {
+ return baseMapper.pdaLocNormalWarehouseQuery(warehouse, matnr);
+ }
+
+ @Override
+ public void pdaLocNormalMove(List<LocNormal> list) {
+ baseMapper.pdaLocNormalMove(list);
}
}
--
Gitblit v1.9.1