From 7411561962ca6e45e32844d7a626a6e89b8292e5 Mon Sep 17 00:00:00 2001
From: jiazx0107 <jiazx0107@163.com>
Date: 星期六, 17 一月 2026 16:59:56 +0800
Subject: [PATCH] 调整出入库通知单功能
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DepotStoreService.java | 104 +++++++++++++++++++++++----------------------------
1 files changed, 47 insertions(+), 57 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DepotStoreService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DepotStoreService.java
index 1dc77a6..8fa744a 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DepotStoreService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DepotStoreService.java
@@ -1,15 +1,14 @@
package com.fzzy.igds.service;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fzzy.igds.data.IgdsBaseParam;
import com.fzzy.igds.domain.DepotStore;
-import com.fzzy.igds.repository.DepotRepository;
-import com.fzzy.igds.repository.DepotStoreRepository;
+import com.fzzy.igds.mapper.DepotStoreMapper;
import com.fzzy.igds.utils.ContextUtil;
+import com.fzzy.igds.utils.DateUtil;
import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.time.DateFormatUtils;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.jpa.domain.Specification;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.Date;
@@ -25,79 +24,70 @@
public class DepotStoreService {
@Resource
- private DepotStoreRepository depotStoreRepository;
+ private DepotService depotService;
@Resource
- private DepotRepository depotRepository;
+ private DepotStoreMapper depotStoreMapper;
- /**
- * JPA鍒嗛〉鏌ヨ鏁版嵁
- *
- * @param specification
- * @param pageable
- * @return
- */
- public Page<DepotStore> findAll(Specification<DepotStore> specification, Pageable pageable) {
- return depotStoreRepository.findAll(specification, pageable);
+ public void listPageData(Page<DepotStore> page, IgdsBaseParam param) {
+ QueryWrapper<DepotStore> queryWrapper = new QueryWrapper<>();
+
+ param.setCompanyId(ContextUtil.getCompanyId());
+ param.setDeptId(ContextUtil.subDeptId(null));
+ queryWrapper.eq("company_id", param.getCompanyId());
+ queryWrapper.eq("dept_id", param.getDeptId());
+
+ if (StringUtils.isNotBlank(param.getName())) {
+ queryWrapper.eq("depot_id", param.getName());
+ }
+ if (null != param.getStart()) {
+ queryWrapper.ge("update_time", DateUtil.getCurZero(param.getStart()));
+ }
+ if (null != param.getEnd()) {
+ queryWrapper.le("update_time", DateUtil.getNextZero(param.getEnd()));
+ }
+
+ depotStoreMapper.selectPage(page, queryWrapper);
}
+
+
/**
- * JPA鏇存柊淇濆瓨鏁版嵁
- *
+ * 鍏堟洿鏂帮紝濡傛灉娌℃湁鍒欐柊澧�
+ * 鏁版嵁澶勭悊濂斤紝姝ゆ柟娉曚笉澶勭悊浠讳綍瀛楁
* @param data
*/
- public void saveDepotStore(DepotStore data) {
- if (StringUtils.isEmpty(data.getCompanyId())) {
- data.setCompanyId(ContextUtil.getCompanyId());
+ public void updateAndSave(DepotStore data) {
+ int i = depotStoreMapper.updateById(data);
+ if(i < 1){
+ i = depotStoreMapper.insert(data);
}
- if (StringUtils.isEmpty(data.getDeptId())) {
- data.setDeptId(ContextUtil.subDeptId(null));
+
+ if(i > 0){
+ //鏇存敼鍒颁粨搴撹〃
+ depotService.updateByDepotStore(data);
}
- data.setUpdateBy(ContextUtil.getLoginUserName());
- data.setUpdateTime(new Date());
-
- data.setId(data.getDepotId() + "_" + DateFormatUtils.format(data.getStoreDate(), "yyyyMMddHHmmss") + "_" + DateFormatUtils.format(data.getUpdateTime(), "yyyyMMddHHmmss"));
- data.setCreateTime(new Date());
- data.setRemark("绯荤粺鐢熸垚");
-
- depotStoreRepository.save(data);
}
/**
- * JPA鍒犻櫎鏁版嵁
- *
- * @param data
- * @return
- */
- public String delDepotStore(DepotStore data) {
- depotStoreRepository.delete(data);
- return null;
- }
-
- /**
- * JPA鑾峰彇浠撳簱鏈�鍚庝竴鏉″簱瀛樻暟鎹�
+ * 鑾峰彇浠撳簱鏈�鍚庝竴鏉″簱瀛樻暟鎹�
*
* @param depotId
* @param time
* @return
*/
public DepotStore getLastData(String depotId, Date time) {
- List<DepotStore> list = depotStoreRepository.getDataByDepotId(depotId, time);
+
+ QueryWrapper<DepotStore> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("depot_id", depotId);
+ queryWrapper.le("update_time", time);
+ queryWrapper.orderByDesc("update_time");
+
+ List<DepotStore> list = depotStoreMapper.selectList(queryWrapper);
+
if (null == list || list.isEmpty()) {
return null;
}
return list.get(0);
}
-
- public void addDepotStore(DepotStore store, boolean updateDepot) {
- if (null == store.getUpdateTime()) store.setUpdateTime(new Date());
- if (null == store.getId()) store.setId(ContextUtil.generateId());
-
- depotStoreRepository.save(store);
-
- if (updateDepot) {
- depotRepository.updateDepotStorage(store.getStorageReal(), store.getDepotId());
- }
- }
-
}
--
Gitblit v1.9.3