From ce1d9926ff986e195fd4a58cb5159fc8f45b32a5 Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期五, 01 十二月 2023 16:06:59 +0800
Subject: [PATCH] feat: 部门物品 1、报废单列表 2、报废明细 3、退回单列表 4、退回明细
---
consum-base/src/main/java/com/consum/base/core/WarehouseBusinessService.java | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/core/WarehouseBusinessService.java b/consum-base/src/main/java/com/consum/base/core/WarehouseBusinessService.java
index 621d496..142719f 100644
--- a/consum-base/src/main/java/com/consum/base/core/WarehouseBusinessService.java
+++ b/consum-base/src/main/java/com/consum/base/core/WarehouseBusinessService.java
@@ -761,7 +761,7 @@
" AND A.WAREHOUSE_ID = B.WAREHOUSE_ID \n" +
" AND A.WAREHOUSE_ID = :WAREHOUSE_ID";
- List<Map> list = select(sql,new SqlParameter("DEP_FORM_SCRAPPED_ID",scrapped.getId()).add("WAREHOUSE_ID",scrapped.getWarehouseId()));
+ List<Map> list = select(sql,new SqlParameter("DEP_FORM_SCRAPPED_ID",scrapped.getId()).add("WAREHOUSE_ID",scrapped.getOutWarehouseId()));
for (Map _map : list) {
SuperMap map = new SuperMap(_map);
@@ -792,26 +792,26 @@
his.setWhGoodsId(result.getLendingModel().getWhGoodsId());
his.setInitialCount(result.getInitial_count());
his.setEndCount(result.getEnd_count());
- his.setWarehouseId(scrapped.getWarehouseId());
- his.setWarehouseName(scrapped.getWarehouseName());
- his.setDepartmentId(scrapped.getDepartmentId());
- his.setDepartmentName(scrapped.getDepartmentName());
+ his.setWarehouseId(scrapped.getOutWarehouseId());
+ his.setWarehouseName(scrapped.getOutWarehouseName());
+// his.setDepartmentId(scrapped.getDepartmentId());
+// his.setDepartmentName(scrapped.getDepartmentName());
insert(his);
DepFormScrappedModel model = new DepFormScrappedModel();
model.setId(NumberGenerator.getLongSequenceNumber());
model.setDepFormScrappedGoodsId(map.getLong("DEP_FORM_SCRAPPED_GOODS_ID"));
- model.setScrappedCode(map.getString("SCRAPPED_CODE"));
+ model.setScrappedCode(map.getLong("SCRAPPED_CODE"));
model.setScrappedName(map.getString("SCRAPPED_NAME"));
- model.setUsingGoodsHisId(his.getId());
- model.setDepFormScrappedId(scrapped.getId());
- model.setWhGoodsId(his.getWhGoodsId());
- model.setScrappedCounts(his.getThisCount());
- model.setInitCount(his.getInitialCount());
- model.setDepFormLendingModelId(his.getDepFormLendingModelId());
- model.setDepFormLendingGoodsId(his.getDepFormLendingGoodsId());
- model.setDepFormLendingId(his.getDepFormLendingId());
+// model.setUsingGoodsHisId(his.getId());
+// model.setDepFormScrappedId(scrapped.getId());
+// model.setWhGoodsId(his.getWhGoodsId());
+// model.setScrappedCounts(his.getThisCount());
+// model.setInitCount(his.getInitialCount());
+// model.setDepFormLendingModelId(his.getDepFormLendingModelId());
+// model.setDepFormLendingGoodsId(his.getDepFormLendingGoodsId());
+// model.setDepFormLendingId(his.getDepFormLendingId());
insert(model);
}
}
--
Gitblit v1.9.1