From e69345c81150863c4a716819984693fd0487b419 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期六, 07 二月 2026 11:52:25 +0800
Subject: [PATCH] 客户问题优化调整6-出入库详单取消入库重量，监管下出入库报表查询数据一样问题
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DepotStoreService.java | 70 ++++++++--------------------------
1 files changed, 17 insertions(+), 53 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 716e401..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,18 +1,14 @@
package com.fzzy.igds.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fzzy.igds.data.IgdsBaseParam;
-import com.fzzy.igds.domain.Depot;
import com.fzzy.igds.domain.DepotStore;
-import com.fzzy.igds.mapper.DepotMapper;
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.stereotype.Service;
import javax.annotation.Resource;
import java.util.Date;
@@ -28,9 +24,9 @@
public class DepotStoreService {
@Resource
- private DepotStoreMapper depotStoreMapper;
+ private DepotService depotService;
@Resource
- private DepotMapper depotMapper;
+ private DepotStoreMapper depotStoreMapper;
public void listPageData(Page<DepotStore> page, IgdsBaseParam param) {
QueryWrapper<DepotStore> queryWrapper = new QueryWrapper<>();
@@ -53,41 +49,23 @@
depotStoreMapper.selectPage(page, queryWrapper);
}
- /**
- * 鏇存柊淇濆瓨鏁版嵁
- *
- * @param data
- */
- public void saveDepotStore(DepotStore data) {
- if (StringUtils.isEmpty(data.getCompanyId())) {
- data.setCompanyId(ContextUtil.getCompanyId());
- }
- if (StringUtils.isEmpty(data.getDeptId())) {
- data.setDeptId(ContextUtil.subDeptId(null));
- }
- if (StringUtils.isEmpty(data.getId())) {
- data.setId(data.getDepotId() + "_" + DateFormatUtils.format(data.getStoreDate(), "yyyyMMddHHmmss") + "_" + DateFormatUtils.format(data.getUpdateTime(), "yyyyMMddHHmmss"));
- data.setCreateTime(new Date());
- data.setRemark("绯荤粺鐢熸垚");
- data.setUpdateBy(ContextUtil.getLoginUserName());
- data.setUpdateTime(new Date());
- depotStoreMapper.insert(data);
- }else{
- data.setUpdateBy(ContextUtil.getLoginUserName());
- data.setUpdateTime(new Date());
- depotStoreMapper.updateById(data);
- }
- }
+
/**
- * 鍒犻櫎鏁版嵁
- *
+ * 鍏堟洿鏂帮紝濡傛灉娌℃湁鍒欐柊澧�
+ * 鏁版嵁澶勭悊濂斤紝姝ゆ柟娉曚笉澶勭悊浠讳綍瀛楁
* @param data
- * @return
*/
- public String delDepotStore(DepotStore data) {
- depotStoreMapper.deleteById(data);
- return null;
+ public void updateAndSave(DepotStore data) {
+ int i = depotStoreMapper.updateById(data);
+ if(i < 1){
+ i = depotStoreMapper.insert(data);
+ }
+
+ if(i > 0){
+ //鏇存敼鍒颁粨搴撹〃
+ depotService.updateByDepotStore(data);
+ }
}
/**
@@ -101,9 +79,8 @@
QueryWrapper<DepotStore> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("depot_id", depotId);
- queryWrapper.ge("create_time", time);
- queryWrapper.le("create_time", time);
- queryWrapper.orderByDesc("create_time");
+ queryWrapper.le("update_time", time);
+ queryWrapper.orderByDesc("update_time");
List<DepotStore> list = depotStoreMapper.selectList(queryWrapper);
@@ -111,19 +88,6 @@
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());
-
- depotStoreMapper.insert(store);
-
- if (updateDepot) {
- UpdateWrapper<Depot> updateWrapper = new UpdateWrapper<>();
- updateWrapper.eq("id", store.getDepotId()).set("storage_real", store.getStorageReal());
- depotMapper.update(null, updateWrapper);
- }
}
}
--
Gitblit v1.9.3