From 9c12e20237eb56bf2b53f3d751ba618b56954fad Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期六, 02 十二月 2023 17:44:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
consum-base/src/main/java/com/consum/base/service/LWhFormInventoryServiceImpl.java | 98 ++++++++++++++++++++++++------------------------
1 files changed, 49 insertions(+), 49 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 79c9669..9cebb1c 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;
@@ -40,7 +41,7 @@
*/
@Slf4j
@Service
-public class LWhFormInventoryServiceImpl extends BaseServiceImpl {
+public class LWhFormInventoryServiceImpl extends BaseServiceImpl implements LWhFormInventoryService {
@Autowired
private CodeGeneratorService codeGeneratorService;
@@ -82,6 +83,7 @@
* @Author 鍗㈠簡闃�
* @Date 2023/10/31
*/
+ @Override
public int add(FormInventoryParam param, FinSysTenantUser currentUser, FinSysTenantUser operatorUser, FinSysTenantUser monitorUser) {
//鏂板鐩樼偣鍗�
LWhFormInventory lWhFormInventory = new LWhFormInventory();
@@ -120,6 +122,7 @@
* @Author 鍗㈠簡闃�
* @Date 2023/10/31
*/
+ @Override
public GenericPager<LWhFormInventory> queryList(LWhFormInventoryQry param, FinSysTenantUser sysInfo) {
StringBuilder sql = new StringBuilder(QUERY_LIST);
HashMap<String, Object> paramts = new HashMap<>();
@@ -157,7 +160,8 @@
}
- public List<FormInventoryGoodsVO> saveInventory(FormInventoryVO dto, Long id) {
+ @Override
+ public FormInventoryVO saveInventory(FormInventoryVO dto, Long id) {
//1.鏍规嵁鐩樼偣鍗昳d鏌ヨ鐩樼偣鍗�
LWhFormInventory lWhFormInventory = this.get(new LWhFormInventory(id));
if (lWhFormInventory == null) {
@@ -176,8 +180,8 @@
log.error("鐩樼偣鍗曠墿鍝佷负绌�");
}
List<FormInventoryGoodsVO> result = inventoryGoodsService.add(formInventoryGoodsList, id);
-
- return result;
+ dto.setFormInventoryGoodsList(result);
+ return dto;
}
@@ -188,6 +192,7 @@
* @date 2023/10/31
*/
@Transactional(rollbackFor = Exception.class)
+ @Override
public int updateInventoryInfo(LWhFormInventoryParam dto, Integer state, S_user_core currentUser, FinSysTenantUser sysInfo) {
//1.鏍规嵁鐩樼偣鍗昳d鏌ヨ鐩樼偣鍗�
LWhFormInventory lWhFormInventory = this.get(new LWhFormInventory(dto.getId()));
@@ -225,51 +230,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
@@ -277,6 +237,7 @@
* @Author 鍗㈠簡闃�
* @Date 2023/11/1
*/
+ @Override
public PageUtil<FormInventoryDetailVO> queryPdDetailList(LWhFormInventoryQry param, FinSysTenantUser sysInfo) {
StringBuilder sql = new StringBuilder(QUERY_PD_DETAIL_LIST);
HashMap<String, Object> paramts = new HashMap<>();
@@ -347,6 +308,7 @@
return pageUtil;
}
+ @Override
public List<FormInventoryGoodsVO> selectDetailById(Long id) {
String sql = "select fig.id, fig.BASE_GOODS_TEMPLATE_ID,fig.GOODS_TEMPLATE_NAME,fig.BASE_GOODS_MODELS_NAME,"
@@ -363,6 +325,7 @@
return result;
}
+ @Override
public FormInventoryVO queryInventBaseGoodTemplate(Long id) {
FormInventoryVO formInventoryVO = new FormInventoryVO();
@@ -397,4 +360,41 @@
formInventoryVO.setFormInventoryGoodsList(goodsVOList);
return formInventoryVO;
}
+
+ @Override
+ 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