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/service/LWhFormInventoryServiceImpl.java | 99 ++++++++++++++++++++++---------------------------
1 files changed, 44 insertions(+), 55 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryServiceImpl.java
index 92361bb..13f4f61 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryServiceImpl.java
@@ -6,6 +6,7 @@
import com.consum.base.core.utils.MapUtils;
import com.consum.base.core.utils.MapperUtil;
import com.consum.base.core.utils.PageUtil;
+import com.consum.base.pojo.excel.InventoryExcelTemplate;
import com.consum.base.pojo.query.LWhFormInventoryQry;
import com.consum.base.pojo.request.FormInventoryParam;
import com.consum.base.pojo.request.LWhFormInventoryParam;
@@ -30,6 +31,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
/**
@@ -46,11 +48,7 @@
@Autowired
private BaseWarehouseServiceImpl baseWarehouseService;
@Autowired
- private FinSysTenantUserServiceImpl finSysTenantUserService;
- @Autowired
private LWhFormInventoryGoodsServiceImpl inventoryGoodsService;
- @Autowired
- private BaseGoodsTemplateServiceImpl baseGoodsTemplateService;
@Autowired
private LWhGoodsService lWhGoodsService;
@Autowired
@@ -160,7 +158,7 @@
}
- public void saveInventory(FormInventoryVO dto, Long id) {
+ public List<FormInventoryGoodsVO> saveInventory(FormInventoryVO dto, Long id) {
//1.鏍规嵁鐩樼偣鍗昳d鏌ヨ鐩樼偣鍗�
LWhFormInventory lWhFormInventory = this.get(new LWhFormInventory(id));
if (lWhFormInventory == null) {
@@ -178,11 +176,9 @@
if (CollectionUtils.isEmpty(formInventoryGoodsList)) {
log.error("鐩樼偣鍗曠墿鍝佷负绌�");
}
- int num = inventoryGoodsService.add(formInventoryGoodsList, id);
- if (num != formInventoryGoodsList.size()) {
- log.error("鏇存柊鐩樼偣鍗曠墿鍝佸け璐�");
- }
+ List<FormInventoryGoodsVO> result = inventoryGoodsService.add(formInventoryGoodsList, id);
+ return result;
}
@@ -192,6 +188,7 @@
* @author 鍗㈠簡闃�
* @date 2023/10/31
*/
+ @Transactional(rollbackFor = Exception.class)
public int updateInventoryInfo(LWhFormInventoryParam dto, Integer state, S_user_core currentUser, FinSysTenantUser sysInfo) {
//1.鏍规嵁鐩樼偣鍗昳d鏌ヨ鐩樼偣鍗�
LWhFormInventory lWhFormInventory = this.get(new LWhFormInventory(dto.getId()));
@@ -229,51 +226,6 @@
return 1;
}
- /**
- * 瀹屾垚鐩樼偣
- *
- * @author 鍗㈠簡闃�
- * @date 2023/10/31
- */
-// public int finishPd(LWhFormInventoryParam dto) {
-// //1.鏍规嵁鐩樼偣鍗昳d鏌ヨ鐩樼偣鍗�
-// LWhFormInventory lWhFormInventory = this.get(new LWhFormInventory(dto.getId()));
-// if (lWhFormInventory == null) {
-// log.error("鏍规嵁鐩樼偣鍗昳d鏌ヨ鐩樼偣鍗� 澶辫触");
-// return 0;
-// }
-// //2.淇敼鐩樼偣鍗�
-// lWhFormInventory.setStates(2);
-// lWhFormInventory.setStopTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
-// int flag1 = this.update(lWhFormInventory);
-// if (flag1 == 0) {
-// log.error("淇敼鐩樼偣鍗� 澶辫触");
-// return 0;
-// }
-// //3.鏇存柊鐩樼偣鍗曠墿鍝�
-// List<LWhFormInventoryGoods> inventoryGoodsList = dto.getInventoryGoodsList();
-// if (CollectionUtils.isEmpty(inventoryGoodsList)) {
-// log.error("鐩樼偣鍗曠墿鍝� 涓虹┖");
-// return 0;
-// }
-// for (LWhFormInventoryGoods inventoryGoods : inventoryGoodsList) {
-// int errorCounts = inventoryGoods.getInitCounts() - inventoryGoods.getInventoryCounts();
-// if (errorCounts > 0) {
-// inventoryGoods.setInventoryResult(3);
-// } else if (errorCounts < 0) {
-// inventoryGoods.setInventoryResult(2);
-// } else {
-// inventoryGoods.setInventoryResult(1);
-// }
-// inventoryGoods.setErrorCounts(Math.abs(errorCounts));
-// }
-// int flag2 = inventoryGoodsService.update(inventoryGoodsList);
-// if (flag2 != inventoryGoodsList.size()) {
-// log.error("鏇存柊鐩樼偣鍗曠墿鍝� 澶辫触");
-// return 0;
-// }
-// return 1;
-// }
/**
* @return
@@ -344,6 +296,7 @@
formInventoryDetailVO.getInventoryResult() == null ? null : (formInventoryDetailVO.getInventoryResult() == 2 ? "鐩樼泩" : "鐩樹簭"));
formInventoryDetailVO.setInventoryType(
formInventoryDetailVO.getInventoryResult() == null ? null : (formInventoryDetailVO.getInventoryResult() == 2 ? "鐩樼泩鍏ュ簱" : "鐩樹簭鍑哄簱"));
+ formInventoryDetailVO.setWarehouseFormCode(formInventoryDetailVO.getWarehouseFormCode());
result.add(formInventoryDetailVO);
});
pageUtil.setDatas(result);
@@ -384,7 +337,7 @@
formInventoryVO.setWarehouseName(inventory.getWarehouseName());
String sql =
- "select bgm.id,bgt.id baseGoodsTemplateId,bgt.GOODS_NAME goodsTemplateName,bgm.MODEL_NAME baseGoodsModelsName,bgt.CLASSIFICATION type,bgm.UNIT "
+ "select bgt.id baseGoodsTemplateId,bgt.GOODS_NAME goodsTemplateName,bgm.MODEL_NAME baseGoodsModelsName,bgt.CLASSIFICATION type,bgm.UNIT "
+ "from base_goods_models bgm left join base_goods_template bgt on bgm.GOODS_TEMPLATES_ID = bgt.id "
+ "where bgt.AGENCY_ID = :agencyId";
HashMap<String, Object> param = new HashMap<>();
@@ -400,4 +353,40 @@
formInventoryVO.setFormInventoryGoodsList(goodsVOList);
return formInventoryVO;
}
+
+ public List<InventoryExcelTemplate> getExportList(Long id) {
+ String sql = "SELECT\n"
+ + "\tfi.INVENTORY_DATE createTime,\n"
+ + "\tfi.STOP_TIME endTime,\n"
+ + "\tfi.OPERATOR_NAME,\n"
+ + "\tfi.OPERATOR_NAME2 monitorName,\n"
+ + "\tfi.AGENCY_NAME tenantName,\n"
+ + "\tfig.GOODS_TEMPLATE_NAME templateName,\n"
+ + "\tfig.BASE_GOODS_MODELS_NAME baseModelName,\n"
+ + "\tfig.INVENTORY_COUNTS num,\n"
+ + "\tfig.INIT_COUNTS stockNum,\n"
+ + "\tfig.INVENTORY_RESULT,\n"
+ + "\tBEIZ1 remark\n"
+ + "FROM\n"
+ + "\tl_wh_form_inventory fi\n"
+ + "\tLEFT JOIN l_wh_form_inventory_goods fig ON fi.ID = fig.WH_FORM_INVENTORY_ID\n"
+ + "WHERE\n"
+ + "\tfi.ID = :id";
+ HashMap<String, Object> param = new HashMap<>();
+ param.put("id", id);
+ List<Map<String, Object>> select = this.select(sql, param, new MapperUtil());
+ if (CollectionUtils.isEmpty(select)) {
+ return null;
+ }
+ List<InventoryExcelTemplate> list = Lists.newArrayList();
+ select.forEach(item -> {
+ InventoryExcelTemplate inventoryExcelTemplate = MapUtils.convertMapToObj(item, InventoryExcelTemplate.class);
+ inventoryExcelTemplate.setInventoryDeception(inventoryExcelTemplate.getInventoryResult() == 1 ? "鏄�" : "鍚�");
+ inventoryExcelTemplate.setDeception(
+ inventoryExcelTemplate.getInventoryResult() == 1 ? "姝ｅ父" : (inventoryExcelTemplate.getInventoryResult() == 2 ? "鐩樼泩" : "鐩樹簭"));
+ list.add(inventoryExcelTemplate);
+ });
+ return list;
+
+ }
}
--
Gitblit v1.9.1