From d52b5d11199cc6b7cec42deb82c831a4ed15a3b4 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期五, 31 五月 2024 14:56:58 +0800
Subject: [PATCH] 仓库： 显示在库信息，入库完成后显示成功入库的包数 订单出库页面显示剩余待检包数 (PDA) 未查询到的提示改为显示物料实际状态 拣货单已完成，单据未完成 ✔ 单据数量字段显示变更 ✔ 拣货单按实际操作时间降序排序 ✔ 拣货单明细导出 ✔ 拣货单显示创建时间与操作时间 ✔
---
src/main/java/com/zy/asrs/utils/PlaExcelListener.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/PlaExcelListener.java b/src/main/java/com/zy/asrs/utils/PlaExcelListener.java
index e971964..781f919 100644
--- a/src/main/java/com/zy/asrs/utils/PlaExcelListener.java
+++ b/src/main/java/com/zy/asrs/utils/PlaExcelListener.java
@@ -87,12 +87,13 @@
// throw new CoolException("淇濆瓨鍟嗗搧淇℃伅澶辫触锛屽晢鍝佺紪鐮侊細" + excel.getMatnr());
// }
total++;
- }else if(Cools.eq(pla.getStatus(),GlobleParameter.PLA_STATUS_0) || Cools.eq(pla.getStatus(),GlobleParameter.PLA_STATUS_1) || Cools.eq(pla.getStatus(),GlobleParameter.PLA_STATUS_00)){
+ }else if(Cools.eq(pla.getStatus(),GlobleParameter.PLA_STATUS_0) || Cools.eq(pla.getStatus(),GlobleParameter.PLA_STATUS_00)){
excel.setId(pla.getId());
excel.setCreateTime(pla.getCreateTime());
excel.setStatus(pla.getStatus());
excel.setPakinTime(pla.getPakinTime());
excel.setStash(pla.getStash());
+ excel.setStockFreeze(pla.getStockFreeze());
if(Cools.isEmpty(excel.getLocNo())){
excel.setLocNo(pla.getLocNo());
}
@@ -174,7 +175,7 @@
pla.setStep(2);
pla.setModifyTime(new Date());
pla.setStatus(GlobleParameter.PLA_STATUS_00);
- pla.setStockFreeze(1);
+ pla.setStockFreeze(Cools.isEmpty(excel.getStockFreeze()) ? 1 : excel.getStockFreeze());
pla.setWeightAnfme(pla.getWeight());
Mat mat = matService.selectByMaktx(pla.getBrand());
if(Cools.isEmpty(mat)){
--
Gitblit v1.9.1