From a23bf319248345801a7f3110f246336d244e8edc Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 17 二月 2025 13:55:10 +0800
Subject: [PATCH] 退货增加退货标识，退货人，退货备注，清空库区和库位值
---
src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java
index 413bf44..9eb8ebe 100644
--- a/src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java
@@ -125,11 +125,18 @@
//pla.setStatus(GlobleParameter.PLA_STATUS_0);
pla.setModifyTime(new Date());
+ // 閫�璐т汉 modify_user锛岄��璐у娉� create_user锛岄��璐ф爣璇� transfer
+ pla.setModifyUser(user.getUsername());
+ pla.setCreateUser(plaQty.getMemo());
+ pla.setTransfer("閫�璐�");
+ pla.setStash(""); // 搴撳尯
+ pla.setLocNo(""); // 搴撲綅
+
pla.setWeightAnfme(pla.getWeightAnfme() + plaQty.getOrderWeight());
pla.setStatus(GlobleParameter.PLA_STATUS_1);
this.updateById(pla);
- SaasUtils.insertLog(0,pla.getLocNo(),pla.getBrand(),plaQty.getOrderWeight(),user.getUsername(),
+ SaasUtils.insertLog(4,pla.getLocNo(),pla.getBrand(),plaQty.getOrderWeight(),user.getUsername(),
null,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop(),null);
});
@@ -165,6 +172,7 @@
Object status = page.getCondition().get("status");
String type = (String) page.getCondition().get("type");
String workshop = (String) page.getCondition().get("workshop");
+ String transfer = (String) page.getCondition().get("transfer");
String createTime = create_time == null ? null : create_time.toString();
if(!Cools.isEmpty(createTime)){
@@ -172,7 +180,7 @@
stime = DateUtils.convert(dates[0]);
etime = DateUtils.convert(dates[1]);
}
- plaList=baseMapper.getStockStatisAll(brand == null ? null:brand.toString(), status == null ? null:status.toString(), stime,etime, type, workshop);
+ plaList=baseMapper.getStockStatisAll(brand == null ? null:brand.toString(), status == null ? null:status.toString(), stime,etime, type, workshop, transfer);
double weightSum = plaList.stream().mapToDouble(Pla::getWeight).sum();
--
Gitblit v1.9.1