From 01107e8aadfaf1e84a971d8eeb9ab37e1c5569f3 Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期五, 01 十二月 2023 09:38:56 +0800
Subject: [PATCH] feat: 部门退回/报废公用接口
---
consum-base/src/main/java/com/consum/base/core/WarehouseBusinessService.java | 29 ++++++++++++++---------------
1 files changed, 14 insertions(+), 15 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 669e63e..3d2b8f5 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
@@ -2,13 +2,12 @@
import com.consum.base.core.param.BaseWarehouseParam;
import com.consum.base.core.param.DepBackWarehouseParam;
-import com.consum.base.core.tools.SqlParameter;
-import com.consum.base.core.tools.SuperMap;
-import com.consum.base.core.util.DateUtil;
+import com.consum.base.core.utils.SqlParameter;
+import com.consum.base.core.utils.SuperMap;
+import com.consum.base.core.utils.DateUtil;
import com.consum.model.po.*;
import com.walker.infrastructure.utils.NumberGenerator;
import com.walker.jdbc.service.BaseServiceImpl;
-import org.bouncycastle.jcajce.provider.asymmetric.GOST;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -762,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);
@@ -793,8 +792,8 @@
his.setWhGoodsId(result.getLendingModel().getWhGoodsId());
his.setInitialCount(result.getInitial_count());
his.setEndCount(result.getEnd_count());
- his.setWarehouseId(scrapped.getWarehouseId());
- his.setWarehouseName(scrapped.getWarehouseName());
+ his.setWarehouseId(scrapped.getOutWarehouseId());
+ his.setWarehouseName(scrapped.getOutWarehouseName());
his.setDepartmentId(scrapped.getDepartmentId());
his.setDepartmentName(scrapped.getDepartmentName());
insert(his);
@@ -805,14 +804,14 @@
model.setDepFormScrappedGoodsId(map.getLong("DEP_FORM_SCRAPPED_GOODS_ID"));
model.setScrappedCode(map.getString("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