+
+
- {{ searchxianshitit }}
-
-
-
-
-
- {
+
+ @Delete("delete from csm_cash_different where dataDate=#{dataDate} ")
+ void clearByDay(@Param("dataDate") String dataDate);
}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashDifferentService.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashDifferentService.java
index e58461fc..9639313f 100644
--- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashDifferentService.java
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashDifferentService.java
@@ -5,4 +5,7 @@ import org.springframework.stereotype.Service;
@Service
public class CsmCashDifferentService extends ServiceImpl {
+ public void clearByDay(String dataDate) {
+ baseMapper.clearByDay(dataDate);
+ }
}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashGdMapper.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashGdMapper.java
index b1ad4cdd..302e18f0 100644
--- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashGdMapper.java
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashGdMapper.java
@@ -1,8 +1,16 @@
package com.yxt.supervise.customer.biz.csmcash;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
@Mapper
public interface CsmCashGdMapper extends BaseMapper {
+
+ @Delete("delete from csm_cash_gd where logsid=#{logsid} ")
+ void clearByLogSid(@Param("logsid") String logsid);
+
+ @Delete("delete from csm_cash_gd where dataDate=#{dataDate} and logsid<>#{logsid} ")
+ void clearByDayNotNew(@Param("dataDate") String dataDate, @Param("logsid") String logsid);
}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashGdService.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashGdService.java
index 41796ca9..eaf6038f 100644
--- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashGdService.java
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashGdService.java
@@ -23,4 +23,12 @@ public class CsmCashGdService extends ServiceImpl {
qw.eq("logsid", logsid);
return baseMapper.selectList(qw);
}
+
+ public void clearByLogSid(String logsid) {
+ baseMapper.clearByLogSid(logsid);
+ }
+
+ public void clearByDayNotMe(String dataDate, String logsid) {
+ baseMapper.clearByDayNotNew(dataDate,logsid);
+ }
}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashIncomeMapper.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashIncomeMapper.java
index e1d79706..fe5210a0 100644
--- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashIncomeMapper.java
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashIncomeMapper.java
@@ -1,8 +1,13 @@
package com.yxt.supervise.customer.biz.csmcash;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
@Mapper
public interface CsmCashIncomeMapper extends BaseMapper {
+
+ @Delete("delete from csm_cash_income where dataDate=#{dataDate} ")
+ void clearByDay(@Param("dataDate") String dataDate);
}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashIncomeService.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashIncomeService.java
index 11309ab1..62ed6e4d 100644
--- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashIncomeService.java
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashIncomeService.java
@@ -5,4 +5,7 @@ import org.springframework.stereotype.Service;
@Service
public class CsmCashIncomeService extends ServiceImpl {
+ public void clearByDay(String dataDate) {
+ baseMapper.clearByDay(dataDate);
+ }
}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashLogMapper.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashLogMapper.java
index 4ad7875f..4832b304 100644
--- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashLogMapper.java
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashLogMapper.java
@@ -1,8 +1,16 @@
package com.yxt.supervise.customer.biz.csmcash;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
@Mapper
public interface CsmCashLogMapper extends BaseMapper {
+
+ @Delete("delete from csm_cash_log where isEnable=0 and sid=#{sid} ")
+ void clearBySid(@Param("sid") String logsid);
+
+ @Delete("delete from csm_cash_log where dataDate=#{dataDate} and sid<>#{sid} ")
+ void clearByDayNotMe(@Param("dataDate") String dataDate,@Param("sid") String logsid);
}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashLogService.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashLogService.java
index 59338b1f..804569e5 100644
--- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashLogService.java
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashLogService.java
@@ -13,8 +13,6 @@ import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.FileUploadResult;
import com.yxt.common.core.result.ResultBean;
import com.yxt.supervise.customer.CodeMsgEnum;
-import com.yxt.supervise.customer.api.gdinventorylog.GdInventoryLog;
-import com.yxt.supervise.customer.api.gdinventorylog.GdInventoryLogQuery;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -31,6 +29,12 @@ public class CsmCashLogService extends ServiceImpl
private FileUploadComponent fileUploadComponent;
@Autowired
private CsmCashGdService csmCashGdService;
+ @Autowired
+ private CsmCashSalesService csmCashSalesService;
+ @Autowired
+ private CsmCashIncomeService csmCashIncomeService;
+ @Autowired
+ private CsmCashDifferentService csmCashDifferentService;
public List listByDataDate(String dataDate) {
QueryWrapper qw = new QueryWrapper<>();
@@ -126,4 +130,37 @@ public class CsmCashLogService extends ServiceImpl
IPage page = baseMapper.selectPage(iPage, qw);
return page;
}
+
+ public void clearLog(String logsid) {
+ CsmCashLog ccl = fetchBySid(logsid);
+ if (0 == ccl.getIsEnable()) {
+ csmCashGdService.clearByLogSid(logsid);
+ baseMapper.clearBySid(logsid);
+ }
+ }
+
+ public CsmCashLog fetchBySid(String logsid) {
+ QueryWrapper qw = new QueryWrapper<>();
+ qw.eq("sid", logsid);
+ return baseMapper.selectOne(qw);
+ }
+
+ public CsmCashLog coverLog(String logsid) {
+ CsmCashLog ccl = fetchBySid(logsid);
+ if (ccl == null)
+ return null;
+
+ String dataDate = ccl.getDataDate();
+
+ csmCashGdService.clearByDayNotMe(dataDate, logsid);
+ csmCashGdService.initCashByLog(ccl);
+
+ csmCashIncomeService.clearByDay(dataDate);
+ csmCashDifferentService.clearByDay(dataDate);
+
+ baseMapper.clearByDayNotMe(dataDate, logsid);
+ ccl.setIsEnable(1);
+ baseMapper.updateById(ccl);
+ return ccl;
+ }
}
diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashRest.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashRest.java
index 1dbd921a..4c6d08f7 100644
--- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashRest.java
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashRest.java
@@ -3,7 +3,9 @@ package com.yxt.supervise.customer.biz.csmcash;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
+import com.yxt.supervise.customer.api.gdinventorylog.GdInventoryLog;
import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -29,4 +31,27 @@ public class CsmCashRest {
rb = csmCashLogService.uploadAnd2Db(file);
return rb;
}
+
+ @GetMapping("/clearLog")
+ public ResultBean clearLog(@RequestParam("logsid") String logsid) {
+ ResultBean rb = ResultBean.fireFail();
+ if (StringUtils.isBlank(logsid)) {
+ return rb.setMsg("上传日志SID不可为空");
+ }
+ csmCashLogService.clearLog(logsid);
+ return rb.success();
+ }
+
+ @GetMapping("/coverLog")
+ public ResultBean coverLog(@RequestParam("logsid") String logsid) {
+ ResultBean rb = ResultBean.fireFail();
+ if (StringUtils.isBlank(logsid)) {
+ return rb.setMsg("上传日志SID不可为空");
+ }
+ CsmCashLog ccl = csmCashLogService.coverLog(logsid);
+ if (ccl == null)
+ return rb.setMsg("获取日志信息异常");
+
+ return rb.success().setData(ccl);
+ }
}
- 查询
- 重置
+
+
+
@@ -117,12 +112,15 @@
import pageye from '@/components/pagination/pageye'
import req from '@/api/customer/csmcash'
+ import cashedit from './cashedit'
+
export default {
name: 'DaydatauploadCash',
components: {
ButtonBar,
Pagination,
- pageye
+ pageye,
+ cashedit
},
data() {
return {
@@ -236,6 +234,7 @@
this.fileList = []
this.showSelectButton = false
this.currentLogSid = ''
+ this.uploadResultMesssage = ''
this.dialogVisible = false
},
submitUpload() {
@@ -271,7 +270,6 @@
_this.uploadResultMesssage = '没有进行数据导入，异常信息为：' + resp.msg
} else if (resp.code === 'cash_5002') {
_this.uploadResultMesssage = resp.msg
-
_this.showSelectButton = true
_this.currentLogSid = resp.data.sid
} else {
@@ -281,23 +279,37 @@
},
clearLog() {
if (this.currentLogSid) {
- req.clearLog(this.currentLogSid).then(res => {
- this.queryParams.total = res.data.total
- this.dataList = res.data.records
+ req.clearLog({
+ logsid: this.currentLogSid
+ }).then(res => {
+ console.log('临时数据已经清除:', this.currentLogSid)
+ this.currentLogSid = ''
}).catch(e => {
- console.log('CsmCashLog-loadList-ee:', e)
+ console.log('CsmCashLog-clearLog-ee:', e)
})
}
},
- coverLog(logsid) {
- if (logsid) {
- req.clearLog(logsid).then(res => {
- this.queryParams.total = res.data.total
- this.dataList = res.data.records
+ coverLog() {
+ if (this.currentLogSid) {
+ req.coverLog({
+ logsid: this.currentLogSid
+ }).then(res => {
+ this.loadList()
+ this.showSelectButton = false
+ this.currentLogSid = ''
+ this.dialogVisible = false
+ this.uploadResultMesssage = ''
}).catch(e => {
- console.log('CsmCashLog-loadList-ee:', e)
+ console.log('CsmCashLog-coverLog-ee:', e)
})
}
+ },
+ toEdit(row) {
+ this.viewState = 3
+ // this.$refs['divadd'].showEdit(row)
+ },
+ resetState() {
+ this.viewState = 1
}
}
}
diff --git a/warehousing-system/project_web/src/components/Home.vue b/warehousing-system/project_web/src/components/Home.vue
index 0a490327..f36ff684 100644
--- a/warehousing-system/project_web/src/components/Home.vue
+++ b/warehousing-system/project_web/src/components/Home.vue
@@ -46,7 +46,7 @@
class="text-center"
>平台首页
- 仓库集控
+ 云仓管理
+
-
+
-
-
+ {{ searchxianshitit }}
+
-
+
+
+
+
+
+ 查询
+ 重置
+
-
-
-
-
-
-
-
-
- 正在导入数据库... 刷新
- 正在创建报表... 刷新
- 正在生成Excel... 刷新
- 下载库存日报表
-
-
-
-
- 没有报表文件
-
-
-
-
-
+
+
+
+
+
+
+
+
+ 填写回款信息
+ 完善回款信息
+ 正在生成Excel... 刷新
+ 下载库存日报表
+
+
+
+
+ 没有报表文件
+
+
+
+
+
是否覆盖之前的数据，如果选择覆盖，相关回款数据将被重置！
- 不覆盖，关闭
- 覆盖并重置数据
+ 不覆盖，关闭
+ 覆盖并重置数据