From 6665ddbc6dd0fe82ea3d47cd2bb5e48a5a27a712 Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期六, 09 十二月 2023 17:46:57 +0800
Subject: [PATCH] feat: 报废明细
---
consum-base/src/main/java/com/consum/base/service/DepFormScrappedServiceImpl.java | 71 +++++++++++++++++++++++++++++------
admin-web/src/views/stock/procure/purchaseOrder/index.vue | 2
consum-base/src/main/java/com/consum/base/controller/DepFormScrappedController.java | 21 ++++++++++
admin-web/src/views/departmentitem/itemscr/scrappDetails/index.vue | 4 +-
4 files changed, 83 insertions(+), 15 deletions(-)
diff --git a/admin-web/src/views/departmentitem/itemscr/scrappDetails/index.vue b/admin-web/src/views/departmentitem/itemscr/scrappDetails/index.vue
index cbc6fcd..6916306 100644
--- a/admin-web/src/views/departmentitem/itemscr/scrappDetails/index.vue
+++ b/admin-web/src/views/departmentitem/itemscr/scrappDetails/index.vue
@@ -126,7 +126,7 @@
table: {
showIndex: true, // 鏄惁鏄剧ず搴忓彿
expand: false, // 鏄惁鏄剧ず璇︽儏鏁版嵁
- url: SettingIplatform.apiBaseURL + '/pc/l/wh/form/scrapped/deptListByModel', // 璇锋眰鍦板潃
+ url: SettingIplatform.apiBaseURL + '/pc/l/wh/form/scrapped/deptListByModel2', // 璇锋眰鍦板潃
// 宸ュ叿鏉�
tools: {
columnsCtrl: {
@@ -158,7 +158,7 @@
title: '鎿嶄綔鏃堕棿', field: 'dealTime', align: 'center',
width: 160,
formatter: (row) => {
- return {value: DateFormatter.LongToDateTime(row.createTime)};
+ return {value: DateFormatter.LongToDateTime(row.dealTime)};
},
},
],
diff --git a/admin-web/src/views/stock/procure/purchaseOrder/index.vue b/admin-web/src/views/stock/procure/purchaseOrder/index.vue
index 2f22975..0f58df4 100644
--- a/admin-web/src/views/stock/procure/purchaseOrder/index.vue
+++ b/admin-web/src/views/stock/procure/purchaseOrder/index.vue
@@ -10,7 +10,7 @@
<el-col>
<!--鍒楄〃-->
<div class="table-tool-bar" style="margin-bottom: 15px">
- <my-button name="鏂板" @click="handleAdd" site="tools" size="medium" />
+ <my-button name="鏂板" check-permission="procure:order:add" @click="handleAdd" site="tools" size="medium" />
<my-button name="瀵煎叆" @click="importSetting.dialogShow = true" site="tools" size="medium" />
</div>
<div v-loading="loading" style="margin-bottom: 15px">
diff --git a/consum-base/src/main/java/com/consum/base/controller/DepFormScrappedController.java b/consum-base/src/main/java/com/consum/base/controller/DepFormScrappedController.java
index 1ec7411..281c1ce 100644
--- a/consum-base/src/main/java/com/consum/base/controller/DepFormScrappedController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/DepFormScrappedController.java
@@ -206,6 +206,27 @@
return ResponseValue.success(export);
}
+ @GetMapping("/deptListByModel2")
+ public ResponseValue deptListByModel2() {
+ LDeptFormScrappedQry param = CommonUtil.getObjFromReq(LDeptFormScrappedQry.class);
+ LDeptFormScrappedQry query = new LDeptFormScrappedQry();
+ CommonUtil.copyProperties(param, query);
+ param = query;
+
+ FinSysTenantUser sysInfo = getSysInfo();
+ if (sysInfo == null) {
+ throw new RuntimeException("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
+ }
+ /*褰撳墠鐧诲綍浜哄彧鑳界湅鍒拌嚜宸辨満鏋勪笅鐨勫垪琛�*/
+ String tenantId = sysInfo.getTenantId();
+ String paramAgencyId = param.getAgencyId();
+ if (StringUtils.isEmpty(paramAgencyId) || !paramAgencyId.startsWith(tenantId)) {
+ param.setAgencyId(tenantId);
+ }
+ return ResponseValue.success(depFormScrappedService.listByModel2(param));
+ }
+
+
// public static void main(String[] args) {
// TemplateExportParams exportParams = new TemplateExportParams("D:\\MyProjects\\jmy\\浣庡�兼槗鑰楀搧\\low-consum-manage\\deploy-jar-single\\src\\main\\resources\\import\\deptScrapped.xlsx");
// exportParams.setHeadingStartRow(2);
diff --git a/consum-base/src/main/java/com/consum/base/service/DepFormScrappedServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/DepFormScrappedServiceImpl.java
index b109af4..4b178c1 100644
--- a/consum-base/src/main/java/com/consum/base/service/DepFormScrappedServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/DepFormScrappedServiceImpl.java
@@ -11,14 +11,7 @@
import com.consum.base.pojo.LDeptFormScrappedParam;
import com.consum.base.pojo.query.LDeptFormScrappedQry;
import com.consum.base.pojo.response.DepFormScrappedExtendVo;
-import com.consum.model.po.BaseCategory;
-import com.consum.model.po.DepFormScrapped;
-import com.consum.model.po.DepFormScrappedGoods;
-import com.consum.model.po.DepFormScrappedModel;
-import com.consum.model.po.FinSysTenantDepartment;
-import com.consum.model.po.FinSysTenantUser;
-import com.consum.model.po.LWhFormTransfer;
-import com.consum.model.po.SDictData;
+import com.consum.model.po.*;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
@@ -27,15 +20,16 @@
import com.walker.infrastructure.utils.StringUtils;
import com.walker.jdbc.service.BaseServiceImpl;
import com.walker.web.ResponseValue;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
-import javax.annotation.Resource;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
/**
* @ClassName DepFormScrappedServiceImpl
@@ -347,6 +341,59 @@
return select(sql.append(EXPORT_SQL_END).toString(), paramts, new MapperUtil());
}
+ public GenericPager<Map<String, Object>> listByModel2(LDeptFormScrappedQry param) {
+ HashMap<String, Object> paramts = new HashMap<>();
+ StringBuilder sql = new StringBuilder(EXPORT_SQL);
+ //鎶ュ簾鍗昳d
+ if (param.getId() != null) {
+ sql.append(" and scrap.id = :id");
+ paramts.put("id", param.getId());
+ }
+ //鎶ュ簾鍗曞彿
+ if (param.getBusinessFormCode() != null) {
+ sql.append(" and scrap.BUSINESS_FORM_CODE= :businessFormCode");
+ paramts.put("businessFormCode", param.getBusinessFormCode());
+ }
+ //鐗╁搧鍚嶇О
+ if (StringUtils.isNotEmpty(param.getGoodsTemplateName())) {
+ sql.append(" and model.BASE_GOODS_TEMPLATE_NAME LIKE :goodsTemplateName ");
+ paramts.put("goodsTemplateName", StringUtils.CHAR_PERCENT + param.getGoodsTemplateName() + StringUtils.CHAR_PERCENT);
+ }
+ //瑙勬牸鍨嬪彿
+ if (param.getBaseGoodsModelsId() != null) {
+ sql.append("and model.BASE_GOODS_MODELS_ID =:baseGoodsModelsId ");
+ paramts.put("baseGoodsModelsId", param.getBaseGoodsModelsId());
+ }
+
+ //鏈烘瀯
+ if (param.getAgencyId() != null) {
+ sql.append(" and scrap.AGENCY_ID = :agencyId ");
+ paramts.put("agencyId", param.getAgencyId());
+ }
+ // 閮ㄩ棬 姝ゅ鎸夌殑鏄墿鍝佷娇鐢ㄩ儴闂� 鑰屼笉鏄� 鎿嶄綔浜烘墍鍦ㄩ儴闂�
+ if (param.getDepartmentId() != null) {
+ sql.append(" and scrap.OUT_WAREHOUSE_ID= :departmentId");
+ paramts.put("departmentId", param.getDepartmentId());
+ }
+ //鍒涘缓浜�
+ if (!StringUtils.isEmpty(param.getOperatorName())) {
+ sql.append(" and scrap.OPERATOR_NAME LIKE :operatorName ");
+ paramts.put("operatorName", StringUtils.CHAR_PERCENT + param.getOperatorName() + StringUtils.CHAR_PERCENT);
+ }
+ //鎶ュ簾鏃堕棿
+ if (param.getStartTime() != null) {
+ sql.append(" and scrap.DEAL_TIME >=:dealTimeStart ");
+ paramts.put("dealTimeStart", param.getStartTime() * 1000000);
+ }
+ if (param.getEndTime() != null) {
+ sql.append(" and scrap.DEAL_TIME <:dealTimeEnd ");
+ paramts.put("dealTimeEnd", param.getEndTime() * 1000000 + 240000);
+ }
+ return selectSplit(sql.append(EXPORT_SQL_END).toString(),paramts, param.getPageNum(), param.getPageSize(), new MapperUtil());
+
+// return select(sql.append(EXPORT_SQL_END).toString(), paramts, new MapperUtil());
+ }
+
private static String GET_BF_MODEL_LIST = "SELECT\n" +
"\tscrGoods.TRANS_BUSINESS_ID,\n" +
"\tscrGoods.BUSINESS_FORM_CODE,\n" +
--
Gitblit v1.9.1