From 3e9a4b3480e6508f3c6f7ac8723509d8b1120d20 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期五, 22 十二月 2023 11:26:33 +0800
Subject: [PATCH] 代码整理
---
consum-base/src/main/java/com/consum/base/controller/LWhWarningConfigController.java | 52
consum-base/src/main/java/com/consum/base/service/impl/BaseWarehouseServiceImpl.java | 4
consum-base/src/main/java/com/consum/base/service/core/LWhFormTransferCoreService.java | 16
consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryServiceImpl.java | 1
consum-base/src/main/java/com/consum/base/service/impl/LWhWarningServiceImpl.java | 68 +
consum-base/src/main/java/com/consum/base/controller/LWhWarningController.java | 34
consum-base/src/main/java/com/consum/base/service/impl/UsingFormBackServiceImpl.java | 4
consum-base/src/main/java/com/consum/base/service/LWhWarningService.java | 23
consum-base/src/main/java/com/consum/base/service/impl/DepFormScrappedServiceImpl.java | 201 +++---
consum-base/src/main/java/com/consum/base/service/impl/LWhFormScrappedServiceImpl.java | 5
consum-base/src/main/java/com/consum/base/service/core/LWhWarningCoreService.java | 9
consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java | 6
consum-base/src/main/java/com/consum/base/service/core/DepFormScrappedCoreService.java | 119 ++-
consum-base/src/main/java/com/consum/base/service/core/LWhFormProcureCoreService.java | 6
consum-base/src/main/java/com/consum/base/service/LWhWarningConfigService.java | 22
consum-base/src/main/java/com/consum/base/service/impl/LWhFormOutputServiceImpl.java | 1
consum-base/src/main/java/com/consum/base/service/core/LWarehouseFlowCoreService.java | 6
consum-base/src/main/java/com/consum/base/service/LWhGoodsStatisticsService.java | 15
consum-base/src/main/java/com/consum/base/service/GoodsBaseService.java | 13
consum-base/src/main/java/com/consum/base/service/LGoodsUserRecordCoreService.java | 22
consum-base/src/main/java/com/consum/base/service/core/LWhFormInventoryCoreService.java | 2
consum-base/src/main/java/com/consum/base/service/impl/SDictDataServiceImpl.java | 26
consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java | 4
consum-base/src/main/java/com/consum/base/service/impl/LWhGoodsStatisticsServiceImpl.java | 107 +++
consum-base/src/main/java/com/consum/base/service/impl/GoodsBaseServiceImpl.java | 18
consum-base/src/main/java/com/consum/base/service/impl/LWhWarningConfigServiceImpl.java | 59
/dev/null | 106 ---
consum-base/src/main/java/com/consum/base/controller/LWarehouseFlowController.java | 41
consum-base/src/main/java/com/consum/base/service/LOrgSupplierServiceImpl.java | 16
consum-base/src/main/java/com/consum/base/service/core/DepUsingFormBackCoreService.java | 159 ++--
consum-base/src/main/java/com/consum/base/service/DepFormScrappedService.java | 32
consum-base/src/main/java/com/consum/base/controller/LWhGoodsStatisticsController.java | 22
consum-base/src/main/java/com/consum/base/controller/DepFormScrappedController.java | 196 ++---
consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java | 2
consum-base/src/main/java/com/consum/base/service/core/LWhFormOutputCoreService.java | 16
consum-base/src/main/java/com/consum/base/service/LWarehouseFlowService.java | 469 -------------
consum-base/src/main/java/com/consum/base/service/SDictDataService.java | 15
consum-base/src/main/java/com/consum/base/service/core/LWhFormScrappedCoreService.java | 23
38 files changed, 849 insertions(+), 1,091 deletions(-)
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 4c40b21..bf0cb94 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
@@ -1,38 +1,41 @@
package com.consum.base.controller;
-import cn.afterturn.easypoi.excel.ExcelExportUtil;
-import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
-import cn.hutool.core.convert.Convert;
-import cn.hutool.core.util.ReflectUtil;
-import com.consum.base.BaseController;
-import com.consum.base.core.utils.CommonUtil;
-import com.consum.base.pojo.LDeptFormScrappedParam;
-import com.consum.base.pojo.query.LDeptFormScrappedQry;
-import com.consum.base.service.DepFormScrappedServiceImpl;
-import com.consum.model.po.FinSysTenantUser;
-import com.walker.db.page.GenericPager;
-import com.walker.infrastructure.utils.CollectionUtils;
-import com.walker.infrastructure.utils.DateUtils;
-import com.walker.infrastructure.utils.StringUtils;
-import com.walker.web.ResponseValue;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
import java.io.OutputStream;
import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.poi.ss.usermodel.Workbook;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.consum.base.BaseController;
+import com.consum.base.core.utils.CommonUtil;
+import com.consum.base.pojo.LDeptFormScrappedParam;
+import com.consum.base.pojo.query.LDeptFormScrappedQry;
+import com.consum.base.service.DepFormScrappedService;
+import com.consum.model.po.FinSysTenantUser;
+import com.walker.db.page.GenericPager;
+import com.walker.infrastructure.utils.CollectionUtils;
+import com.walker.infrastructure.utils.DateUtils;
+import com.walker.infrastructure.utils.StringUtils;
+import com.walker.web.ResponseValue;
+
+import cn.afterturn.easypoi.excel.ExcelExportUtil;
+import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.ReflectUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
/**
* @ClassName DepFormScrappedController
@@ -46,11 +49,11 @@
@RequestMapping("/pc/l/wh/form/scrapped")
public class DepFormScrappedController extends BaseController {
@Resource
- private DepFormScrappedServiceImpl depFormScrappedService;
+ private DepFormScrappedService depFormScrappedService;
@ApiOperation(value = "鏂板鎶ュ簾鍗�", notes = "鏂板鎶ュ簾鍗�")
@PostMapping("/deptAdd")
- public ResponseValue deptAdd() {
+ public ResponseValue deptAdd() throws Exception {
LDeptFormScrappedParam param = CommonUtil.getObjFromReqBody(LDeptFormScrappedParam.class);
LDeptFormScrappedParam query = new LDeptFormScrappedParam();
CommonUtil.copyProperties(param, query);
@@ -58,18 +61,17 @@
FinSysTenantUser sysInfo = this.getSysInfo();
- return depFormScrappedService.add(param, this.getCurrentUser(), sysInfo);
+ depFormScrappedService.add(param, this.getCurrentUser(), sysInfo);
+ return ResponseValue.success();
}
/**
- * @Description 鍒楄〃鏌ヨ
- * 1.鏌ヨ鎶ュ簾鍗� 2.鏌ヨ鎶ュ簾鍗曠墿鍝�
+ * @Description 鍒楄〃鏌ヨ 1.鏌ヨ鎶ュ簾鍗� 2.鏌ヨ鎶ュ簾鍗曠墿鍝�
* @Date
*/
@ApiOperation(value = "鍒楄〃鏌ヨ", notes = "鍒楄〃鏌ヨ")
@ApiImplicitParams({
- @ApiImplicitParam(name = "param", value = "鏌ヨ鏉′欢", dataType = "LWhFormScrappedQry", paramType = "query")
- })
+ @ApiImplicitParam(name = "param", value = "鏌ヨ鏉′欢", dataType = "LWhFormScrappedQry", paramType = "query")})
@GetMapping("/deptList")
public ResponseValue queryList() {
LDeptFormScrappedQry param = CommonUtil.getObjFromReq(LDeptFormScrappedQry.class);
@@ -120,7 +122,7 @@
} else {
// 濡傛灉id鍦ㄥ悎骞舵暟鎹腑宸插瓨鍦紝鍒欏皢k3杩藉姞鍒板凡瀛樺湪璁板綍鐨刱3鍒楄〃涓�
Map<String, Object> mergedMap = mergedDataMap.get(id);
- ArrayList<HashMap> goodsList = (ArrayList<HashMap>) mergedMap.get("goods");
+ ArrayList<HashMap> goodsList = (ArrayList<HashMap>)mergedMap.get("goods");
goodsList.add(hashMap);
}
}
@@ -132,9 +134,7 @@
* @Description 鏍规嵁id鏌ヨ璇︽儏
*/
@ApiOperation(value = "鏍规嵁id鏌ヨ璇︽儏", notes = "鏍规嵁id鏌ヨ璇︽儏")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "鎶ュ簾鍗昳d", dataType = "Long", paramType = "query")
- })
+ @ApiImplicitParams({@ApiImplicitParam(name = "id", value = "鎶ュ簾鍗昳d", dataType = "Long", paramType = "query")})
@GetMapping("/deptDetail")
public ResponseValue getById(Long id) {
if (id == null) {
@@ -144,9 +144,7 @@
}
@ApiOperation(value = "瀵煎嚭鎶ュ簾鍗�", notes = "瀵煎嚭鎶ュ簾鍗�")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "鎶ュ簾鍗昳d", dataType = "Long", paramType = "query")
- })
+ @ApiImplicitParams({@ApiImplicitParam(name = "id", value = "鎶ュ簾鍗昳d", dataType = "Long", paramType = "query")})
@GetMapping("/deptList/export")
public void export(Long id, HttpServletResponse response) throws Exception {
if (id == null) {
@@ -226,62 +224,62 @@
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);
-//
-// List<Map<String, Object>> export = new ArrayList<>();
-//
-// // 鍒涘缓绗竴鏉℃暟鎹�
-// Map<String, Object> data1 = new HashMap<>();
-// data1.put("agencyName", 1);
-// data1.put("baseGoodsTemplateName", "Bob");
-// data1.put("scrappedName", "Bob");
-// data1.put("bz", "Bob");
-// data1.put("baseGoodsModelsName", 30);
-// data1.put("counts", 30);
-// data1.put("totalPrice", 30);
-// export.add(data1);
-//
-// // 鍒涘缓绗簩鏉℃暟鎹�
-// Map<String, Object> data2 = new HashMap<>();
-// data2.put("agencyName", 2);
-// data2.put("baseGoodsTemplateName", "Bob");
-// data2.put("scrappedName", "Bob");
-// data2.put("bz", "Bob");
-// data2.put("baseGoodsModelsName", 30);
-// data2.put("counts", 30);
-// data2.put("totalPrice", 30);
-// export.add(data2);
-//
-//
-// Map<String, Object> map = new HashMap<>();
-// map.put("code", "2023");
-// map.put("date", "2023");
-// map.put("name", "operatorName");
-// map.put("countNum", 0);
-// map.put("totalAmount", 0);
-// map.put("maplist", export);
-//
-// Workbook workbook = ExcelExportUtil.exportExcel(exportParams, map);
-//
-// File file = new File("C:\\Users\\cy\\Desktop\\鏂板缓鏂囦欢澶�");
-// OutputStream stream = null;
-// try {
-// SimpleDateFormat sdf = new SimpleDateFormat("yyyy_MM_dd");
-// stream = new FileOutputStream(new File(file, "鏈烘瀯瀹㈡埛淇℃伅琛�.xls"));
-// //document.write(stream);
-// workbook.write(stream);
-// } catch (Exception e) {
-// e.printStackTrace();
-// } finally {
-// if (stream != null) ;
-// try {
-// stream.close();
-// } catch (IOException e) {
-// e.printStackTrace();
-// }
-// }
-// }
+ // 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);
+ //
+ // List<Map<String, Object>> export = new ArrayList<>();
+ //
+ // // 鍒涘缓绗竴鏉℃暟鎹�
+ // Map<String, Object> data1 = new HashMap<>();
+ // data1.put("agencyName", 1);
+ // data1.put("baseGoodsTemplateName", "Bob");
+ // data1.put("scrappedName", "Bob");
+ // data1.put("bz", "Bob");
+ // data1.put("baseGoodsModelsName", 30);
+ // data1.put("counts", 30);
+ // data1.put("totalPrice", 30);
+ // export.add(data1);
+ //
+ // // 鍒涘缓绗簩鏉℃暟鎹�
+ // Map<String, Object> data2 = new HashMap<>();
+ // data2.put("agencyName", 2);
+ // data2.put("baseGoodsTemplateName", "Bob");
+ // data2.put("scrappedName", "Bob");
+ // data2.put("bz", "Bob");
+ // data2.put("baseGoodsModelsName", 30);
+ // data2.put("counts", 30);
+ // data2.put("totalPrice", 30);
+ // export.add(data2);
+ //
+ //
+ // Map<String, Object> map = new HashMap<>();
+ // map.put("code", "2023");
+ // map.put("date", "2023");
+ // map.put("name", "operatorName");
+ // map.put("countNum", 0);
+ // map.put("totalAmount", 0);
+ // map.put("maplist", export);
+ //
+ // Workbook workbook = ExcelExportUtil.exportExcel(exportParams, map);
+ //
+ // File file = new File("C:\\Users\\cy\\Desktop\\鏂板缓鏂囦欢澶�");
+ // OutputStream stream = null;
+ // try {
+ // SimpleDateFormat sdf = new SimpleDateFormat("yyyy_MM_dd");
+ // stream = new FileOutputStream(new File(file, "鏈烘瀯瀹㈡埛淇℃伅琛�.xls"));
+ // //document.write(stream);
+ // workbook.write(stream);
+ // } catch (Exception e) {
+ // e.printStackTrace();
+ // } finally {
+ // if (stream != null) ;
+ // try {
+ // stream.close();
+ // } catch (IOException e) {
+ // e.printStackTrace();
+ // }
+ // }
+ // }
}
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWarehouseFlowController.java b/consum-base/src/main/java/com/consum/base/controller/LWarehouseFlowController.java
index ff8cd13..5f5f62f 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWarehouseFlowController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWarehouseFlowController.java
@@ -1,6 +1,16 @@
package com.consum.base.controller;
-import cn.hutool.core.util.ReflectUtil;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Map;
+
+import javax.annotation.Resource;
+
+import org.apache.commons.compress.utils.Lists;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
import com.consum.base.BaseController;
import com.consum.base.core.utils.CommonUtil;
import com.consum.base.core.utils.MapUtils;
@@ -11,16 +21,9 @@
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
import com.walker.web.ResponseValue;
-import io.swagger.annotations.Api;
-import org.apache.commons.compress.utils.Lists;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import javax.annotation.Resource;
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Map;
+import cn.hutool.core.util.ReflectUtil;
+import io.swagger.annotations.Api;
/**
* @ClassName lWarehouseFlowController
@@ -34,7 +37,7 @@
public class LWarehouseFlowController extends BaseController {
@Resource
- private LWarehouseFlowService lWarehouseFlowService;
+ private LWarehouseFlowService lWarehouseFlowServiceImpl;
@GetMapping("/list")
public ResponseValue queryFormProcureList() {
@@ -47,16 +50,17 @@
if (currentUser == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
- GenericPager<Map<String, Object>> genericPager = lWarehouseFlowService.queryBusinessFlow(param);
+ GenericPager<Map<String, Object>> genericPager = lWarehouseFlowServiceImpl.queryBusinessFlow(param);
ArrayList<WarehouseFlowVO> result = Lists.newArrayList();
genericPager.getDatas().forEach(map -> {
- WarehouseFlowVO warehouseFlowVO = MapUtils.convertMapToObj(MapUtils.toReplaceKeyLow(map), WarehouseFlowVO.class);
+ WarehouseFlowVO warehouseFlowVO =
+ MapUtils.convertMapToObj(MapUtils.toReplaceKeyLow(map), WarehouseFlowVO.class);
result.add(warehouseFlowVO);
});
try {
Field fieldDatas = GenericPager.class.getDeclaredField("datas");
-// fieldDatas.setAccessible(true);
-// fieldDatas.set(genericPager, result);
+ // fieldDatas.setAccessible(true);
+ // fieldDatas.set(genericPager, result);
ReflectUtil.setFieldValue(genericPager, fieldDatas, result);
} catch (Exception e) {
logger.error(e.getMessage(), e);
@@ -64,7 +68,6 @@
return ResponseValue.success(genericPager);
}
-
@GetMapping("/detail/list")
public ResponseValue queryFormProcureList1() {
@@ -76,7 +79,7 @@
if (currentUser == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
- GenericPager<Map<String, Object>> genericPager = lWarehouseFlowService.queryBusinessFlow(param);
+ GenericPager<Map<String, Object>> genericPager = lWarehouseFlowServiceImpl.queryBusinessFlow(param);
return ResponseValue.success(genericPager);
}
@@ -97,7 +100,7 @@
if (paramAgencyId == null || !paramAgencyId.toString().startsWith(tenantId)) {
param.setAgencyId(Long.valueOf(tenantId));
}
- GenericPager<Map<String, Object>> genericPager = lWarehouseFlowService.queryTaiZhangList(param);
+ GenericPager<Map<String, Object>> genericPager = lWarehouseFlowServiceImpl.queryTaiZhangList(param);
return ResponseValue.success(genericPager);
}
@@ -123,7 +126,7 @@
if (paramAgencyId == null || !paramAgencyId.toString().startsWith(tenantId)) {
param.setAgencyId(Long.valueOf(tenantId));
}
- GenericPager<Map<String, Object>> genericPager = lWarehouseFlowService.queryDeptTaiZhangList(param);
+ GenericPager<Map<String, Object>> genericPager = lWarehouseFlowServiceImpl.queryDeptTaiZhangList(param);
return ResponseValue.success(genericPager);
}
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java
index 81cb5cb..269ad76 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java
@@ -70,7 +70,7 @@
@Autowired
private LWhProcureModelService lWhProcureModelService;
@Resource
- private LWarehouseFlowService lWarehouseFlowService;
+ private LWarehouseFlowService lWarehouseFlowServiceImpl;
/**
* @Description 鏂板鍑哄簱鍗�
@@ -208,7 +208,7 @@
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
formOutputQry.setAgencyId(Long.valueOf(currentUser.getTenantId()));
- PageUtil genericPager = lWarehouseFlowService.queryAllBusinessFlow(formOutputQry);
+ PageUtil genericPager = lWarehouseFlowServiceImpl.queryAllBusinessFlow(formOutputQry);
return ResponseValue.success(genericPager);
}
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java
index 08d3500..0b05a92 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java
@@ -43,7 +43,7 @@
import com.consum.base.service.LWhFormProcureGoodsService;
import com.consum.base.service.LWhFormProcureService;
import com.consum.base.service.LWhProcureModelService;
-import com.consum.base.service.impl.LWhFormProcureCoreService;
+import com.consum.base.service.core.LWhFormProcureCoreService;
import com.consum.model.po.BaseCategory;
import com.consum.model.po.FinSysTenantUser;
import com.consum.model.po.LWhFormProcure;
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
index 8efad14..4fdd66d 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
@@ -50,7 +50,7 @@
import com.consum.base.service.LWhProcureModelService;
import com.consum.base.service.LWhProcureModelUserRecordService;
import com.consum.base.service.LWhProcureModelUserService;
-import com.consum.base.service.impl.LWhFormTransferCoreService;
+import com.consum.base.service.core.LWhFormTransferCoreService;
import com.consum.model.po.BaseWarehouse;
import com.consum.model.po.FinSysTenantUser;
import com.consum.model.po.LWhFormTransfer;
@@ -238,7 +238,9 @@
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
String tenantId = sysInfo.getTenantId();
- param.setInAgencyId(Long.valueOf(tenantId));
+ if (param.getInAgencyId() == null) {
+ param.setInAgencyId(Long.valueOf(tenantId));
+ }
GenericPager<Map<String, Object>> mapGenericPager = lWhFormTransferService.queryFormTransferDetailList(param);
return ResponseValue.success(mapGenericPager);
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhGoodsStatisticsController.java b/consum-base/src/main/java/com/consum/base/controller/LWhGoodsStatisticsController.java
index 4422fa3..66eecd4 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhGoodsStatisticsController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhGoodsStatisticsController.java
@@ -1,18 +1,20 @@
package com.consum.base.controller;
-import com.consum.base.BaseController;
-import com.consum.base.core.utils.CommonUtil;
-import com.consum.base.pojo.query.LWhGoodsStatisQry;
-import com.consum.base.service.LWhGoodsStatisticsServiceImpl;
-import com.consum.model.po.FinSysTenantUser;
-import com.iplatform.model.po.S_user_core;
-import com.walker.web.ResponseValue;
-import io.swagger.annotations.Api;
+import javax.annotation.Resource;
+
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import javax.annotation.Resource;
+import com.consum.base.BaseController;
+import com.consum.base.core.utils.CommonUtil;
+import com.consum.base.pojo.query.LWhGoodsStatisQry;
+import com.consum.base.service.LWhGoodsStatisticsService;
+import com.consum.model.po.FinSysTenantUser;
+import com.iplatform.model.po.S_user_core;
+import com.walker.web.ResponseValue;
+
+import io.swagger.annotations.Api;
/**
* @ClassName LWhGoodsStatisticsController
@@ -27,7 +29,7 @@
public class LWhGoodsStatisticsController extends BaseController {
@Resource
- private LWhGoodsStatisticsServiceImpl lWhGoodsStatisticsService;
+ private LWhGoodsStatisticsService lWhGoodsStatisticsService;
@GetMapping("")
public ResponseValue getWhGoodsStatisList() {
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhWarningConfigController.java b/consum-base/src/main/java/com/consum/base/controller/LWhWarningConfigController.java
index 7f45179..91b671b 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhWarningConfigController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhWarningConfigController.java
@@ -1,28 +1,5 @@
package com.consum.base.controller;
-import cn.afterturn.easypoi.excel.ExcelImportUtil;
-import cn.afterturn.easypoi.excel.entity.ImportParams;
-import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult;
-import cn.hutool.core.convert.Convert;
-import com.consum.base.BaseController;
-import com.consum.base.handler.WhWarningImportVerifyHandler;
-import com.consum.base.core.utils.CommonUtil;
-import com.consum.base.core.utils.IdUtil;
-import com.consum.base.pojo.WarnConfImEntity;
-import com.consum.base.pojo.WhWarningConfigParam;
-import com.consum.base.pojo.query.WhWarningConfigQry;
-import com.consum.base.service.BaseWarehouseService;
-import com.consum.base.service.LWhWarningConfigServiceImpl;
-import com.consum.model.po.BaseWarehouse;
-import com.consum.model.po.FinSysTenantUser;
-import com.consum.model.po.WhWarningConfig;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.walker.db.page.GenericPager;
-import com.walker.file.FileInfo;
-import com.walker.infrastructure.utils.NumberGenerator;
-import com.walker.web.ResponseCode;
-import com.walker.web.ResponseValue;
-import io.swagger.annotations.Api;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -32,7 +9,9 @@
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
+
import javax.annotation.Resource;
+
import org.apache.commons.lang3.StringUtils;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.InputStreamResource;
@@ -48,6 +27,31 @@
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
+import com.consum.base.BaseController;
+import com.consum.base.core.utils.CommonUtil;
+import com.consum.base.core.utils.IdUtil;
+import com.consum.base.handler.WhWarningImportVerifyHandler;
+import com.consum.base.pojo.WarnConfImEntity;
+import com.consum.base.pojo.WhWarningConfigParam;
+import com.consum.base.pojo.query.WhWarningConfigQry;
+import com.consum.base.service.BaseWarehouseService;
+import com.consum.base.service.LWhWarningConfigService;
+import com.consum.model.po.BaseWarehouse;
+import com.consum.model.po.FinSysTenantUser;
+import com.consum.model.po.WhWarningConfig;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.walker.db.page.GenericPager;
+import com.walker.file.FileInfo;
+import com.walker.infrastructure.utils.NumberGenerator;
+import com.walker.web.ResponseCode;
+import com.walker.web.ResponseValue;
+
+import cn.afterturn.easypoi.excel.ExcelImportUtil;
+import cn.afterturn.easypoi.excel.entity.ImportParams;
+import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult;
+import cn.hutool.core.convert.Convert;
+import io.swagger.annotations.Api;
+
/**
* @ClassName LWhWarningConfigController
* @Author cy
@@ -61,7 +65,7 @@
public class LWhWarningConfigController extends BaseController {
@Resource
- private LWhWarningConfigServiceImpl lWhWarningConfigService;
+ private LWhWarningConfigService lWhWarningConfigService;
@Resource
private BaseWarehouseService baseWarehouseService;
private ObjectMapper mapper = new ObjectMapper();
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhWarningController.java b/consum-base/src/main/java/com/consum/base/controller/LWhWarningController.java
index 44f220f..7ea7202 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhWarningController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhWarningController.java
@@ -1,21 +1,24 @@
package com.consum.base.controller;
-import com.consum.base.BaseController;
-import com.consum.base.core.service.LWhWarningCoreServiceImpl;
-import com.consum.base.core.utils.CommonUtil;
-import com.consum.base.pojo.query.WhWarningQry;
-import com.consum.base.service.LWhWarningServiceImpl;
-import com.consum.model.po.FinSysTenantUser;
-import com.walker.db.page.GenericPager;
-import com.walker.infrastructure.utils.DateUtils;
-import com.walker.web.ResponseValue;
-import io.swagger.annotations.Api;
+import java.util.Map;
+
+import javax.annotation.Resource;
+
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import javax.annotation.Resource;
-import java.util.Map;
+import com.consum.base.BaseController;
+import com.consum.base.service.core.LWhWarningCoreService;
+import com.consum.base.core.utils.CommonUtil;
+import com.consum.base.pojo.query.WhWarningQry;
+import com.consum.base.service.LWhWarningService;
+import com.consum.model.po.FinSysTenantUser;
+import com.walker.db.page.GenericPager;
+import com.walker.infrastructure.utils.DateUtils;
+import com.walker.web.ResponseValue;
+
+import io.swagger.annotations.Api;
/**
* @ClassName LWhWarningConfigController
@@ -30,7 +33,10 @@
public class LWhWarningController extends BaseController {
@Resource
- private LWhWarningServiceImpl lWhWarningService;
+ private LWhWarningService lWhWarningService;
+ @Resource
+ private LWhWarningCoreService lWhWarningCoreService;
+
@GetMapping("/getWarningTypeNum")
public ResponseValue getWarningTypeNum() {
@@ -78,8 +84,6 @@
}
- @Resource
- private LWhWarningCoreServiceImpl lWhWarningCoreService;
@GetMapping("/handerChenKuCun")
diff --git a/consum-base/src/main/java/com/consum/base/core/CheckUsingParam.java b/consum-base/src/main/java/com/consum/base/core/CheckUsingParam.java
deleted file mode 100644
index a8d9513..0000000
--- a/consum-base/src/main/java/com/consum/base/core/CheckUsingParam.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.consum.base.core;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class CheckUsingParam {
- /**
- * 鍑哄簱鏃讹紝
- * A绫荤墿鍝侊紝鍒嗗彂鍗曠紪鍙枫�佺墿鍝佸瀷鍙风紪鍙枫�佷娇鐢ㄤ汉涓夐」鍞竴纭畾涓�涓墿鍝�
- * B銆丆绫荤墿鍝侊紝鍒嗗彂鍗曠紪鍙枫�佺墿鍝佸瀷鍙峰嵆鍙‘瀹氭槸涓�绫荤墿鍝�
- */
-
- /**
- * 鏄惁鍏ュ簱 true 鏄� false 鍚︼紙鍑哄簱锛�
- */
- private Boolean isCheckIn;
- /**
- * 鍏ュ簱绫诲瀷 1=鍒嗗彂鍏ュ簱
- */
- private int input_type;
-
- /**
- * 鍒嗗彂鍑哄簱缁撴灉
- */
- private List<CheckWarehouseResult> outputList;
-
- /**
- * 鍒嗗彂琛↖D
- */
- private Long lending_id;
-
- /**
- * 鍨嬪彿ID
- */
- private Long model_id;
-
- /**
- * 鎸佹湁浜�
- */
- private String user_name;
-
- /**
- * 鍑哄簱鏁伴噺
- */
- private int outputCount;
-
- /**
- * 鍑哄簱绫诲瀷锛�1=杩斿簱閫�搴�
- */
- private int output_type;
-
-}
diff --git a/consum-base/src/main/java/com/consum/base/core/CheckUsingResult.java b/consum-base/src/main/java/com/consum/base/core/CheckUsingResult.java
deleted file mode 100644
index 0f90696..0000000
--- a/consum-base/src/main/java/com/consum/base/core/CheckUsingResult.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.consum.base.core;
-
-import com.consum.model.po.DepFormLendingModel;
-import com.consum.model.po.WhGoods;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * 澶勭悊閮ㄩ棬鍦ㄧ敤鐗╁搧鏃剁殑杩斿洖绫�
- */
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class CheckUsingResult {
-
- /**
- * 鎿嶄綔鏇存柊鎴栨柊澧炵殑WH_GOODS搴撳瓨鐗╁搧ID
- */
- private DepFormLendingModel lendingModel;
-
- /**
- * 鎵ц鎿嶄綔鏃剁殑鏈熷垵鏁伴噺
- */
- private int initial_count;
-
- /**
- * 鎵ц鎿嶄綔鍚庣殑鏈熸湯鏁伴噺
- */
- private int end_count;
-
-}
diff --git a/consum-base/src/main/java/com/consum/base/core/CheckWarehouseResult.java b/consum-base/src/main/java/com/consum/base/core/CheckWarehouseResult.java
deleted file mode 100644
index bf435e7..0000000
--- a/consum-base/src/main/java/com/consum/base/core/CheckWarehouseResult.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.consum.base.core;
-
-import com.consum.model.po.WhGoods;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
-/**
- * 鎵ц鍏ュ簱鍚庣殑杩斿洖绫�
- */
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@Slf4j
-public class CheckWarehouseResult {
-
- /**
- * 鎿嶄綔鏇存柊鎴栨柊澧炵殑WH_GOODS搴撳瓨鐗╁搧ID
- */
- private WhGoods whGoods;
-
- /**
- * 鎵ц鎿嶄綔鏃剁殑鏈熷垵鏁伴噺
- */
- private int initial_count;
-
- /**
- * 鎵ц鎿嶄綔鍚庣殑鏈熸湯鏁伴噺
- */
- private int end_count;
-
- /**
- * 鍑哄叆搴撴祦姘碔D锛堜粎闄愬垎鍙戝嚭搴撲娇鐢級
- */
- private Long wh_goods_detail_id;
-
-}
diff --git a/consum-base/src/main/java/com/consum/base/service/DepFormScrappedService.java b/consum-base/src/main/java/com/consum/base/service/DepFormScrappedService.java
new file mode 100644
index 0000000..05fb871
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/service/DepFormScrappedService.java
@@ -0,0 +1,32 @@
+package com.consum.base.service;
+
+import java.util.List;
+import java.util.Map;
+
+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.FinSysTenantUser;
+import com.iplatform.model.po.S_user_core;
+import com.walker.db.page.GenericPager;
+import com.walker.jdbc.service.BaseService;
+
+/**
+ * DepFormScrappedService
+ *
+ * @author asus
+ * @version 2023/12/22 10:48
+ **/
+public interface DepFormScrappedService extends BaseService {
+ void add(LDeptFormScrappedParam param, S_user_core currentUser, FinSysTenantUser sysInfo) throws Exception;
+
+ GenericPager<Map<String, Object>> queryList(LDeptFormScrappedQry param);
+
+ DepFormScrappedExtendVo getById(Long id);
+
+ List<Map<String, Object>> export(Long id, String agencyId);
+
+ List<Map<String, Object>> listByModel(LDeptFormScrappedQry param);
+
+ GenericPager<Map<String, Object>> listByModel2(LDeptFormScrappedQry param);
+}
diff --git a/consum-base/src/main/java/com/consum/base/service/GoodsBaseService.java b/consum-base/src/main/java/com/consum/base/service/GoodsBaseService.java
new file mode 100644
index 0000000..8135ba1
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/service/GoodsBaseService.java
@@ -0,0 +1,13 @@
+package com.consum.base.service;
+
+import com.walker.jdbc.service.BaseService;
+
+/**
+ * GoodsBaseService
+ *
+ * @author asus
+ * @version 2023/12/22 11:07
+ **/
+public interface GoodsBaseService extends BaseService {
+
+}
diff --git a/consum-base/src/main/java/com/consum/base/service/GoodsBaseServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/GoodsBaseServiceImpl.java
deleted file mode 100644
index fd7d889..0000000
--- a/consum-base/src/main/java/com/consum/base/service/GoodsBaseServiceImpl.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.consum.base.service;
-
-import com.walker.jdbc.service.BaseServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * @ClassName GoodsBaseServiceImpl
-
- * @Date 2023/11/2
- * @Description
- * @Version 1.0
- **/
-@Service
-public class GoodsBaseServiceImpl extends BaseServiceImpl {
-
-
-}
diff --git a/consum-base/src/main/java/com/consum/base/service/LGoodsUserRecordCoreService.java b/consum-base/src/main/java/com/consum/base/service/LGoodsUserRecordCoreService.java
index 14636b1..74309c9 100644
--- a/consum-base/src/main/java/com/consum/base/service/LGoodsUserRecordCoreService.java
+++ b/consum-base/src/main/java/com/consum/base/service/LGoodsUserRecordCoreService.java
@@ -1,20 +1,22 @@
package com.consum.base.service;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import org.springframework.util.CollectionUtils;
+
import com.consum.base.core.utils.IdUtil;
import com.consum.base.core.utils.LockManage;
import com.consum.model.po.LGoodsUserRecord;
import com.consum.model.po.LWhFormTransfer;
import com.consum.model.po.LWhProcureModelUser;
import com.consum.model.po.LWhProcureModelUserRecord;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.interceptor.TransactionAspectSupport;
-import org.springframework.util.CollectionUtils;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
/**
* @ClassName LGoodsUserRecordCoreService
@@ -27,7 +29,7 @@
public class LGoodsUserRecordCoreService {
@Resource
- private GoodsBaseServiceImpl goodsBaseService;
+ private GoodsBaseService goodsBaseService;
@Resource
private LWhGoodsService lWhGoodsService;
@Resource
diff --git a/consum-base/src/main/java/com/consum/base/service/LOrgSupplierServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/LOrgSupplierServiceImpl.java
index 6838105..3575907 100644
--- a/consum-base/src/main/java/com/consum/base/service/LOrgSupplierServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/LOrgSupplierServiceImpl.java
@@ -1,18 +1,20 @@
package com.consum.base.service;
-import com.walker.jdbc.service.BaseServiceImpl;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import com.walker.jdbc.service.BaseServiceImpl;
+
+import lombok.extern.slf4j.Slf4j;
+
/**
* @ClassName LOrgSupplierServiceImpl
-
+ *
* @Date 2023/11/1
* @Description
* @Version 1.0
diff --git a/consum-base/src/main/java/com/consum/base/service/LWarehouseFlowService.java b/consum-base/src/main/java/com/consum/base/service/LWarehouseFlowService.java
index 9d7b2ed..615bc7e 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWarehouseFlowService.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWarehouseFlowService.java
@@ -1,465 +1,26 @@
package com.consum.base.service;
-import com.consum.base.core.WhBusinessEnum;
-import com.consum.base.core.type.MixType;
-import com.consum.base.core.utils.*;
-import com.consum.base.pojo.LWarehouseFlowParam;
-import com.consum.base.pojo.query.LWhFormOutputQry;
-import com.consum.base.pojo.response.OutAndInDetailVO;
-import com.walker.db.page.GenericPager;
-import com.walker.infrastructure.utils.StringUtils;
-import com.walker.jdbc.service.BaseServiceImpl;
-import org.apache.commons.compress.utils.Lists;
-import org.springframework.stereotype.Service;
-
-import java.util.HashMap;
-import java.util.List;
import java.util.Map;
+import com.consum.base.core.utils.PageUtil;
+import com.consum.base.pojo.LWarehouseFlowParam;
+import com.consum.base.pojo.query.LWhFormOutputQry;
+import com.walker.db.page.GenericPager;
+import com.walker.jdbc.service.BaseService;
+
/**
- * @ClassName LWarehouseFlowService
- * @Date 2023/10/25
- * @Description
- * @Version 1.0
+ * LWarehouseFlowService
+ *
+ * @author asus
+ * @version 2023/12/22 11:01
**/
-@Service
-public class LWarehouseFlowService extends BaseServiceImpl {
+public interface LWarehouseFlowService extends BaseService {
- /**
- * 鏌ヨ鏄庣粏
- *
- * @param param
- * @return
- */
- private String QUERY_BUSINESS_FLOW = "SELECT flow.BUSINESS_TYPE,flow.BUSINESS_FORM_ID,CASE WHEN flow.BUSINESS_TYPE=1 THEN tCaiGou.BUSINESS_FORM_CODE WHEN flow.BUSINESS_TYPE=3 THEN tFormOut.BUSINESS_FORM_CODE END BUSINESS_FORM_CODE,record.GOODS_TEMPLATE_NAME,record.BASE_GOODS_MODELS_NAME,record.THIS_COUNT,record.THIS_TYPE,record.total_price,CASE WHEN flow.BUSINESS_TYPE=1 THEN tCaiGou.AGENCY_NAME WHEN flow.BUSINESS_TYPE=3 THEN tFormOut.AGENCY_NAME END AGENCY_NAME,CASE WHEN flow.BUSINESS_TYPE=1 THEN tCaiGou.BUYER_NAME WHEN flow.BUSINESS_TYPE=3 THEN tFormOut.OPERATOR_NAME END created_Name,flow.DEAL_TIME deal_Time FROM L_WAREHOUSE_FLOW flow LEFT JOIN L_WH_GOODS_RECORD record ON flow.id=record.WAREHOUSE_FLOW_ID LEFT JOIN L_WH_FORM_PROCURE tCaiGou ON flow.BUSINESS_TYPE=1 AND tCaiGou.id=flow.BUSINESS_FORM_ID LEFT JOIN L_WH_FORM_OUTPUT tFormOut ON flow.BUSINESS_TYPE=3 AND tFormOut.id=flow.BUSINESS_FORM_ID WHERE 1=1 ";
+ GenericPager<Map<String, Object>> queryBusinessFlow(LWarehouseFlowParam param);
- public GenericPager<Map<String, Object>> queryBusinessFlow(LWarehouseFlowParam param) {
- StringBuilder sql = new StringBuilder(QUERY_BUSINESS_FLOW);
- Map<String, Object> paramts = new HashMap<>();
-// ArrayList<Object> params = new ArrayList<>();
- if (param.getBusinessType() != null) {
- sql.append(" and flow.BUSINESS_TYPE =:businessType");
- paramts.put("businessType", param.getBusinessType());
-// sql.append(" and flow.BUSINESS_TYPE =?");
-// params.add(param.getBusinessType());
- }
- if (StringUtils.isNotEmpty(param.getBusinessFormCode())) {
- sql.append(" AND CASE WHEN flow.BUSINESS_TYPE = 1 THEN tCaiGou.BUSINESS_FORM_CODE=:businessFormCode"
- + " WHEN flow.BUSINESS_TYPE = 3 THEN tFormOut.BUSINESS_FORM_CODE=:businessFormCode END");
- paramts.put("businessFormCode", param.getBusinessFormCode());
-// sql.append(" AND CASE WHEN flow.BUSINESS_TYPE = 1 THEN flow.BUSINESS_FORM_CODE=?");
-// params.add(param.getBusinessFormCode());
- }
- if (param.getGoodsTemplateName() != null) {
- sql.append(" AND record.GOODS_TEMPLATE_NAME like :goodsTemplateName");
- paramts.put("goodsTemplateName", StringUtils.CHAR_PERCENT + param.getGoodsTemplateName() + StringUtils.CHAR_PERCENT);
-// sql.append(" AND record.GOODS_TEMPLATE_NAME like ?");
-// params.add(StringUtils.CHAR_PERCENT + param.getGoodsTemplateName() + StringUtils.CHAR_PERCENT);
- }
- if (param.getBaseGoodsModelsName() != null) {
- sql.append(" AND record.BASE_GOODS_MODELS_NAME like :baseGoodsModelsName");
- paramts.put("baseGoodsModelsName", StringUtils.CHAR_PERCENT + param.getBaseGoodsModelsName() + StringUtils.CHAR_PERCENT);
- }
- if (param.getAgencyId() != null) {
- sql.append(" AND tCaiGou.AGENCY_id=:agencyId");
- paramts.put("agencyId", param.getAgencyId());
- }
- if (param.getCreatedName() != null) {
- sql.append(" AND CASE" + " WHEN flow.BUSINESS_TYPE = 1 THEN tCaiGou.BUYER_NAME LIKE :createdName"
- + " WHEN flow.BUSINESS_TYPE = 3 THEN tFormOut.OPERATOR_NAME LIKE :createdName END");
- paramts.put("createdName", StringUtils.CHAR_PERCENT + param.getCreatedName() + StringUtils.CHAR_PERCENT);
- }
- if (param.getDealTimeStart() != null) {
- sql.append(" and flow.DEAL_TIME >=:dealTimeStart ");
- paramts.put("dealTimeStart", param.getDealTimeStart() * 1000000);
- }
- if (param.getDealTimeEnd() != null) {
- sql.append(" and flow.DEAL_TIME <:dealTimeEnd ");
- paramts.put("dealTimeEnd", param.getDealTimeEnd() * 1000000 + 240000);
- }
- return selectSplit(sql.toString(), paramts, param.getPageNum(), param.getPageSize(), new MapRowMapper());
- }
+ GenericPager<Map<String, Object>> queryTaiZhangList(LWarehouseFlowParam param);
+ GenericPager<Map<String, Object>> queryDeptTaiZhangList(LWarehouseFlowParam param);
- /**
- * 鍙拌处鏌ヨ
- *
- * @param param
- * @return
- */
- private String QUERY_TAIZHANG_LIST_QUERY = "SELECT CASE WHEN flow.BUSINESS_TYPE=1 THEN tCaiGou.AGENCY_NAME WHEN ( flow.BUSINESS_TYPE = 2 OR flow.BUSINESS_TYPE = 4 ) and flow.THIS_TYPE=1 THEN tTrans.IN_AGENCY_NAME WHEN ( flow.BUSINESS_TYPE = 2 OR flow.BUSINESS_TYPE = 4 ) and flow.THIS_TYPE=2 THEN tTrans.OUT_AGENCY_NAME WHEN flow.BUSINESS_TYPE=3 THEN tFormOut.AGENCY_NAME WHEN flow.BUSINESS_TYPE=5 THEN tScrapped.AGENCY_NAME WHEN flow.BUSINESS_TYPE = 6 THEN tBack.AGENCY_NAME WHEN flow.BUSINESS_TYPE=7 THEN tInventory.AGENCY_NAME END AGENCY_NAME,ware.WAREHOUSE_NAME,record.GOODS_TEMPLATE_NAME,record.BASE_GOODS_MODELS_NAME,record.THIS_TYPE,flow.BUSINESS_TYPE,CASE WHEN flow.BUSINESS_TYPE=1 THEN tCaiGou.BUSINESS_FORM_CODE WHEN (flow.BUSINESS_TYPE=2 OR flow.BUSINESS_TYPE=4) THEN tTrans.BUSINESS_FORM_CODE WHEN flow.BUSINESS_TYPE=3 THEN tFormOut.BUSINESS_FORM_CODE WHEN flow.BUSINESS_TYPE=5 THEN tScrapped.BUSINESS_FORM_CODE WHEN flow.BUSINESS_TYPE = 6 THEN tBack.BUSINESS_FORM_CODE WHEN flow.BUSINESS_TYPE=7 THEN tInventory.BUSINESS_FORM_CODE END BUSINESS_FORM_CODe,record.THIS_COUNT,record.INITIAL_COUNT,record.END_COUNT,flow.DEAL_TIME,CASE WHEN flow.BUSINESS_TYPE=2 AND tTrans.STATES=1 THEN record.THIS_COUNT ELSE 0 END zai_Tu_Count FROM (SELECT*FROM BASE_WAREHOUSE WHERE 1=1 ";
- private String QUERY_TAIZHANG_LIST_RECORD = ")ware LEFT JOIN L_WAREHOUSE_FLOW flow ON ware.id=flow.WAREHOUSE_ID AND flow.WAREHOUSE_TYPE=0 LEFT JOIN L_WH_GOODS_RECORD record ON flow.id=record.WAREHOUSE_FLOW_ID ";
- private String QUERY_TAIZHANG_LIST_END = " WHERE record.id IS NOT NULL";
- private String QUERY_TAIZHANG_LIST_CAIGOU = " LEFT JOIN L_WH_FORM_PROCURE tCaiGou ON flow.BUSINESS_TYPE=1 AND tCaiGou.id=flow.BUSINESS_FORM_ID ";
- private String QUERY_TAIZHANG_LIST_DIAOBO = " LEFT JOIN L_WH_FORM_TRANSFER tTrans ON (flow.BUSINESS_TYPE=2 or flow.BUSINESS_TYPE=4) AND tTrans.id=flow.BUSINESS_FORM_ID ";
- private String QUERY_TAIZHANG_LIST_CHUKU = " LEFT JOIN L_WH_FORM_OUTPUT tFormOut ON flow.BUSINESS_TYPE=3 AND tFormOut.id=flow.BUSINESS_FORM_ID ";
- private String QUERY_TAIZHANG_LIST_PANDIAN = " LEFT JOIN L_WH_FORM_INVENTORY tInventory ON flow.BUSINESS_TYPE=7 AND tInventory.id=flow.BUSINESS_FORM_ID ";
- private String QUERY_TAIZHANG_LIST_BAOFEI = " LEFT JOIN L_WH_FORM_SCRAPPED tScrapped ON flow.BUSINESS_TYPE=5 AND tScrapped.id=flow.BUSINESS_FORM_ID ";
- private String QUERY_TAIZHANG_LIST_DEP_TUIHUI = " LEFT JOIN USING_FORM_BACK tBack ON flow.BUSINESS_TYPE=6 AND tBack.id=flow.BUSINESS_FORM_ID ";
-
- public GenericPager<Map<String, Object>> queryTaiZhangList(LWarehouseFlowParam param) {
- StringBuilder sqlQuery = new StringBuilder(QUERY_TAIZHANG_LIST_QUERY);
- StringBuilder sqlEndRecord = new StringBuilder(QUERY_TAIZHANG_LIST_RECORD);
- StringBuilder sqlCaiGou = new StringBuilder(QUERY_TAIZHANG_LIST_CAIGOU);
- StringBuilder sqlDiaoBo = new StringBuilder(QUERY_TAIZHANG_LIST_DIAOBO);
- StringBuilder sqlChuKu = new StringBuilder(QUERY_TAIZHANG_LIST_CHUKU);
- StringBuilder sqlBaoFei = new StringBuilder(QUERY_TAIZHANG_LIST_BAOFEI);
- StringBuilder sqlDepTuiHui = new StringBuilder(QUERY_TAIZHANG_LIST_DEP_TUIHUI);
- StringBuilder sqlPanDian = new StringBuilder(QUERY_TAIZHANG_LIST_PANDIAN);
- StringBuilder sqlEnd = new StringBuilder(QUERY_TAIZHANG_LIST_END);
-
- HashMap<String, Object> paramts = new HashMap<>();
- //鏈烘瀯
- if (param.getAgencyId() != null) {
-// sqlQuery.append(" AND left(AGENCY_ID, length(:lengthAgencyId)) = :agencyId");
- sqlQuery.append(" AND AGENCY_ID=:agencyId");
-// paramts.put("lengthAgencyId", param.getAgencyId());
- paramts.put("agencyId", param.getAgencyId());
- }
- //浠撳簱绫诲瀷
- if (param.getWarehouseType() != null) {
- sqlQuery.append(" AND WAREHOUSE_TYPE = :warehouseType");
- paramts.put("warehouseType", param.getWarehouseType());
- }
- if (param.getBaseWarehouseId() != null) {
- sqlQuery.append(" AND id = :warehouseId");
- paramts.put("warehouseId", param.getBaseWarehouseId());
- }
- //鐗╁搧鍚嶇О
- if (StringUtils.isNotEmpty(param.getGoodsTemplateName())) {
- sqlEnd.append(" AND record.GOODS_TEMPLATE_NAME like :goodsTemplateName");
- paramts.put("goodsTemplateName", StringUtils.CHAR_PERCENT + param.getGoodsTemplateName() + StringUtils.CHAR_PERCENT);
- }
- if (param.getGoodsTemplateId() != null) {
- sqlEnd.append(" AND record.BASE_GOODS_TEMPLATE_ID=:goodsTemplateId");
- paramts.put("goodsTemplateId", param.getGoodsTemplateId());
- }
- //瑙勬牸鍨嬪彿
- if (param.getBaseGoodsModelsId() != null) {
- sqlEnd.append(" AND record.BASE_GOODS_MODELS_ID=:baseGoodsModelsId");
- paramts.put("baseGoodsModelsId", param.getBaseGoodsModelsId());
- }
- // 鍚岀爜琛紝1閲囪喘鍏ュ簱 2閫�杩樺叆搴� 3璋冩嫧鍏ュ簱 4鐩樼泩鍏ュ簱 5鐢抽鍑哄簱 6璋冩嫧鍑哄簱 7鐩樹簭鍑哄簱 8鎶ュ簾鍑哄簱 9鍏朵粬鍑哄簱
- Short flowType = param.getFlowType();
- if (flowType != null) {
- Map<String, Short> typeByFlowType = WhBusinessEnum.getTypeByFlowType(flowType);
- //鏈璋冩暣绫诲瀷锛�1=璋冨锛�2=璋冨噺锛�
- Short flowThisType = typeByFlowType.get("flowThisType");
- //鍗曟嵁绫诲瀷 1 閲囪喘2 璋冩嫧 3鍑哄簱4閮ㄩ棬鍒嗗彂5鎶ュ簾6閮ㄩ棬鐗╁搧鍥為��浠撳簱7鐗╁搧鐩樼偣
- Short flowBusinessType = typeByFlowType.get("flowBusinessType");
- if (flowThisType != null) {
- sqlEnd.append(" AND flow.THIS_TYPE=:flowThisType");
- paramts.put("flowThisType", flowThisType);
- }
- if (flowBusinessType != null) {
- sqlEnd.append(" AND flow.BUSINESS_TYPE=:flowBusinessType");
- paramts.put("flowBusinessType", flowBusinessType);
- }
- }
- // 鍗曞彿
- String businessFormCode = param.getBusinessFormCode();
- if (StringUtils.isNotEmpty(businessFormCode)) {
- sqlCaiGou.append(" and tCaiGou.BUSINESS_FORM_CODE = :caoGouBusinessFormCode");
- paramts.put("caoGouBusinessFormCode", businessFormCode);
- sqlDiaoBo.append(" and tTrans.BUSINESS_FORM_CODE = :diaoBoBusinessFormCode");
- paramts.put("diaoBoBusinessFormCode", businessFormCode);
- sqlChuKu.append(" and tFormOut.BUSINESS_FORM_CODE = :chuKuBusinessFormCode");
- paramts.put("chuKuBusinessFormCode", businessFormCode);
- sqlBaoFei.append(" and tScrapped.BUSINESS_FORM_CODE = :baoFeiBusinessFormCode");
- paramts.put("baoFeiBusinessFormCode", businessFormCode);
- sqlDepTuiHui.append(" and tBack.BUSINESS_FORM_CODE = :depTuiHuiBusinessFormCode");
- paramts.put("depTuiHuiBusinessFormCode", businessFormCode);
- sqlPanDian.append(" and tInventory.BUSINESS_FORM_CODE = :panDianBusinessFormCode");
- paramts.put("panDianBusinessFormCode", businessFormCode);
-
- sqlEnd.append(" and case when flow.BUSINESS_TYPE = 1 THEN tCaiGou.BUSINESS_FORM_CODE" +
- " WHEN ( flow.BUSINESS_TYPE = 2 OR flow.BUSINESS_TYPE = 4) THEN tTrans.BUSINESS_FORM_CODE" +
- " WHEN flow.BUSINESS_TYPE = 3 THEN tFormOut.BUSINESS_FORM_CODE" +
- " WHEN flow.BUSINESS_TYPE = 5 THEN tScrapped.BUSINESS_FORM_CODE" +
- " WHEN flow.BUSINESS_TYPE = 6 THEN tBack.BUSINESS_FORM_CODE" +
- " WHEN flow.BUSINESS_TYPE = 7 THEN tInventory.BUSINESS_FORM_CODE end =:whereBusinessFormCode");
- paramts.put("whereBusinessFormCode", businessFormCode);
-
-
- }
- // 鎿嶄綔鏃堕棿
- if (param.getDealTimeStart() != null) {
- sqlEnd.append(" and flow.DEAL_TIME >=:dealTimeStart ");
- paramts.put("dealTimeStart", param.getDealTimeStart() * 1000000);
- }
- if (param.getDealTimeEnd() != null) {
- sqlEnd.append(" and flow.DEAL_TIME <:dealTimeEnd ");
- paramts.put("dealTimeEnd", param.getDealTimeEnd() * 1000000 + 240000);
- }
- sqlEnd.append(" ORDER BY record.DEAL_TIME desc,record.id DESC ");
-
- StringBuilder sql = new StringBuilder();
- sql.append(sqlQuery)
- .append(sqlEndRecord)
- .append(sqlCaiGou)
- .append(sqlDiaoBo)
- .append(sqlChuKu)
- .append(sqlBaoFei)
- .append(sqlDepTuiHui)
- .append(sqlPanDian)
-
- .append(sqlEnd);
-
- return selectSplit(sql.toString(), paramts, param.getPageNum(), param.getPageSize(), new MapperUtil());
- }
-
- /**
- * 鍙拌处鏌ヨ
- *
- * @param param
- * @return
- */
- private String QUERY_DEPT_TAIZHANG_LIST_QUERY = "SELECT CASE WHEN flow.BUSINESS_TYPE=1 THEN tCaiGou.AGENCY_NAME WHEN (flow.BUSINESS_TYPE=2 OR flow.BUSINESS_TYPE=4) THEN tTrans.OUT_AGENCY_NAME WHEN flow.BUSINESS_TYPE=3 THEN tFormOut.AGENCY_NAME WHEN flow.BUSINESS_TYPE=5 AND flow.WAREHOUSE_TYPE=0 THEN tScrapped.AGENCY_NAME WHEN flow.BUSINESS_TYPE=5 AND flow.WAREHOUSE_TYPE=1 THEN tDepScrapped.AGENCY_NAME WHEN flow.BUSINESS_TYPE=6 AND flow.WAREHOUSE_TYPE=1 THEN tBack.AGENCY_NAME WHEN flow.BUSINESS_TYPE=7 THEN tInventory.AGENCY_NAME END AGENCY_NAME,ware.NAME AS dept_name,record.GOODS_TEMPLATE_NAME,record.BASE_GOODS_MODELS_NAME,record.THIS_TYPE,flow.BUSINESS_TYPE,CASE WHEN flow.BUSINESS_TYPE=1 THEN tCaiGou.BUSINESS_FORM_CODE WHEN (flow.BUSINESS_TYPE=2 OR flow.BUSINESS_TYPE=4) THEN tTrans.BUSINESS_FORM_CODE WHEN flow.BUSINESS_TYPE=3 THEN tFormOut.BUSINESS_FORM_CODE WHEN flow.BUSINESS_TYPE=5 AND flow.WAREHOUSE_TYPE=0 THEN tScrapped.BUSINESS_FORM_CODE WHEN flow.BUSINESS_TYPE=5 AND flow.WAREHOUSE_TYPE=1 THEN tDepScrapped.BUSINESS_FORM_CODE WHEN flow.BUSINESS_TYPE=6 AND flow.WAREHOUSE_TYPE=1 THEN tBack.BUSINESS_FORM_CODE WHEN flow.BUSINESS_TYPE=7 THEN tInventory.BUSINESS_FORM_CODE END BUSINESS_FORM_CODe,record.THIS_COUNT,record.INITIAL_COUNT,record.END_COUNT,flow.DEAL_TIME,CASE WHEN flow.BUSINESS_TYPE=2 AND tTrans.STATES=1 THEN record.THIS_COUNT ELSE 0 END zai_Tu_Count FROM (SELECT*FROM fin_sys_tenant_department WHERE 1=1 ";
- private String QUERY_DEPT_TAIZHANG_LIST_RECORD = ")ware LEFT JOIN L_WAREHOUSE_FLOW flow ON ware.id=flow.WAREHOUSE_ID AND flow.WAREHOUSE_TYPE=1 LEFT JOIN L_WH_GOODS_RECORD record ON flow.id=record.WAREHOUSE_FLOW_ID ";
- private String QUERY_DEPT_TAIZHANG_LIST_END = " WHERE record.id IS NOT NULL";
- private String QUERY_DEPT_TAIZHANG_LIST_CAIGOU = " LEFT JOIN L_WH_FORM_PROCURE tCaiGou ON flow.BUSINESS_TYPE=1 AND tCaiGou.id=flow.BUSINESS_FORM_ID ";
- private String QUERY_DEPT_TAIZHANG_LIST_DIAOBO = " LEFT JOIN L_WH_FORM_TRANSFER tTrans ON (flow.BUSINESS_TYPE=2 or flow.BUSINESS_TYPE=4) AND tTrans.id=flow.BUSINESS_FORM_ID ";
- private String QUERY_DEPT_TAIZHANG_LIST_CHUKU = " LEFT JOIN L_WH_FORM_OUTPUT tFormOut ON flow.BUSINESS_TYPE=3 AND tFormOut.id=flow.BUSINESS_FORM_ID ";
- private String QUERY_DEPT_TAIZHANG_LIST_PANDIAN = " LEFT JOIN L_WH_FORM_INVENTORY tInventory ON flow.BUSINESS_TYPE=7 AND tInventory.id=flow.BUSINESS_FORM_ID ";
- private String QUERY_DEPT_TAIZHANG_LIST_BAOFEI = " LEFT JOIN L_WH_FORM_SCRAPPED tScrapped ON flow.BUSINESS_TYPE=5 AND flow.WAREHOUSE_TYPE=0 AND tScrapped.id=flow.BUSINESS_FORM_ID ";
- private String QUERY_DEPT_TAIZHANG_LIST_DEP_BAOFEI = " LEFT JOIN DEP_FORM_SCRAPPED tDepScrapped ON flow.BUSINESS_TYPE=5 AND flow.WAREHOUSE_TYPE=1 AND tDepScrapped.id=flow.BUSINESS_FORM_ID ";
- private String QUERY_DEPT_TAIZHANG_LIST_DEP_TUIHUI = " LEFT JOIN USING_FORM_BACK tBack ON flow.BUSINESS_TYPE=6 AND tBack.id=flow.BUSINESS_FORM_ID ";
-
- public GenericPager<Map<String, Object>> queryDeptTaiZhangList(LWarehouseFlowParam param) {
- StringBuilder sqlQuery = new StringBuilder(QUERY_DEPT_TAIZHANG_LIST_QUERY);
- StringBuilder sqlEndRecord = new StringBuilder(QUERY_DEPT_TAIZHANG_LIST_RECORD);
- StringBuilder sqlCaiGou = new StringBuilder(QUERY_DEPT_TAIZHANG_LIST_CAIGOU);
- StringBuilder sqlDiaoBo = new StringBuilder(QUERY_DEPT_TAIZHANG_LIST_DIAOBO);
- StringBuilder sqlChuKu = new StringBuilder(QUERY_DEPT_TAIZHANG_LIST_CHUKU);
- StringBuilder sqlBaoFei = new StringBuilder(QUERY_DEPT_TAIZHANG_LIST_BAOFEI);
- StringBuilder sqlPanDian = new StringBuilder(QUERY_DEPT_TAIZHANG_LIST_PANDIAN);
- StringBuilder sqlDepBaoFei = new StringBuilder(QUERY_DEPT_TAIZHANG_LIST_DEP_BAOFEI);
- StringBuilder sqlDepTuiHui = new StringBuilder(QUERY_DEPT_TAIZHANG_LIST_DEP_TUIHUI);
- StringBuilder sqlEnd = new StringBuilder(QUERY_DEPT_TAIZHANG_LIST_END);
-
- HashMap<String, Object> paramts = new HashMap<>();
- //鏈烘瀯
- if (param.getAgencyId() != null) {
-// sqlQuery.append(" AND left(AGENCY_ID, length(:lengthAgencyId)) = :agencyId");
- sqlQuery.append(" AND TENANT_ID=:agencyId");
-// paramts.put("lengthAgencyId", param.getAgencyId());
- paramts.put("agencyId", param.getAgencyId());
- }
- // 閮ㄩ棬
- if (param.getDepartmentId() != null) {
- sqlQuery.append(" and ID= :departmentId");
- paramts.put("departmentId", param.getDepartmentId());
- }
- //浠撳簱绫诲瀷
- if (param.getWarehouseType() != null) {
- sqlQuery.append(" AND WAREHOUSE_TYPE = :warehouseType");
- paramts.put("warehouseType", param.getWarehouseType());
- }
- //鐗╁搧鍚嶇О
- if (StringUtils.isNotEmpty(param.getGoodsTemplateName())) {
- sqlEnd.append(" AND record.GOODS_TEMPLATE_NAME like :goodsTemplateName");
- paramts.put("goodsTemplateName", StringUtils.CHAR_PERCENT + param.getGoodsTemplateName() + StringUtils.CHAR_PERCENT);
- }
- if (param.getGoodsTemplateId() != null) {
- sqlEnd.append(" AND record.BASE_GOODS_TEMPLATE_ID=:goodsTemplateId");
- paramts.put("goodsTemplateId", param.getGoodsTemplateId());
- }
- //瑙勬牸鍨嬪彿
- if (param.getBaseGoodsModelsId() != null) {
- sqlEnd.append(" AND record.BASE_GOODS_MODELS_ID=:baseGoodsModelsId");
- paramts.put("baseGoodsModelsId", param.getBaseGoodsModelsId());
- }
- // 鍚岀爜琛紝1 鐗╁搧鐢抽 2 鐗╁搧鍒嗗彂 3 鐗╁搧閫�杩� 4 鐗╁搧鎶ュ簾
- Short flowType = param.getFlowType();
- if (flowType != null) {
- Map<String, Short> typeByFlowType = WhBusinessEnum.getTypeByDeptFlowType(flowType);
- //鏈璋冩暣绫诲瀷锛�1=璋冨锛�2=璋冨噺锛�
- Short flowThisType = typeByFlowType.get("flowThisType");
- //鍗曟嵁绫诲瀷 1 閲囪喘2 璋冩嫧 3鍑哄簱4閮ㄩ棬鍒嗗彂5鎶ュ簾6閮ㄩ棬鐗╁搧鍥為��浠撳簱7鐗╁搧鐩樼偣
- Short flowBusinessType = typeByFlowType.get("flowBusinessType");
- if (flowThisType != null) {
- sqlEnd.append(" AND flow.THIS_TYPE=:flowThisType");
- paramts.put("flowThisType", flowThisType);
- }
- if (flowBusinessType != null) {
- sqlEnd.append(" AND flow.BUSINESS_TYPE=:flowBusinessType");
- paramts.put("flowBusinessType", flowBusinessType);
- }
- }
- // 鍗曞彿
- String businessFormCode = param.getBusinessFormCode();
- if (StringUtils.isNotEmpty(businessFormCode)) {
- sqlCaiGou.append(" and tCaiGou.BUSINESS_FORM_CODE = :caoGouBusinessFormCode");
- paramts.put("caoGouBusinessFormCode", businessFormCode);
- sqlDiaoBo.append(" and tTrans.BUSINESS_FORM_CODE = :diaoBoBusinessFormCode");
- paramts.put("diaoBoBusinessFormCode", businessFormCode);
- sqlChuKu.append(" and tFormOut.BUSINESS_FORM_CODE = :chuKuBusinessFormCode");
- paramts.put("chuKuBusinessFormCode", businessFormCode);
- sqlBaoFei.append(" and tScrapped.BUSINESS_FORM_CODE = :baoFeiBusinessFormCode");
- paramts.put("baoFeiBusinessFormCode", businessFormCode);
- sqlDepBaoFei.append(" and tDepScrapped.BUSINESS_FORM_CODE = :deptBaoFeiBusinessFormCode");
- paramts.put("deptBaoFeiBusinessFormCode", businessFormCode);
- sqlDepTuiHui.append(" and tBack.BUSINESS_FORM_CODE = :deptBackBusinessFormCode");
- paramts.put("deptBackBusinessFormCode", businessFormCode);
- sqlPanDian.append(" and tInventory.BUSINESS_FORM_CODE = :panDianBusinessFormCode");
- paramts.put("panDianBusinessFormCode", businessFormCode);
-
- sqlEnd.append(" and case when flow.BUSINESS_TYPE = 1 THEN tCaiGou.BUSINESS_FORM_CODE" +
- " WHEN ( flow.BUSINESS_TYPE = 2 OR flow.BUSINESS_TYPE = 4) THEN tTrans.BUSINESS_FORM_CODE" +
- " WHEN flow.BUSINESS_TYPE = 3 THEN tFormOut.BUSINESS_FORM_CODE" +
- " WHEN flow.BUSINESS_TYPE = 5 AND flow.WAREHOUSE_TYPE = 0 THEN tScrapped.BUSINESS_FORM_CODE" +
- " WHEN flow.BUSINESS_TYPE = 5 AND flow.WAREHOUSE_TYPE = 1 THEN tDepScrapped.BUSINESS_FORM_CODE" +
- " WHEN flow.BUSINESS_TYPE = 6 THEN tBack.BUSINESS_FORM_CODE" +
- " WHEN flow.BUSINESS_TYPE = 7 THEN tInventory.BUSINESS_FORM_CODE end =:whereBusinessFormCode");
- paramts.put("whereBusinessFormCode", businessFormCode);
- }
- // 鎿嶄綔鏃堕棿
- if (param.getDealTimeStart() != null) {
- sqlEnd.append(" and flow.DEAL_TIME >=:dealTimeStart ");
- paramts.put("dealTimeStart", param.getDealTimeStart() * 1000000);
- }
- if (param.getDealTimeEnd() != null) {
- sqlEnd.append(" and flow.DEAL_TIME <:dealTimeEnd ");
- paramts.put("dealTimeEnd", param.getDealTimeEnd() * 1000000 + 240000);
- }
- sqlEnd.append(" ORDER BY record.DEAL_TIME desc,record.id DESC ");
-
- StringBuilder sql = new StringBuilder();
- sql.append(sqlQuery)
- .append(sqlEndRecord)
- .append(sqlCaiGou)
- .append(sqlDiaoBo)
- .append(sqlChuKu)
- .append(sqlBaoFei)
- .append(sqlPanDian)
- .append(sqlDepBaoFei)
- .append(sqlDepTuiHui)
- .append(sqlEnd);
-
- return selectSplit(sql.toString(), paramts, param.getPageNum(), param.getPageSize(), new MapperUtil());
- }
-
- public PageUtil queryAllBusinessFlow(LWhFormOutputQry param) {
- StringBuilder sql = new StringBuilder("SELECT\n"
- + "CASE WHEN flow.BUSINESS_TYPE=1 THEN tCaiGou.id \n"
- + "WHEN (flow.BUSINESS_TYPE=2 OR flow.BUSINESS_TYPE=4) THEN tTrans.id \n"
- + "WHEN flow.BUSINESS_TYPE=3 THEN tFormOut.id \n"
- + "WHEN flow.BUSINESS_TYPE=5 THEN tScrapped.id \n"
- + "WHEN flow.BUSINESS_TYPE=6 THEN tBack.id \n"
- + "WHEN flow.BUSINESS_TYPE=7 THEN tInventory.id END id,\n"
- + "\n"
- + "CASE WHEN flow.BUSINESS_TYPE=1 THEN tCaiGou.BUSINESS_FORM_CODE \n"
- + "WHEN (flow.BUSINESS_TYPE=2 OR flow.BUSINESS_TYPE=4) THEN tTrans.BUSINESS_FORM_CODE \n"
- + "WHEN flow.BUSINESS_TYPE=3 THEN tFormOut.BUSINESS_FORM_CODE \n"
- + "WHEN flow.BUSINESS_TYPE=5 THEN tScrapped.BUSINESS_FORM_CODE \n"
- + "WHEN flow.BUSINESS_TYPE=6 THEN tBack.BUSINESS_FORM_CODE \n"
- + "WHEN flow.BUSINESS_TYPE=7 THEN tInventory.BUSINESS_FORM_CODE END BUSINESS_FORM_CODE,\n"
- + "\n"
- + "CASE WHEN flow.BUSINESS_TYPE=1 THEN tCaiGou.AGENCY_NAME \n"
- + "WHEN (flow.BUSINESS_TYPE=2 OR flow.BUSINESS_TYPE=4) THEN tTrans.OPERATOR_NAME \n"
- + "WHEN flow.BUSINESS_TYPE=3 THEN tFormOut.AGENCY_NAME \n"
- + "WHEN flow.BUSINESS_TYPE=5 THEN tScrapped.AGENCY_NAME \n"
- + "WHEN flow.BUSINESS_TYPE=6 THEN tBack.AGENCY_NAME \n"
- + "WHEN flow.BUSINESS_TYPE=7 THEN tInventory.AGENCY_NAME END AGENCY_NAME,\n"
- + "\n"
- + "record.GOODS_TEMPLATE_NAME,\n"
- + "record.BASE_GOODS_MODELS_NAME,\n"
- + "record.THIS_TYPE,\n"
- + "flow.BUSINESS_TYPE,\n"
- + "record.THIS_COUNT,\n"
- + "flow.DEAL_TIME,\n"
- + "flow.OPERATOR_NAME,\n"
- + "record.TOTAL_PRICE\n"
- + "FROM ( SELECT * FROM BASE_WAREHOUSE WHERE 1= 1 AND AGENCY_ID =:tenantId ) bw "
- + "LEFT JOIN L_WAREHOUSE_FLOW flow ON bw.id = flow.WAREHOUSE_ID AND flow.WAREHOUSE_TYPE = 0\n"
- + "LEFT JOIN L_WH_GOODS_RECORD record ON flow.id=record.WAREHOUSE_FLOW_ID\n"
- + "LEFT JOIN L_WH_FORM_PROCURE tCaiGou ON flow.BUSINESS_TYPE=1 AND tCaiGou.id=flow.BUSINESS_FORM_ID\n"
- + "LEFT JOIN L_WH_FORM_TRANSFER tTrans ON (flow.BUSINESS_TYPE=2 or flow.BUSINESS_TYPE=4) AND tTrans.id=flow.BUSINESS_FORM_ID\n"
- + "LEFT JOIN L_WH_FORM_OUTPUT tFormOut ON flow.BUSINESS_TYPE=3 AND tFormOut.id=flow.BUSINESS_FORM_ID\n"
- + "LEFT JOIN L_WH_FORM_INVENTORY tInventory ON flow.BUSINESS_TYPE=7 AND tInventory.id=flow.BUSINESS_FORM_ID\n"
- + "LEFT JOIN L_WH_FORM_SCRAPPED tScrapped ON flow.BUSINESS_TYPE=5 AND tScrapped.id=flow.BUSINESS_FORM_ID\n"
- + "LEFT JOIN USING_FORM_BACK tBack ON flow.BUSINESS_TYPE=6 AND tBack.id=flow.BUSINESS_FORM_ID\n"
- //+ "LEFT JOIN base_warehouse bw ON flow.WAREHOUSE_ID = bw.id\n"
- + "LEFT JOIN fin_sys_tenant fst ON fst.id = bw.AGENCY_ID\n"
- + "WHERE record.id IS NOT NULL ");
-
- HashMap<String, Object> paramts = new HashMap<>();
- //鏈烘瀯
- if (param.getAgencyId() != null) {
- paramts.put("tenantId", param.getAgencyId());
- }
- //鏈烘瀯
- if (param.getAgencyId() != null) {
- sql.append("AND fst.id like :agencyId ");
- paramts.put("agencyId", param.getAgencyId() + StringUtils.CHAR_PERCENT);
- }
-
- //鐗╁搧鍚嶇О
- if (StringUtils.isNotEmpty(param.getGoodsTempName())) {
- sql.append(" AND record.GOODS_TEMPLATE_NAME like :goodsTemplateName");
- paramts.put("goodsTemplateName", StringUtils.CHAR_PERCENT + param.getGoodsTempName() + StringUtils.CHAR_PERCENT);
- }
- if (param.getGoodsTemplateId() != null) {
- sql.append(" AND record.BASE_GOODS_TEMPLATE_ID =:goodsTemplateId");
- paramts.put("goodsTemplateId", param.getGoodsTemplateId());
- }
- //瑙勬牸鍨嬪彿
- if (param.getBaseGoodsModelsId() != null) {
- sql.append(" AND record.BASE_GOODS_MODELS_ID=:baseGoodsModelsId");
- paramts.put("baseGoodsModelsId", param.getBaseGoodsModelsId());
- }
- // 鍚岀爜琛紝1閲囪喘鍏ュ簱 2閫�杩樺叆搴� 3璋冩嫧鍏ュ簱 4鐩樼泩鍏ュ簱 5鐢抽鍑哄簱 6璋冩嫧鍑哄簱 7鐩樹簭鍑哄簱 8鎶ュ簾鍑哄簱 9鍏朵粬鍑哄簱
- Integer flowType = param.getFlowType();
- if (flowType != null) {
- Map<String, Short> typeByFlowType = WhBusinessEnum.getTypeByFlowType(flowType.shortValue());
- //鏈璋冩暣绫诲瀷锛�1=璋冨锛�2=璋冨噺锛�
- Short flowThisType = typeByFlowType.get("flowThisType");
- //鍗曟嵁绫诲瀷 1 閲囪喘2 璋冩嫧 3鍑哄簱4閮ㄩ棬鍒嗗彂5鎶ュ簾6閮ㄩ棬鐗╁搧鍥為��浠撳簱7鐗╁搧鐩樼偣
- Short flowBusinessType = typeByFlowType.get("flowBusinessType");
- if (flowThisType != null) {
- sql.append(" AND flow.THIS_TYPE=:flowThisType");
- paramts.put("flowThisType", flowThisType);
- }
- if (flowBusinessType != null) {
- sql.append(" AND flow.BUSINESS_TYPE=:flowBusinessType");
- paramts.put("flowBusinessType", flowBusinessType);
- }
- }
- // 鍗曞彿
- String businessFormCode = param.getBusinessFormCode();
- if (StringUtils.isNotEmpty(businessFormCode)) {
- sql.append(" and case when flow.BUSINESS_TYPE = 1 THEN tCaiGou.BUSINESS_FORM_CODE =:whereBusinessFormCode" +
- " WHEN ( flow.BUSINESS_TYPE = 2 OR flow.BUSINESS_TYPE = 4) THEN tTrans.BUSINESS_FORM_CODE =:whereBusinessFormCode" +
- " WHEN flow.BUSINESS_TYPE = 3 THEN tFormOut.BUSINESS_FORM_CODE=:whereBusinessFormCode" +
- " WHEN flow.BUSINESS_TYPE = 5 THEN tScrapped.BUSINESS_FORM_CODE =:whereBusinessFormCode" +
- " WHEN flow.BUSINESS_TYPE = 6 THEN tBack.BUSINESS_FORM_CODE =:whereBusinessFormCode" +
- " WHEN flow.BUSINESS_TYPE = 7 THEN tInventory.BUSINESS_FORM_CODE =:whereBusinessFormCode end");
- paramts.put("whereBusinessFormCode", businessFormCode);
-
- }
- // 鎿嶄綔鏃堕棿
- if (param.getStartTime() != null) {
- sql.append(" and flow.DEAL_TIME >=:dealTimeStart ");
- paramts.put("dealTimeStart", param.getStartTime() * 1000000);
- }
- if (param.getEndTime() != null) {
- sql.append(" and flow.DEAL_TIME <:dealTimeEnd ");
- paramts.put("dealTimeEnd", param.getEndTime() * 1000000 + 240000);
- }
- sql.append(" ORDER BY record.DEAL_TIME desc,record.id DESC ");
- GenericPager<Map<String, Object>> mapGenericPager = selectSplit(sql.toString(), paramts, param.getPageNum(), param.getPageSize(), new MapperUtil());
- PageUtil pageUtil = new PageUtil(mapGenericPager);
- List<OutAndInDetailVO> result = Lists.newArrayList();
- mapGenericPager.getDatas().forEach(map -> {
- OutAndInDetailVO outAndInDetailVO = MapUtils.convertMapToObj(map, OutAndInDetailVO.class);
- Integer thisType = outAndInDetailVO.getThisType();
- Integer businessType = outAndInDetailVO.getBusinessType();
- String mixType = MixType.getMixType(businessType + "" + thisType);
- outAndInDetailVO.setMixType(mixType);
- outAndInDetailVO.setTotalPrice(CurrencyUtil.convertFenToYuan(outAndInDetailVO.getTotalPrice()));
- result.add(outAndInDetailVO);
- });
- pageUtil.setDatas(result);
- return pageUtil;
- }
+ PageUtil queryAllBusinessFlow(LWhFormOutputQry param);
}
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhGoodsStatisticsService.java b/consum-base/src/main/java/com/consum/base/service/LWhGoodsStatisticsService.java
new file mode 100644
index 0000000..ba68347
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/service/LWhGoodsStatisticsService.java
@@ -0,0 +1,15 @@
+package com.consum.base.service;
+
+import com.consum.base.pojo.query.LWhGoodsStatisQry;
+import com.walker.jdbc.service.BaseService;
+import java.util.List;
+
+/**
+ * LWhGoodsStatisticsService
+ *
+ * @author asus
+ * @version 2023/12/22 10:48
+ **/
+public interface LWhGoodsStatisticsService extends BaseService {
+ List getWhGoodsStatisList(LWhGoodsStatisQry param);
+}
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhGoodsStatisticsServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/LWhGoodsStatisticsServiceImpl.java
deleted file mode 100644
index 349d435..0000000
--- a/consum-base/src/main/java/com/consum/base/service/LWhGoodsStatisticsServiceImpl.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package com.consum.base.service;
-
-import com.consum.base.core.utils.MapperUtil;
-import com.consum.base.pojo.query.LWhGoodsStatisQry;
-import com.walker.infrastructure.utils.StringUtils;
-import com.walker.jdbc.service.BaseServiceImpl;
-import org.springframework.stereotype.Service;
-
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * @ClassName LWhGoodsStatisticsServiceImpl
- * @Author cy
- * @Date 2023/11/21
- * @Description
- * @Version 1.0
- **/
-@Service
-public class LWhGoodsStatisticsServiceImpl extends BaseServiceImpl {
- private String GET_WHGOODS_STATIS_LIST_COLUMN = "SELECT tCangKu.org_name,tCangKu.WAREHOUSE_NAME,goodsTemp.GOODS_CODE,tKuCun.GOODS_TEMPLATE_NAME,tKuCun.BASE_GOODS_MODELS_NAME,CASE tKuCun.COST_TYPE WHEN 1 THEN 'A绫�' WHEN 2 THEN 'B绫�' WHEN 3 THEN 'C绫�' END AS cost_Type,tKuCun.total_num,tKuCun.zai_ku_num,tKuCun.diao_bo_num,tKuCun.bao_fei_num FROM ";
- private String GET_WHGOODS_STATIS_LIST_T_CANGKU = "(SELECT tenant.id tenantId,tenant.NAME AS org_name,ware.*FROM fin_sys_tenant tenant right JOIN (SELECT 0 WAREHOUSE_TYPE,id,AGENCY_ID,WAREHOUSE_NAME FROM BASE_WAREHOUSE UNION ALL SELECT 1 WAREHOUSE_TYPE,id,TENANT_ID AGENCY_ID,`NAME` WAREHOUSE_NAME FROM fin_sys_tenant_department) ware ON tenant.id=ware.AGENCY_ID ";
- private String GET_WHGOODS_STATIS_LIST_T_CANGKU_WHERE = "where 1=1";
- private String GET_WHGOODS_STATIS_LIST_T_CANGKU_END = ") tCangKu LEFT JOIN";
- private String GET_WHGOODS_STATIS_LIST_T_KUCUN = "(SELECT WAREHOUSE_TYPE,WAREHOUSE_ID,BASE_GOODS_TEMPLATE_ID,GOODS_TEMPLATE_NAME,COST_TYPE,BASE_GOODS_MODELS_ID,BASE_GOODS_MODELS_NAME,COUNT(CASE WHEN goods.STATES BETWEEN 0 AND 2 THEN 1 END) AS total_num,count(CASE WHEN goods.STATES=1 OR goods.STATES=2 THEN 1 END) zai_ku_num,count(CASE WHEN goods.STATES=0 THEN 1 END) diao_bo_num,count(CASE WHEN goods.STATES=3 THEN 1 END) bao_fei_num FROM l_wh_goods goods ";
- private String GET_WHGOODS_STATIS_LIST_T_KUCUN_WHERE = "where 1=1";
- private String GET_WHGOODS_STATIS_LIST_T_KUCUN_GROUP_BY = " GROUP BY WAREHOUSE_TYPE,WAREHOUSE_ID,BASE_GOODS_TEMPLATE_ID,GOODS_TEMPLATE_NAME,BASE_GOODS_MODELS_ID,BASE_GOODS_MODELS_NAME,COST_TYPE) tKuCun ON tCangKu.WAREHOUSE_TYPE=tKuCun.WAREHOUSE_TYPE and tCangKu.id = tKuCun.WAREHOUSE_ID LEFT JOIN BASE_GOODS_TEMPLATE goodsTemp ON goodsTemp.id=tKuCun.BASE_GOODS_TEMPLATE_ID ";
- private String GET_WHGOODS_STATIS_LIST_T_END_WHERE = " where 1=1";
-
-
- public List getWhGoodsStatisList(LWhGoodsStatisQry param) {
- StringBuilder sqlColumn = new StringBuilder(GET_WHGOODS_STATIS_LIST_COLUMN);
- StringBuilder sqlCangKu = new StringBuilder(GET_WHGOODS_STATIS_LIST_T_CANGKU);
- StringBuilder sqlCangKuWhere = new StringBuilder(GET_WHGOODS_STATIS_LIST_T_CANGKU_WHERE);
- StringBuilder sqlCangKuEnd = new StringBuilder(GET_WHGOODS_STATIS_LIST_T_CANGKU_END);
- StringBuilder sqlKuCun = new StringBuilder(GET_WHGOODS_STATIS_LIST_T_KUCUN);
- StringBuilder sqlKuCunWhere = new StringBuilder(GET_WHGOODS_STATIS_LIST_T_KUCUN_WHERE);
- StringBuilder sqlKuCunGoupBy = new StringBuilder(GET_WHGOODS_STATIS_LIST_T_KUCUN_GROUP_BY);
- StringBuilder sqlEndWhere = new StringBuilder(GET_WHGOODS_STATIS_LIST_T_END_WHERE);
-
-
- HashMap<String, Object> paramts = new HashMap<>();
- //鏈烘瀯
- if (param.getAgencyId() != null) {
-// sqlCangKuWhere.append(" AND left(tenant.id, length(:lengthAgencyId)) = :agencyId");
- sqlCangKuWhere.append(" AND tenant.id = :agencyId");
-// paramts.put("lengthAgencyId", param.getAgencyId());
- paramts.put("agencyId", param.getAgencyId());
- }
- // 閮ㄩ棬
- if (param.getDepartmentId() != null) {
- sqlCangKuWhere.append(" AND ware.WAREHOUSE_TYPE=1 and ware.id = :departmentId");
- paramts.put("departmentId", param.getDepartmentId());
- }
- //浠撳簱
- if (param.getBaseWarehouseId() != null) {
- sqlCangKuWhere.append(" AND ware.WAREHOUSE_TYPE =0 and ware.id = :warehouseId");
- paramts.put("warehouseId", param.getBaseWarehouseId());
- }
- //鐗╁搧鍚嶇О
- if (StringUtils.isNotEmpty(param.getGoodsTemplateName())) {
- sqlKuCunWhere.append(" AND goods.GOODS_TEMPLATE_NAME like :goodsTemplateName");
- paramts.put("goodsTemplateName", StringUtils.CHAR_PERCENT + param.getGoodsTemplateName() + StringUtils.CHAR_PERCENT);
- }
- if (param.getGoodsTemplateId() != null) {
- sqlKuCunWhere.append(" AND goods.BASE_GOODS_TEMPLATE_ID=:goodsTemplateId");
- paramts.put("goodsTemplateId", param.getGoodsTemplateId());
- }
- //瑙勬牸鍨嬪彿
- if (param.getBaseGoodsModelsId() != null) {
- sqlKuCunWhere.append(" AND goods.BASE_GOODS_MODELS_ID=:baseGoodsModelsId");
- paramts.put("baseGoodsModelsId", param.getBaseGoodsModelsId());
- }
- //浠峰�肩被鍨�
- if (param.getCostType() != null) {
- // 灏嗘暟瀛楄浆鎹负瀵瑰簲鐨勫瓧绗�
- char costType = (char) ('A' + param.getCostType() - 1);
- sqlKuCunWhere.append(" AND goods.COST_TYPE=':costType'");
- paramts.put("costType", costType);
- }
-
-// // 鎿嶄綔鏃堕棿
-// if (param.getDealTimeStart() != null) {
-// sqlEnd.append(" and flow.DEAL_TIME >=:dealTimeStart ");
-// paramts.put("dealTimeStart", param.getDealTimeStart() * 1000000);
-// }
-// if (param.getDealTimeEnd() != null) {
-// sqlEnd.append(" and flow.DEAL_TIME <:dealTimeEnd ");
-// paramts.put("dealTimeEnd", param.getDealTimeEnd() * 1000000 + 240000);
-// }
- sqlEndWhere.append(" ORDER BY tKuCun.total_num desc,tCangKu.tenantId asc");
-
- StringBuilder sql = new StringBuilder();
- sql.append(sqlColumn)
- .append(sqlCangKu)
- .append(sqlCangKuWhere)
- .append(sqlCangKuEnd)
- .append(sqlKuCun)
- .append(sqlKuCunWhere)
- .append(sqlKuCunGoupBy)
-
- .append(sqlEndWhere);
-
- return select(sql.toString(), paramts, new MapperUtil());
- }
-}
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhWarningConfigService.java b/consum-base/src/main/java/com/consum/base/service/LWhWarningConfigService.java
new file mode 100644
index 0000000..c9da22f
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/service/LWhWarningConfigService.java
@@ -0,0 +1,22 @@
+package com.consum.base.service;
+
+import java.util.List;
+import java.util.Map;
+
+import com.consum.base.pojo.query.WhWarningConfigQry;
+import com.walker.db.page.GenericPager;
+import com.walker.jdbc.service.BaseService;
+
+/**
+ * LWhWarningConfigService
+ *
+ * @author asus
+ * @version 2023/12/22 10:35
+ **/
+public interface LWhWarningConfigService extends BaseService {
+ GenericPager<Map<String, Object>> getConfigListWithPage(WhWarningConfigQry param);
+
+ Map<String, Object> getConfigListQueryMap(WhWarningConfigQry param);
+
+ List<Map<String, Object>> queryModelIsExist(Integer warehouseType, Long baseWarehouseId, List<Long> modelIds);
+}
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhWarningService.java b/consum-base/src/main/java/com/consum/base/service/LWhWarningService.java
new file mode 100644
index 0000000..3c6c726
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/service/LWhWarningService.java
@@ -0,0 +1,23 @@
+package com.consum.base.service;
+
+import java.util.List;
+import java.util.Map;
+
+import com.consum.base.pojo.query.WhWarningQry;
+import com.walker.db.page.GenericPager;
+import com.walker.jdbc.service.BaseService;
+
+/**
+ * LWhWarningService
+ *
+ * @author asus
+ * @version 2023/12/22 10:32
+ **/
+public interface LWhWarningService extends BaseService {
+
+ Map<String, Object> getWarningTypeNum(WhWarningQry param);
+
+ GenericPager<Map<String, Object>> getListWithPage(WhWarningQry param);
+
+ List<Map<String, Object>> checkKuCun(Short warehouseType, Long warehouseId, List<Long> baseModelIdList);
+}
diff --git a/consum-base/src/main/java/com/consum/base/service/SDictDataService.java b/consum-base/src/main/java/com/consum/base/service/SDictDataService.java
new file mode 100644
index 0000000..15abe64
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/service/SDictDataService.java
@@ -0,0 +1,15 @@
+package com.consum.base.service;
+
+import com.consum.model.po.SDictData;
+import com.walker.jdbc.service.BaseService;
+import java.util.List;
+
+/**
+ * SDictDataService
+ *
+ * @author asus
+ * @version 2023/12/22 10:48
+ **/
+public interface SDictDataService extends BaseService {
+ List<SDictData> selectByScrappedCodeList(List scrappedCodeList);
+}
diff --git a/consum-base/src/main/java/com/consum/base/core/DepFormScrappedCoreServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/core/DepFormScrappedCoreService.java
similarity index 71%
rename from consum-base/src/main/java/com/consum/base/core/DepFormScrappedCoreServiceImpl.java
rename to consum-base/src/main/java/com/consum/base/service/core/DepFormScrappedCoreService.java
index 192da2b..3baab2b 100644
--- a/consum-base/src/main/java/com/consum/base/core/DepFormScrappedCoreServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/core/DepFormScrappedCoreService.java
@@ -1,9 +1,23 @@
-package com.consum.base.core;
+package com.consum.base.service.core;
-import cn.hutool.core.convert.Convert;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+
+import com.consum.base.core.WhBusinessEnum;
import com.consum.base.core.utils.IdUtil;
import com.consum.base.core.utils.LockManage;
-import com.consum.base.service.GoodsBaseServiceImpl;
+import com.consum.base.service.GoodsBaseService;
import com.consum.base.service.LWarehouseFlowService;
import com.consum.base.service.LWhGoodsRecordService;
import com.consum.base.service.LWhGoodsService;
@@ -14,19 +28,9 @@
import com.iplatform.model.po.S_user_core;
import com.walker.infrastructure.utils.CollectionUtils;
import com.walker.web.ResponseValue;
-import java.util.Arrays;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.interceptor.TransactionAspectSupport;
-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 cn.hutool.core.convert.Convert;
+import lombok.extern.slf4j.Slf4j;
/**
* @ClassName DepFormScrappedCoreServiceImpl
@@ -38,9 +42,9 @@
@Service
@Slf4j
@Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
-public class DepFormScrappedCoreServiceImpl {
+public class DepFormScrappedCoreService {
@Resource
- private GoodsBaseServiceImpl goodsBaseService;
+ private GoodsBaseService goodsBaseService;
@Resource
private LWhGoodsService lWhGoodsService;
@Resource
@@ -48,20 +52,20 @@
@Resource
private LWhGoodsRecordService lWhGoodsRecordServiceImpl;
@Resource
- private LWarehouseFlowService lWarehouseFlowService;
+ private LWarehouseFlowService lWarehouseFlowServiceImpl;
/**
* 鏍规嵁鎶ュ簾鍗曟姤搴燂細淇敼璋冩嫧鍗曚腑鍙��鍥炴暟閲忥紱浠撳簱涓墿鍝佺姸鎬佽缃负鎶ュ簾;鐢熸垚涓�涓繚璐规祦姘达紱鏇存柊鎶ュ簾鍨嬪彿琛ㄤ腑锛岀墿鍝佷环鍊�
* <p>
* 1.鎵惧埌闇�瑕佹姤搴熺殑鍨嬪彿锛� 鎸夊悓涓�涓�
*
- * @param lWhFormScrappedId // * @param isBack 鏄惁閫�鍥�
+ * @param lWhFormScrappedId // * @param isBack 鏄惁閫�鍥�
*/
public ResponseValue updateScrapped(Long lWhFormScrappedId, S_user_core currentUser, Long dealTime) {
// 鏌ヨ鎶ュ簾鍗曠姸鎬�
DepFormScrapped depFormScrapped = new DepFormScrapped(lWhFormScrappedId);
depFormScrapped = goodsBaseService.get(depFormScrapped);
- //鐘舵�� 1=寰呮姤搴燂紱2=宸叉姤搴�
+ // 鐘舵�� 1=寰呮姤搴燂紱2=宸叉姤搴�
if (depFormScrapped == null || depFormScrapped.getStates() != 1) {
return ResponseValue.error("璇锋鏌ユ姤搴熷崟");
}
@@ -70,9 +74,11 @@
String nickName = currentUser.getNick_name();
// 鏍规嵁鎶ュ簾鍗� 鏌ヨ闇�瑕佹姤搴熺殑鍨嬪彿鏁伴噺
- List<Map<String, Object>> bfModelList = goodsBaseService.select("SELECT scrGoods.TRANS_BUSINESS_ID,scrGoods.BUSINESS_FORM_CODE,scrGoods.TRANS_OUT_WAREHOUSE_TYPE,scrGoods.TRANS_OUT_WAREHOUSE_ID,scrGoods.BASE_GOODS_TEMPLATE_ID, scrGoods.BASE_GOODS_TEMPLATE_NAME,goodsModel.id formScrappedModelId,goodsModel.BASE_GOODS_TEMPLATE_ID,goodsModel.BASE_GOODS_MODELS_ID,goodsModel.COUNTS,goodsModel.PROCURE_MODEL_USER_ID,goodsModel.GOODS_USER_NAME,goodsModel.BASE_GOODS_MODELS_NAME FROM DEP_FORM_SCRAPPED_GOODS scrGoods LEFT JOIN DEP_FORM_SCRAPPED_MODEL goodsModel ON scrgoods.id=goodsModel.DEP_FORM_SCRAPPED_GOODS_ID where scrGoods.DEP_FORM_SCRAPPED_ID = ?", new Object[]{lWhFormScrappedId});
- Map<Object, List<Map<String, Object>>> groupByModelIdMap = bfModelList.stream()
- .collect(Collectors.groupingBy(map -> map.get("BASE_GOODS_MODELS_ID")));
+ List<Map<String, Object>> bfModelList = goodsBaseService.select(
+ "SELECT scrGoods.TRANS_BUSINESS_ID,scrGoods.BUSINESS_FORM_CODE,scrGoods.TRANS_OUT_WAREHOUSE_TYPE,scrGoods.TRANS_OUT_WAREHOUSE_ID,scrGoods.BASE_GOODS_TEMPLATE_ID, scrGoods.BASE_GOODS_TEMPLATE_NAME,goodsModel.id formScrappedModelId,goodsModel.BASE_GOODS_TEMPLATE_ID,goodsModel.BASE_GOODS_MODELS_ID,goodsModel.COUNTS,goodsModel.PROCURE_MODEL_USER_ID,goodsModel.GOODS_USER_NAME,goodsModel.BASE_GOODS_MODELS_NAME FROM DEP_FORM_SCRAPPED_GOODS scrGoods LEFT JOIN DEP_FORM_SCRAPPED_MODEL goodsModel ON scrgoods.id=goodsModel.DEP_FORM_SCRAPPED_GOODS_ID where scrGoods.DEP_FORM_SCRAPPED_ID = ?",
+ new Object[] {lWhFormScrappedId});
+ Map<Object, List<Map<String, Object>>> groupByModelIdMap =
+ bfModelList.stream().collect(Collectors.groupingBy(map -> map.get("BASE_GOODS_MODELS_ID")));
Integer warehouseType = depFormScrapped.getOutWarehouseType();
Long warehouseId = depFormScrapped.getOutWarehouseId();
String warehouseName = depFormScrapped.getOutWarehouseName();
@@ -85,15 +91,15 @@
//
ArrayList<LWhGoodsRecord> lWhGoodsRecordList = new ArrayList<>();
- //閲囪喘銆佽皟鎷ㄣ�佸嚭搴撶瓑鐨勭墿鍝佸瀷鍙枫�怢_WH_PROCURE_MODEL銆戜腑 鏍规嵁璋冩嫧鍗�+鍨嬪彿 鏇存柊 鍦ㄧ敤鏁伴噺
+ // 閲囪喘銆佽皟鎷ㄣ�佸嚭搴撶瓑鐨勭墿鍝佸瀷鍙枫�怢_WH_PROCURE_MODEL銆戜腑 鏍规嵁璋冩嫧鍗�+鍨嬪彿 鏇存柊 鍦ㄧ敤鏁伴噺
Map<String, Integer> procureModelMap = new HashMap<>();
for (Object key : groupByModelIdMap.keySet()) {
Long modelTotalPrice = 0L;
- //瑕佹姤搴熺殑鎬绘暟閲�
+ // 瑕佹姤搴熺殑鎬绘暟閲�
int modelTotalNum = 0;
- Long baseGoodsModelsId = (Long) key;
+ Long baseGoodsModelsId = (Long)key;
List<Map<String, Object>> eachFfModelList = groupByModelIdMap.get(key);
Map<String, Object> eachFfModelBase = eachFfModelList.get(0);
Long tempGoodsId = Convert.toLong(eachFfModelBase.get("BASE_GOODS_TEMPLATE_ID"));
@@ -112,18 +118,19 @@
whGoodsRecord.setBaseGoodsModelsId(baseGoodsModelsId);
whGoodsRecord.setBaseGoodsModelsName(modelName);
whGoodsRecord.setDealTime(dealTime);
- //鏈璋冩暣绫诲瀷 1=璋冨锛�2=璋冨噺
+ // 鏈璋冩暣绫诲瀷 1=璋冨锛�2=璋冨噺
whGoodsRecord.setThisType(2);
- //閫氳繃LockManage鑾峰緱閿�
+ // 閫氳繃LockManage鑾峰緱閿�
Object warehouseModelLockObj = LockManage.acquireLock(warehouseType, warehouseId, baseGoodsModelsId);
int goodsModelNum = 0;
synchronized (warehouseModelLockObj) {
List<Long> warehouseIds = new ArrayList<>(Arrays.asList(warehouseId));
- goodsModelNum = lWhGoodsService.queryGoodsModelNum(warehouseType, warehouseIds, baseGoodsModelsId, 2, null);
+ goodsModelNum =
+ lWhGoodsService.queryGoodsModelNum(warehouseType, warehouseIds, baseGoodsModelsId, 2, null);
for (Map<String, Object> depFormScrappedModel : eachFfModelList) {
// 璋冩嫧鍗曚俊鎭�
- Long transBusinessId = (Long) depFormScrappedModel.get("TRANS_BUSINESS_ID");
+ Long transBusinessId = (Long)depFormScrappedModel.get("TRANS_BUSINESS_ID");
String nowUserName = Convert.toStr(depFormScrappedModel.get("GOODS_USER_NAME"));
Integer counts = Convert.toInt(depFormScrappedModel.get("COUNTS"));
Long formScrappedModelId = Convert.toLong(depFormScrappedModel.get("formScrappedModelId"));
@@ -131,7 +138,8 @@
modelTotalNum += counts;
// 鏍规嵁鍒嗗彂鍗曘�佸瀷鍙枫�佷娇鐢ㄤ汉淇℃伅鏌ヨ鐗╁搧淇℃伅
- List<Map<String, Object>> scrappedGoodsList = lWhGoodsService.queryScrappedGoods(warehouseType, warehouseId, transBusinessId, nowUserName, baseGoodsModelsId, (short) 2, counts);
+ List<Map<String, Object>> scrappedGoodsList = lWhGoodsService.queryScrappedGoods(warehouseType,
+ warehouseId, transBusinessId, nowUserName, baseGoodsModelsId, (short)2, counts);
if (CollectionUtils.isEmpty(scrappedGoodsList) || scrappedGoodsList.size() < counts) {
log.error("瑕佹姤搴熺殑鐗╁搧鏁伴噺涓嶈冻锛�");
// 鎵嬪姩鍥炴粴
@@ -139,21 +147,24 @@
throw new RuntimeException("鎶ュ簾澶辫触!鍨嬪彿鏁伴噺涓嶈冻");
}
- Long formScrappedModelPrice = scrappedGoodsList.stream().mapToLong(map -> (long) map.get("price")).sum();
+ Long formScrappedModelPrice =
+ scrappedGoodsList.stream().mapToLong(map -> (long)map.get("price")).sum();
modelTotalPrice += formScrappedModelPrice;
// 鏇存柊 鎶ュ簾鍗曠墿鍝併�怐EP_FORM_SCRAPPED_MODEL銆戜腑 浠锋牸
modelTotalPriceMap.put(formScrappedModelId, formScrappedModelPrice);
- //閲囪喘銆佽皟鎷ㄣ�佸嚭搴撶瓑鐨勭墿鍝佸瀷鍙枫�怢_WH_PROCURE_MODEL銆戜腑 鍦ㄧ敤鏁伴噺
- Integer procureModelNum = Convert.toInt(procureModelMap.get(transBusinessId + "_" + baseGoodsModelsId), 0);
+ // 閲囪喘銆佽皟鎷ㄣ�佸嚭搴撶瓑鐨勭墿鍝佸瀷鍙枫�怢_WH_PROCURE_MODEL銆戜腑 鍦ㄧ敤鏁伴噺
+ Integer procureModelNum =
+ Convert.toInt(procureModelMap.get(transBusinessId + "_" + baseGoodsModelsId), 0);
procureModelMap.put(transBusinessId + "_" + baseGoodsModelsId, counts + procureModelNum);
// 姹囨�诲嚭闇�瑕佷慨鏀圭姸鎬佺殑鐗╁搧id
- List<Long> srappedGoodsIds = scrappedGoodsList.stream().map(map -> (Long) map.get("id")).collect(Collectors.toList());
+ List<Long> srappedGoodsIds =
+ scrappedGoodsList.stream().map(map -> (Long)map.get("id")).collect(Collectors.toList());
// 璁剧疆鐗╁搧涓烘姤搴熺姸鎬�
lWhGoodsService.modGoodsTransfering(srappedGoodsIds, null, null, null, 3);
// 鎵归噺鎻掑叆 杩涘嚭搴撴祦姘存槑缁哰L_WH_GOODS_RECORD_DETAILS]
- lWhGoodsRecordDetailsService.sameGoodsInsertMore(srappedGoodsIds, whGoodsRecordId, (short) 2);
+ lWhGoodsRecordDetailsService.sameGoodsInsertMore(srappedGoodsIds, whGoodsRecordId, (short)2);
}
}
@@ -161,7 +172,7 @@
whGoodsRecord.setEndCount(goodsModelNum - modelTotalNum);
whGoodsRecord.setThisCount(modelTotalNum);
whGoodsRecord.setTotalPrice(modelTotalPrice);
-// lWhGoodsRecordService.insert(whGoodsRecord);
+ // lWhGoodsRecordService.insert(whGoodsRecord);
lWhGoodsRecordList.add(whGoodsRecord);
}
@@ -178,7 +189,7 @@
warehouseFlow.setOperatorName(nickName);
warehouseFlow.setDealTime(dealTime);
// 鎻掑叆娴佹按鎬昏〃
- int flowInsertFlag = lWarehouseFlowService.insert(warehouseFlow);
+ int flowInsertFlag = lWarehouseFlowServiceImpl.insert(warehouseFlow);
if (flowInsertFlag == 0) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return null;
@@ -189,9 +200,9 @@
// 鏇存柊鎶ュ簾鍗�
depFormScrapped = new DepFormScrapped(lWhFormScrappedId);
depFormScrapped.setStates(2);
-// depFormScrapped.setOperatorId(userId);
-// depFormScrapped.setOperatorName(nickName);
-// depFormScrapped.setDealTime(dealTime);
+ // depFormScrapped.setOperatorId(userId);
+ // depFormScrapped.setOperatorName(nickName);
+ // depFormScrapped.setDealTime(dealTime);
goodsBaseService.update(depFormScrapped);
// 鏇存柊 鎶ュ簾鍗曠墿鍝併�怐EP_FORM_SCRAPPED_MODEL銆戜腑浠锋牸鐨刲ist
@@ -206,7 +217,7 @@
}
goodsBaseService.execBatchUpdate("update DEP_FORM_SCRAPPED_MODEL set TOTAL_AMOUNT=? where id=?", parameterList);
- //濡傛灉鏄疉绫荤墿鍝侊紝鍒欐洿鏂� 鍒嗗彂鐗╁搧浣跨敤浜恒�怢_WH_PROCURE_MODEL_USER銆� 涓� 鏍规嵁id 鏇存柊 鍦ㄧ敤鏁伴噺(USE_COUNT)
+ // 濡傛灉鏄疉绫荤墿鍝侊紝鍒欐洿鏂� 鍒嗗彂鐗╁搧浣跨敤浜恒�怢_WH_PROCURE_MODEL_USER銆� 涓� 鏍规嵁id 鏇存柊 鍦ㄧ敤鏁伴噺(USE_COUNT)
List<Object[]> procureModelUserIdList = new ArrayList<>();
for (Map<String, Object> itemMap : bfModelList) {
Long procureModelUserId = Convert.toLong(itemMap.get("PROCURE_MODEL_USER_ID"));
@@ -215,10 +226,11 @@
}
Integer counts = Convert.toInt(itemMap.get("COUNTS"));
-// StringBuilder sb = new StringBuilder("update L_WH_PROCURE_MODEL_USER set USE_COUNT=USE_COUNT-").append(counts);
-// sb.append(" where id=").append(procureModelUserId);
-// sb.append(" and USE_COUNT-").append(counts).append(" >=0");
-// goodsBaseService.update(sb.toString());
+ // StringBuilder sb = new StringBuilder("update L_WH_PROCURE_MODEL_USER set
+ // USE_COUNT=USE_COUNT-").append(counts);
+ // sb.append(" where id=").append(procureModelUserId);
+ // sb.append(" and USE_COUNT-").append(counts).append(" >=0");
+ // goodsBaseService.update(sb.toString());
Object[] one = new Object[3];
one[0] = counts;
@@ -227,11 +239,12 @@
procureModelUserIdList.add(one);
}
if (!CollectionUtils.isEmpty(procureModelUserIdList)) {
- goodsBaseService.execBatchUpdate("update L_WH_PROCURE_MODEL_USER set USE_COUNT=USE_COUNT- ? where id= ? and USE_COUNT- ? >=0", procureModelUserIdList);
+ goodsBaseService.execBatchUpdate(
+ "update L_WH_PROCURE_MODEL_USER set USE_COUNT=USE_COUNT- ? where id= ? and USE_COUNT- ? >=0",
+ procureModelUserIdList);
}
-
- //閲囪喘銆佽皟鎷ㄣ�佸嚭搴撶瓑鐨勭墿鍝佸瀷鍙枫�怢_WH_PROCURE_MODEL銆戜腑 鏍规嵁璋冩嫧鍗�+鍨嬪彿 鏇存柊 鍦ㄧ敤鏁伴噺
+ // 閲囪喘銆佽皟鎷ㄣ�佸嚭搴撶瓑鐨勭墿鍝佸瀷鍙枫�怢_WH_PROCURE_MODEL銆戜腑 鏍规嵁璋冩嫧鍗�+鍨嬪彿 鏇存柊 鍦ㄧ敤鏁伴噺
List<Object[]> procureModelParameterList = new ArrayList<>();
for (Map.Entry<String, Integer> entry : procureModelMap.entrySet()) {
String key = entry.getKey();
@@ -252,9 +265,11 @@
sb.append(modelUseingNum).append(" >=0");
goodsBaseService.update(sb.toString());
}
-// goodsBaseService.execBatchUpdate("update L_WH_PROCURE_MODEL set USE_COUNT=USE_COUNT-? where BUSINESS_TYPE=4 and BUSINESS_ID=? and BASE_GOODS_MODELS_ID=? and USE_COUNT=USE_COUNT-? >0", procureModelParameterList);
- //褰撳簱瀛樺彉鍔ㄦ椂璋冪敤璇ユ柟娉�
- //lWhWarningCoreService.updateKuCun(Convert.toShort(warehouseType,(short) 0), warehouseId, allChangModelList, null, dealTime);
+ // goodsBaseService.execBatchUpdate("update L_WH_PROCURE_MODEL set USE_COUNT=USE_COUNT-? where BUSINESS_TYPE=4
+ // and BUSINESS_ID=? and BASE_GOODS_MODELS_ID=? and USE_COUNT=USE_COUNT-? >0", procureModelParameterList);
+ // 褰撳簱瀛樺彉鍔ㄦ椂璋冪敤璇ユ柟娉�
+ // lWhWarningCoreService.updateKuCun(Convert.toShort(warehouseType,(short) 0), warehouseId, allChangModelList,
+ // null, dealTime);
return null;
}
}
diff --git a/consum-base/src/main/java/com/consum/base/core/DepUsingFormBackCoreServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/core/DepUsingFormBackCoreService.java
similarity index 73%
rename from consum-base/src/main/java/com/consum/base/core/DepUsingFormBackCoreServiceImpl.java
rename to consum-base/src/main/java/com/consum/base/service/core/DepUsingFormBackCoreService.java
index 39cbf33..bd0b89b 100644
--- a/consum-base/src/main/java/com/consum/base/core/DepUsingFormBackCoreServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/core/DepUsingFormBackCoreService.java
@@ -1,10 +1,23 @@
-package com.consum.base.core;
+package com.consum.base.service.core;
-import cn.hutool.core.convert.Convert;
-import com.consum.base.core.service.LWhWarningCoreServiceImpl;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+
+import com.consum.base.core.WhBusinessEnum;
import com.consum.base.core.utils.IdUtil;
import com.consum.base.core.utils.LockManage;
-import com.consum.base.service.GoodsBaseServiceImpl;
+import com.consum.base.service.GoodsBaseService;
import com.consum.base.service.LWarehouseFlowService;
import com.consum.base.service.LWhGoodsRecordService;
import com.consum.base.service.LWhGoodsService;
@@ -16,19 +29,9 @@
import com.iplatform.model.po.S_user_core;
import com.walker.infrastructure.utils.CollectionUtils;
import com.walker.web.ResponseValue;
-import java.util.Arrays;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.interceptor.TransactionAspectSupport;
-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 cn.hutool.core.convert.Convert;
+import lombok.extern.slf4j.Slf4j;
/**
* @ClassName DepFormScrappedCoreServiceImpl
@@ -40,9 +43,9 @@
@Service
@Slf4j
@Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
-public class DepUsingFormBackCoreServiceImpl {
+public class DepUsingFormBackCoreService {
@Resource
- private GoodsBaseServiceImpl goodsBaseService;
+ private GoodsBaseService goodsBaseService;
@Resource
private LWhGoodsService lWhGoodsService;
@Resource
@@ -50,9 +53,9 @@
@Resource
private LWhGoodsRecordService lWhGoodsRecordServiceImpl;
@Resource
- private LWarehouseFlowService lWarehouseFlowService;
+ private LWarehouseFlowService lWarehouseFlowServiceImpl;
@Resource
- private LWhWarningCoreServiceImpl lWhWarningCoreService;
+ private LWhWarningCoreService lWhWarningCoreService;
/**
* 鏍规嵁鎶ュ簾鍗曟姤搴燂細淇敼璋冩嫧鍗曚腑鍙��鍥炴暟閲忥紱浠撳簱涓墿鍝佺姸鎬佽缃负鎶ュ簾;鐢熸垚涓�涓繚璐规祦姘达紱鏇存柊鎶ュ簾鍨嬪彿琛ㄤ腑锛岀墿鍝佷环鍊�
@@ -65,7 +68,7 @@
// 鏌ヨ鎶ュ簾鍗曠姸鎬�
UsingFormBack depFormScrapped = new UsingFormBack(lWhFormBackId);
depFormScrapped = goodsBaseService.get(depFormScrapped);
- //鐘舵�� 1=寰呮姤搴燂紱2=宸叉姤搴�
+ // 鐘舵�� 1=寰呮姤搴燂紱2=宸叉姤搴�
if (depFormScrapped == null || depFormScrapped.getStates() != 1) {
return ResponseValue.error("璇锋鏌ユ姤搴熷崟");
}
@@ -74,9 +77,11 @@
String nickName = currentUser.getNick_name();
// 鏍规嵁鎶ュ簾鍗� 鏌ヨ闇�瑕佹姤搴熺殑鍨嬪彿鏁伴噺
- List<Map<String, Object>> bfModelList = goodsBaseService.select("SELECT scrGoods.TRANS_OUT_WAREHOUSE_TYPE,scrGoods.TRANS_OUT_WAREHOUSE_ID,scrGoods.TRANS_BUSINESS_ID,scrGoods.BUSINESS_FORM_CODE,scrGoods.TRANS_OUT_WAREHOUSE_TYPE,scrGoods.TRANS_OUT_WAREHOUSE_ID,scrGoods.BASE_GOODS_TEMPLATE_ID,scrGoods.BASE_GOODS_TEMPLATE_NAME,goodsModel.id formScrappedModelId,goodsModel.BASE_GOODS_TEMPLATE_ID,goodsModel.BASE_GOODS_MODELS_ID,goodsModel.COUNTS,goodsModel.PROCURE_MODEL_USER_ID,goodsModel.GOODS_USER_NAME,goodsModel.BASE_GOODS_MODELS_NAME FROM USING_FORM_BACK_GOODS scrGoods LEFT JOIN USING_FORM_BACK_MODEL goodsModel ON scrgoods.id=goodsModel.USING_FORM_BACK_GOODS_ID WHERE scrGoods.USING_FORM_BACK_ID=?", new Object[]{lWhFormBackId});
- Map<Object, List<Map<String, Object>>> groupByModelIdMap = bfModelList.stream()
- .collect(Collectors.groupingBy(map -> map.get("BASE_GOODS_MODELS_ID")));
+ List<Map<String, Object>> bfModelList = goodsBaseService.select(
+ "SELECT scrGoods.TRANS_OUT_WAREHOUSE_TYPE,scrGoods.TRANS_OUT_WAREHOUSE_ID,scrGoods.TRANS_BUSINESS_ID,scrGoods.BUSINESS_FORM_CODE,scrGoods.TRANS_OUT_WAREHOUSE_TYPE,scrGoods.TRANS_OUT_WAREHOUSE_ID,scrGoods.BASE_GOODS_TEMPLATE_ID,scrGoods.BASE_GOODS_TEMPLATE_NAME,goodsModel.id formScrappedModelId,goodsModel.BASE_GOODS_TEMPLATE_ID,goodsModel.BASE_GOODS_MODELS_ID,goodsModel.COUNTS,goodsModel.PROCURE_MODEL_USER_ID,goodsModel.GOODS_USER_NAME,goodsModel.BASE_GOODS_MODELS_NAME FROM USING_FORM_BACK_GOODS scrGoods LEFT JOIN USING_FORM_BACK_MODEL goodsModel ON scrgoods.id=goodsModel.USING_FORM_BACK_GOODS_ID WHERE scrGoods.USING_FORM_BACK_ID=?",
+ new Object[] {lWhFormBackId});
+ Map<Object, List<Map<String, Object>>> groupByModelIdMap =
+ bfModelList.stream().collect(Collectors.groupingBy(map -> map.get("BASE_GOODS_MODELS_ID")));
Integer warehouseType = depFormScrapped.getOutWarehouseType();
Long warehouseId = depFormScrapped.getOutWarehouseId();
String warehouseName = depFormScrapped.getOutWarehouseName();
@@ -89,15 +94,15 @@
ArrayList<LWhGoodsRecord> lWhGoodsRecordList = new ArrayList<>();
- //閲囪喘銆佽皟鎷ㄣ�佸嚭搴撶瓑鐨勭墿鍝佸瀷鍙枫�怢_WH_PROCURE_MODEL銆戜腑 鏍规嵁璋冩嫧鍗�+鍨嬪彿 鏇存柊 鍦ㄧ敤鏁伴噺
+ // 閲囪喘銆佽皟鎷ㄣ�佸嚭搴撶瓑鐨勭墿鍝佸瀷鍙枫�怢_WH_PROCURE_MODEL銆戜腑 鏍规嵁璋冩嫧鍗�+鍨嬪彿 鏇存柊 鍦ㄧ敤鏁伴噺
Map<String, Integer> procureModelMap = new HashMap<>();
for (Object key : groupByModelIdMap.keySet()) {
Long modelTotalPrice = 0L;
- //瑕佹姤搴熺殑鎬绘暟閲�
+ // 瑕佹姤搴熺殑鎬绘暟閲�
int modelTotalNum = 0;
- Long baseGoodsModelsId = (Long) key;
+ Long baseGoodsModelsId = (Long)key;
List<Map<String, Object>> eachFfModelList = groupByModelIdMap.get(key);
Map<String, Object> eachFfModelBase = eachFfModelList.get(0);
Long tempGoodsId = Convert.toLong(eachFfModelBase.get("BASE_GOODS_TEMPLATE_ID"));
@@ -116,18 +121,19 @@
whGoodsRecord.setBaseGoodsModelsId(baseGoodsModelsId);
whGoodsRecord.setBaseGoodsModelsName(modelName);
whGoodsRecord.setDealTime(dealTime);
- //鏈璋冩暣绫诲瀷 1=璋冨锛�2=璋冨噺
+ // 鏈璋冩暣绫诲瀷 1=璋冨锛�2=璋冨噺
whGoodsRecord.setThisType(2);
- //閫氳繃LockManage鑾峰緱閿�
+ // 閫氳繃LockManage鑾峰緱閿�
Object warehouseModelLockObj = LockManage.acquireLock(warehouseType, warehouseId, baseGoodsModelsId);
int goodsModelNum = 0;
synchronized (warehouseModelLockObj) {
List<Long> warehouseIds = new ArrayList<>(Arrays.asList(warehouseId));
- goodsModelNum = lWhGoodsService.queryGoodsModelNum(warehouseType, warehouseIds, baseGoodsModelsId, 2, null);
+ goodsModelNum =
+ lWhGoodsService.queryGoodsModelNum(warehouseType, warehouseIds, baseGoodsModelsId, 2, null);
for (Map<String, Object> depFormScrappedModel : eachFfModelList) {
// 璋冩嫧鍗曚俊鎭�
- Long transBusinessId = (Long) depFormScrappedModel.get("TRANS_BUSINESS_ID");
+ Long transBusinessId = (Long)depFormScrappedModel.get("TRANS_BUSINESS_ID");
String nowUserName = Convert.toStr(depFormScrappedModel.get("GOODS_USER_NAME"));
Integer counts = Convert.toInt(depFormScrappedModel.get("COUNTS"));
Long formScrappedModelId = Convert.toLong(depFormScrappedModel.get("formScrappedModelId"));
@@ -135,7 +141,8 @@
modelTotalNum += counts;
// 鏍规嵁鍒嗗彂鍗曘�佸瀷鍙枫�佷娇鐢ㄤ汉淇℃伅鏌ヨ鐗╁搧淇℃伅
- List<Map<String, Object>> scrappedGoodsList = lWhGoodsService.queryScrappedGoods(warehouseType, warehouseId, transBusinessId, nowUserName, baseGoodsModelsId, (short) 2, counts);
+ List<Map<String, Object>> scrappedGoodsList = lWhGoodsService.queryScrappedGoods(warehouseType,
+ warehouseId, transBusinessId, nowUserName, baseGoodsModelsId, (short)2, counts);
if (CollectionUtils.isEmpty(scrappedGoodsList) || scrappedGoodsList.size() < counts) {
log.error("瑕侀��鍥炵殑鐗╁搧鏁伴噺涓嶈冻锛�");
// 鎵嬪姩鍥炴粴
@@ -145,21 +152,24 @@
// 鏀惧叆鐗╁搧ID绛変俊鎭�
depFormScrappedModel.put("scrappedGoodsList", scrappedGoodsList);
- Long formScrappedModelPrice = scrappedGoodsList.stream().mapToLong(map -> (long) map.get("price")).sum();
+ Long formScrappedModelPrice =
+ scrappedGoodsList.stream().mapToLong(map -> (long)map.get("price")).sum();
modelTotalPrice += formScrappedModelPrice;
// 鏇存柊 鎶ュ簾鍗曠墿鍝併�怐EP_FORM_SCRAPPED_MODEL銆戜腑 浠锋牸
modelTotalPriceMap.put(formScrappedModelId, formScrappedModelPrice);
- //閲囪喘銆佽皟鎷ㄣ�佸嚭搴撶瓑鐨勭墿鍝佸瀷鍙枫�怢_WH_PROCURE_MODEL銆戜腑 鍦ㄧ敤鏁伴噺
- Integer procureModelNum = Convert.toInt(procureModelMap.get(transBusinessId + "_" + baseGoodsModelsId), 0);
+ // 閲囪喘銆佽皟鎷ㄣ�佸嚭搴撶瓑鐨勭墿鍝佸瀷鍙枫�怢_WH_PROCURE_MODEL銆戜腑 鍦ㄧ敤鏁伴噺
+ Integer procureModelNum =
+ Convert.toInt(procureModelMap.get(transBusinessId + "_" + baseGoodsModelsId), 0);
procureModelMap.put(transBusinessId + "_" + baseGoodsModelsId, counts + procureModelNum);
// 姹囨�诲嚭闇�瑕佷慨鏀圭姸鎬佺殑鐗╁搧id
- List<Long> srappedGoodsIds = scrappedGoodsList.stream().map(map -> (Long) map.get("id")).collect(Collectors.toList());
+ List<Long> srappedGoodsIds =
+ scrappedGoodsList.stream().map(map -> (Long)map.get("id")).collect(Collectors.toList());
// 璁剧疆鐗╁搧涓烘姤搴熺姸鎬�
-// lWhGoodsService.modGoodsTransfering(srappedGoodsIds, null, null, null, 3);
+ // lWhGoodsService.modGoodsTransfering(srappedGoodsIds, null, null, null, 3);
// 鎵归噺鎻掑叆 杩涘嚭搴撴祦姘存槑缁哰L_WH_GOODS_RECORD_DETAILS]
- lWhGoodsRecordDetailsService.sameGoodsInsertMore(srappedGoodsIds, whGoodsRecordId, (short) 2);
+ lWhGoodsRecordDetailsService.sameGoodsInsertMore(srappedGoodsIds, whGoodsRecordId, (short)2);
}
}
@@ -167,7 +177,7 @@
whGoodsRecord.setEndCount(goodsModelNum - modelTotalNum);
whGoodsRecord.setThisCount(modelTotalNum);
whGoodsRecord.setTotalPrice(modelTotalPrice);
-// lWhGoodsRecordService.insert(whGoodsRecord);
+ // lWhGoodsRecordService.insert(whGoodsRecord);
lWhGoodsRecordList.add(whGoodsRecord);
}
@@ -184,7 +194,7 @@
warehouseFlow.setOperatorName(nickName);
warehouseFlow.setDealTime(dealTime);
// 鎻掑叆娴佹按鎬昏〃
- int flowInsertFlag = lWarehouseFlowService.insert(warehouseFlow);
+ int flowInsertFlag = lWarehouseFlowServiceImpl.insert(warehouseFlow);
if (flowInsertFlag == 0) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return null;
@@ -209,19 +219,20 @@
}
goodsBaseService.execBatchUpdate("update DEP_FORM_SCRAPPED_MODEL set TOTAL_AMOUNT=? where id=?", parameterList);
- //濡傛灉鏄疉绫荤墿鍝侊紝鍒欐洿鏂� 鍒嗗彂鐗╁搧浣跨敤浜恒�怢_WH_PROCURE_MODEL_USER銆� 涓� 鏍规嵁id 鏇存柊 鍦ㄧ敤鏁伴噺(USE_COUNT)
+ // 濡傛灉鏄疉绫荤墿鍝侊紝鍒欐洿鏂� 鍒嗗彂鐗╁搧浣跨敤浜恒�怢_WH_PROCURE_MODEL_USER銆� 涓� 鏍规嵁id 鏇存柊 鍦ㄧ敤鏁伴噺(USE_COUNT)
List<Object[]> procureModelUserIdList = new ArrayList<>();
for (Map<String, Object> itemMap : bfModelList) {
Long procureModelUserId = Convert.toLong(itemMap.get("PROCURE_MODEL_USER_ID"));
- if (procureModelUserId==null){
+ if (procureModelUserId == null) {
continue;
}
Integer counts = Convert.toInt(itemMap.get("COUNTS"));
-// StringBuilder sb = new StringBuilder("update L_WH_PROCURE_MODEL_USER set USE_COUNT=USE_COUNT-").append(counts);
-// sb.append(" where id=").append(procureModelUserId);
-// sb.append(" and USE_COUNT-").append(counts).append(" >=0");
-// goodsBaseService.update(sb.toString());
+ // StringBuilder sb = new StringBuilder("update L_WH_PROCURE_MODEL_USER set
+ // USE_COUNT=USE_COUNT-").append(counts);
+ // sb.append(" where id=").append(procureModelUserId);
+ // sb.append(" and USE_COUNT-").append(counts).append(" >=0");
+ // goodsBaseService.update(sb.toString());
Object[] one = new Object[3];
one[0] = counts;
@@ -230,11 +241,12 @@
procureModelUserIdList.add(one);
}
if (!CollectionUtils.isEmpty(procureModelUserIdList)) {
- goodsBaseService.execBatchUpdate("update L_WH_PROCURE_MODEL_USER set USE_COUNT=USE_COUNT- ? where id= ? and USE_COUNT- ? >=0", procureModelUserIdList);
+ goodsBaseService.execBatchUpdate(
+ "update L_WH_PROCURE_MODEL_USER set USE_COUNT=USE_COUNT- ? where id= ? and USE_COUNT- ? >=0",
+ procureModelUserIdList);
}
-
- //閲囪喘銆佽皟鎷ㄣ�佸嚭搴撶瓑鐨勭墿鍝佸瀷鍙枫�怢_WH_PROCURE_MODEL銆戜腑 鏍规嵁璋冩嫧鍗�+鍨嬪彿 鏇存柊 鍦ㄧ敤鏁伴噺
+ // 閲囪喘銆佽皟鎷ㄣ�佸嚭搴撶瓑鐨勭墿鍝佸瀷鍙枫�怢_WH_PROCURE_MODEL銆戜腑 鏍规嵁璋冩嫧鍗�+鍨嬪彿 鏇存柊 鍦ㄧ敤鏁伴噺
List<Object[]> procureModelParameterList = new ArrayList<>();
for (Map.Entry<String, Integer> entry : procureModelMap.entrySet()) {
String key = entry.getKey();
@@ -255,13 +267,13 @@
sb.append(modelUseingNum).append(" >=0");
goodsBaseService.update(sb.toString());
}
-// goodsBaseService.execBatchUpdate("update L_WH_PROCURE_MODEL set USE_COUNT=USE_COUNT-? where BUSINESS_TYPE=4 and BUSINESS_ID=? and BASE_GOODS_MODELS_ID=? and USE_COUNT=USE_COUNT-? >0", parameterList);
-
+ // goodsBaseService.execBatchUpdate("update L_WH_PROCURE_MODEL set USE_COUNT=USE_COUNT-? where BUSINESS_TYPE=4
+ // and BUSINESS_ID=? and BASE_GOODS_MODELS_ID=? and USE_COUNT=USE_COUNT-? >0", parameterList);
// 鎿嶄綔鍏ュ簱锛屾鏃惰鎸夌墿鍝佹墍灞炰粨搴� 鐢熸垚涓嶅悓浠撳簱鍏ュ簱鐨勬祦姘�
- Map<String, List<Map<String, Object>>> groupByOutWarehouseIdMap = bfModelList.stream()
- .collect(Collectors.groupingBy(map -> map.get("TRANS_OUT_WAREHOUSE_TYPE") + "_" + map.get("TRANS_OUT_WAREHOUSE_ID")));
- //姣忎釜浠撳簱涓�涓祦姘磋〃
+ Map<String, List<Map<String, Object>>> groupByOutWarehouseIdMap = bfModelList.stream().collect(Collectors
+ .groupingBy(map -> map.get("TRANS_OUT_WAREHOUSE_TYPE") + "_" + map.get("TRANS_OUT_WAREHOUSE_ID")));
+ // 姣忎釜浠撳簱涓�涓祦姘磋〃
ArrayList<LWarehouseFlow> flowArrayList = new ArrayList<>();
ArrayList<LWhGoodsRecord> flowRecordArrayList = new ArrayList<>();
@@ -269,7 +281,7 @@
List<Map<String, Object>> eachWareHouseList = groupByOutWarehouseIdMap.get(outWarehouseTypeAndId);
Map<String, Object> eachWarehouseModelMap = eachWareHouseList.get(0);
-// Integer inWareHouseType = Convert.toInt(eachWarehouseModelMap.get("TRANS_OUT_WAREHOUSE_TYPE"));
+ // Integer inWareHouseType = Convert.toInt(eachWarehouseModelMap.get("TRANS_OUT_WAREHOUSE_TYPE"));
Long inWarehouseId = Convert.toLong(eachWarehouseModelMap.get("TRANS_OUT_WAREHOUSE_ID"));
String inWarehouseName = null;
BaseWarehouse baseWarehouse = goodsBaseService.get(new BaseWarehouse(inWarehouseId));
@@ -293,11 +305,11 @@
inWarehouseFlow.setDealTime(dealTime);
flowArrayList.add(inWarehouseFlow);
- //鎸夊瀷鍙峰垎 姣忎釜鍨嬪彿涓�涓� L_WH_GOODS_RECORD
- Map<Object, List<Map<String, Object>>> eachWareHouseModelMap = eachWareHouseList.stream()
- .collect(Collectors.groupingBy(map -> map.get("BASE_GOODS_MODELS_ID")));
+ // 鎸夊瀷鍙峰垎 姣忎釜鍨嬪彿涓�涓� L_WH_GOODS_RECORD
+ Map<Object, List<Map<String, Object>>> eachWareHouseModelMap =
+ eachWareHouseList.stream().collect(Collectors.groupingBy(map -> map.get("BASE_GOODS_MODELS_ID")));
for (Object key : eachWareHouseModelMap.keySet()) {
- Long baseGoodsModelsId = (Long) key;
+ Long baseGoodsModelsId = (Long)key;
List<Map<String, Object>> eachFfModelList = eachWareHouseModelMap.get(baseGoodsModelsId);
Map<String, Object> eachFfModelBase = eachFfModelList.get(0);
@@ -317,50 +329,51 @@
whGoodsRecord.setBaseGoodsModelsId(baseGoodsModelsId);
whGoodsRecord.setBaseGoodsModelsName(modelName);
whGoodsRecord.setDealTime(dealTime);
- //鏈璋冩暣绫诲瀷 1=璋冨锛�2=璋冨噺
+ // 鏈璋冩暣绫诲瀷 1=璋冨锛�2=璋冨噺
whGoodsRecord.setThisType(1);
- //閫氳繃LockManage鑾峰緱閿�
+ // 閫氳繃LockManage鑾峰緱閿�
Object warehouseModelLockObj = LockManage.acquireLock(0, inWarehouseId, baseGoodsModelsId);
int goodsModelNum = 0;
// 瀛樻斁鎵�鏈夌殑鐗╁搧id 浠锋牸绛変俊鎭�
List<Map<String, Object>> scrappedAllGoodsList = new ArrayList<>();
synchronized (warehouseModelLockObj) {
- //鏌ヨ鏈熷垵鏁伴噺
+ // 鏌ヨ鏈熷垵鏁伴噺
List<Long> warehouseIds = new ArrayList<>(Arrays.asList(inWarehouseId));
goodsModelNum = lWhGoodsService.queryGoodsModelNum(0, warehouseIds, baseGoodsModelsId, 1, null);
for (Map<String, Object> depFormScrappedModel : eachFfModelList) {
- scrappedAllGoodsList.addAll((List<Map<String, Object>>) depFormScrappedModel.get("scrappedGoodsList"));
+ scrappedAllGoodsList
+ .addAll((List<Map<String, Object>>)depFormScrappedModel.get("scrappedGoodsList"));
}
// 姹囨�诲嚭闇�瑕佷慨鏀圭姸鎬佺殑鐗╁搧id
- List<Long> srappedGoodsIds = scrappedAllGoodsList.stream().map(map -> (Long) map.get("id")).collect(Collectors.toList());
+ List<Long> srappedGoodsIds =
+ scrappedAllGoodsList.stream().map(map -> (Long)map.get("id")).collect(Collectors.toList());
// 璁剧疆鐗╁搧涓哄叆搴撴湭鍒嗗彂锛� 骞惰缃墍灞炰粨搴�
lWhGoodsService.modGoodsTransfering(srappedGoodsIds, 0, inWarehouseId, warehouseName, 1);
// 浣跨敤浜轰俊鎭�
// 鎵归噺鎻掑叆 杩涘嚭搴撴祦姘存槑缁哰L_WH_GOODS_RECORD_DETAILS]
- lWhGoodsRecordDetailsService.sameGoodsInsertMore(srappedGoodsIds, whGoodsRecordId, (short) 1);
+ lWhGoodsRecordDetailsService.sameGoodsInsertMore(srappedGoodsIds, whGoodsRecordId, (short)1);
}
// 涓婃柟鐗╁搧鐨勪环鏍�
- Long formScrappedModelPrice = scrappedAllGoodsList.stream().mapToLong(map -> (long) map.get("price")).sum();
+ Long formScrappedModelPrice =
+ scrappedAllGoodsList.stream().mapToLong(map -> (long)map.get("price")).sum();
whGoodsRecord.setInitialCount(goodsModelNum);
whGoodsRecord.setEndCount(goodsModelNum + scrappedAllGoodsList.size());
whGoodsRecord.setThisCount(scrappedAllGoodsList.size());
whGoodsRecord.setTotalPrice(formScrappedModelPrice);
- //lWhGoodsRecordService.insert(whGoodsRecord);
+ // lWhGoodsRecordService.insert(whGoodsRecord);
flowRecordArrayList.add(whGoodsRecord);
}
// 鎻愬彇baseGoodsModelsId骞舵斁鍏ユ柊鐨凩ist涓�
List<Long> allChangModelList = eachWareHouseList.stream()
- .map(map -> Convert.toLong(map.get("BASE_GOODS_MODELS_ID")))
- .distinct()
- .collect(Collectors.toList());
- //褰撳簱瀛樺彉鍔ㄦ椂璋冪敤璇ユ柟娉�
- lWhWarningCoreService.updateKuCun((short) 0, inWarehouseId, allChangModelList, null, dealTime);
+ .map(map -> Convert.toLong(map.get("BASE_GOODS_MODELS_ID"))).distinct().collect(Collectors.toList());
+ // 褰撳簱瀛樺彉鍔ㄦ椂璋冪敤璇ユ柟娉�
+ lWhWarningCoreService.updateKuCun((short)0, inWarehouseId, allChangModelList, null, dealTime);
}
// 鎻掑叆娴佹按鎬昏〃
- flowInsertFlag = lWarehouseFlowService.insertBatch(flowArrayList);
+ flowInsertFlag = lWarehouseFlowServiceImpl.insertBatch(flowArrayList);
if (flowInsertFlag == 0) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return null;
diff --git a/consum-base/src/main/java/com/consum/base/service/LWarehouseFlowCoreService.java b/consum-base/src/main/java/com/consum/base/service/core/LWarehouseFlowCoreService.java
similarity index 97%
rename from consum-base/src/main/java/com/consum/base/service/LWarehouseFlowCoreService.java
rename to consum-base/src/main/java/com/consum/base/service/core/LWarehouseFlowCoreService.java
index f0777aa..5e424f7 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWarehouseFlowCoreService.java
+++ b/consum-base/src/main/java/com/consum/base/service/core/LWarehouseFlowCoreService.java
@@ -1,4 +1,4 @@
-package com.consum.base.service;
+package com.consum.base.service.core;
import java.util.ArrayList;
import java.util.Arrays;
@@ -20,6 +20,10 @@
import com.consum.base.core.utils.IdUtil;
import com.consum.base.core.utils.LockManage;
+import com.consum.base.service.BaseGoodsTemplateService;
+import com.consum.base.service.LWarehouseFlowService;
+import com.consum.base.service.LWhGoodsRecordService;
+import com.consum.base.service.LWhGoodsService;
import com.consum.model.po.BaseWarehouse;
import com.consum.model.po.LWarehouseFlow;
import com.consum.model.po.LWhFormProcure;
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryCoreService.java b/consum-base/src/main/java/com/consum/base/service/core/LWhFormInventoryCoreService.java
similarity index 99%
rename from consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryCoreService.java
rename to consum-base/src/main/java/com/consum/base/service/core/LWhFormInventoryCoreService.java
index 0088cce..3de826b 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryCoreService.java
+++ b/consum-base/src/main/java/com/consum/base/service/core/LWhFormInventoryCoreService.java
@@ -1,4 +1,4 @@
-package com.consum.base.service.impl;
+package com.consum.base.service.core;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormOutputCoreService.java b/consum-base/src/main/java/com/consum/base/service/core/LWhFormOutputCoreService.java
similarity index 96%
rename from consum-base/src/main/java/com/consum/base/service/impl/LWhFormOutputCoreService.java
rename to consum-base/src/main/java/com/consum/base/service/core/LWhFormOutputCoreService.java
index 7f53a70..946d68d 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormOutputCoreService.java
+++ b/consum-base/src/main/java/com/consum/base/service/core/LWhFormOutputCoreService.java
@@ -1,4 +1,4 @@
-package com.consum.base.service.impl;
+package com.consum.base.service.core;
import java.util.ArrayList;
import java.util.Arrays;
@@ -14,7 +14,6 @@
import com.consum.base.core.CodeGeneratorEnum;
import com.consum.base.core.CodeGeneratorService;
import com.consum.base.core.WhBusinessEnum;
-import com.consum.base.core.service.LWhWarningCoreServiceImpl;
import com.consum.base.core.type.InAndOutPutType;
import com.consum.base.core.type.OutPutStatesType;
import com.consum.base.core.utils.IdUtil;
@@ -25,6 +24,7 @@
import com.consum.base.service.LWhGoodsRecordService;
import com.consum.base.service.LWhGoodsService;
import com.consum.base.service.LWhProcureModelService;
+import com.consum.base.service.impl.LWhGoodsRecordDetailsService;
import com.consum.model.po.LWarehouseFlow;
import com.consum.model.po.LWhFormOutput;
import com.consum.model.po.LWhFormTransfer;
@@ -53,23 +53,23 @@
private CodeGeneratorService codeGeneratorService;
private LWhProcureModelService lWhProcureModelService;
private LWhFormOutputService lWhFormOutputService;
- private LWhWarningCoreServiceImpl lWhWarningCoreService;
- private LWarehouseFlowService lWarehouseFlowService;
+ private LWhWarningCoreService lWhWarningCoreService;
+ private LWarehouseFlowService lWarehouseFlowServiceImpl;
private LWhGoodsRecordDetailsService lWhGoodsRecordDetailsService;
private LWhGoodsRecordService lWhGoodsRecordServiceImpl;
@Autowired
public LWhFormOutputCoreService(BaseGoodsTemplateService baseGoodsTemplateService, LWhGoodsService lWhGoodsService,
CodeGeneratorService codeGeneratorService, LWhProcureModelService lWhProcureModelService,
- LWhFormOutputService lWhFormOutputService, LWarehouseFlowService lWarehouseFlowService,
+ LWhFormOutputService lWhFormOutputService, LWarehouseFlowService lWarehouseFlowServiceImpl,
LWhGoodsRecordDetailsService lWhGoodsRecordDetailsService, LWhGoodsRecordService lWhGoodsRecordServiceImpl,
- LWhWarningCoreServiceImpl lWhWarningCoreService) {
+ LWhWarningCoreService lWhWarningCoreService) {
this.baseGoodsTemplateService = baseGoodsTemplateService;
this.lWhGoodsService = lWhGoodsService;
this.codeGeneratorService = codeGeneratorService;
this.lWhProcureModelService = lWhProcureModelService;
this.lWhFormOutputService = lWhFormOutputService;
- this.lWarehouseFlowService = lWarehouseFlowService;
+ this.lWarehouseFlowServiceImpl = lWarehouseFlowServiceImpl;
this.lWhGoodsRecordDetailsService = lWhGoodsRecordDetailsService;
this.lWhGoodsRecordServiceImpl = lWhGoodsRecordServiceImpl;
this.lWhWarningCoreService = lWhWarningCoreService;
@@ -292,7 +292,7 @@
warehouseFlow.setOperatorName(nickName);
warehouseFlow.setDealTime(dealTime);
// 鎻掑叆娴佹按鎬昏〃
- int flowInsertFlag = lWarehouseFlowService.insert(warehouseFlow);
+ int flowInsertFlag = lWarehouseFlowServiceImpl.insert(warehouseFlow);
if (flowInsertFlag == 0) {
return null;
}
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormProcureCoreService.java b/consum-base/src/main/java/com/consum/base/service/core/LWhFormProcureCoreService.java
similarity index 94%
rename from consum-base/src/main/java/com/consum/base/service/impl/LWhFormProcureCoreService.java
rename to consum-base/src/main/java/com/consum/base/service/core/LWhFormProcureCoreService.java
index a362760..5a2c9d5 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormProcureCoreService.java
+++ b/consum-base/src/main/java/com/consum/base/service/core/LWhFormProcureCoreService.java
@@ -1,6 +1,5 @@
-package com.consum.base.service.impl;
+package com.consum.base.service.core;
-import com.consum.base.service.LWarehouseFlowCoreService;
import com.consum.base.service.LWhFormProcureService;
import com.consum.base.service.LWhProcureModelService;
import java.util.List;
@@ -13,7 +12,6 @@
import org.springframework.transaction.annotation.Transactional;
import com.consum.base.core.WhBusinessEnum;
-import com.consum.base.core.service.LWhWarningCoreServiceImpl;
import com.consum.model.po.LWarehouseFlow;
import com.consum.model.po.LWhFormProcure;
import com.consum.model.po.LWhProcureModel;
@@ -40,7 +38,7 @@
private LWhFormProcureService lWhFormProcureServiceImpl;
@Resource
- private LWhWarningCoreServiceImpl lWhWarningCoreService;
+ private LWhWarningCoreService lWhWarningCoreService;
@Resource
private LWarehouseFlowCoreService lWarehouseFlowService;
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormScrappedCoreService.java b/consum-base/src/main/java/com/consum/base/service/core/LWhFormScrappedCoreService.java
similarity index 93%
rename from consum-base/src/main/java/com/consum/base/service/impl/LWhFormScrappedCoreService.java
rename to consum-base/src/main/java/com/consum/base/service/core/LWhFormScrappedCoreService.java
index c652171..9b91dca 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormScrappedCoreService.java
+++ b/consum-base/src/main/java/com/consum/base/service/core/LWhFormScrappedCoreService.java
@@ -1,4 +1,4 @@
-package com.consum.base.service.impl;
+package com.consum.base.service.core;
import java.util.ArrayList;
import java.util.Arrays;
@@ -13,15 +13,15 @@
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import com.consum.base.core.WhBusinessEnum;
-import com.consum.base.core.service.LWhWarningCoreServiceImpl;
import com.consum.base.core.utils.IdUtil;
import com.consum.base.core.utils.LockManage;
import com.consum.base.service.BaseGoodsTemplateService;
-import com.consum.base.service.GoodsBaseServiceImpl;
+import com.consum.base.service.GoodsBaseService;
import com.consum.base.service.LWarehouseFlowService;
import com.consum.base.service.LWhFormScrappedGoodsService;
import com.consum.base.service.LWhGoodsRecordService;
import com.consum.base.service.LWhGoodsService;
+import com.consum.base.service.impl.LWhGoodsRecordDetailsService;
import com.consum.model.po.LWarehouseFlow;
import com.consum.model.po.LWhFormScrapped;
import com.consum.model.po.LWhFormScrappedGoods;
@@ -43,28 +43,27 @@
@Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
public class LWhFormScrappedCoreService {
- private GoodsBaseServiceImpl goodsBaseService;
+ private GoodsBaseService goodsBaseService;
private LWhFormScrappedGoodsService lWhFormScrappedGoodsService;
private BaseGoodsTemplateService baseGoodsTemplateService;
private LWhGoodsService lWhGoodsService;
private LWhGoodsRecordDetailsService lWhGoodsRecordDetailsService;
private LWhGoodsRecordService lWhGoodsRecordServiceImpl;
- private LWarehouseFlowService lWarehouseFlowService;
- private LWhWarningCoreServiceImpl lWhWarningCoreService;
+ private LWarehouseFlowService lWarehouseFlowServiceImpl;
+ private LWhWarningCoreService lWhWarningCoreService;
@Autowired
- public LWhFormScrappedCoreService(GoodsBaseServiceImpl goodsBaseService,
+ public LWhFormScrappedCoreService(GoodsBaseService goodsBaseService,
LWhFormScrappedGoodsService lWhFormScrappedGoodsService, BaseGoodsTemplateService baseGoodsTemplateService,
LWhGoodsService lWhGoodsService, LWhGoodsRecordDetailsService lWhGoodsRecordDetailsService,
- LWhGoodsRecordService lWhGoodsRecordServiceImpl, LWarehouseFlowService lWarehouseFlowService,
- LWhWarningCoreServiceImpl lWhWarningCoreService) {
- // this.lWhFormScrappedService = lWhFormScrappedService;
+ LWhGoodsRecordService lWhGoodsRecordServiceImpl, LWarehouseFlowService lWarehouseFlowServiceImpl,
+ LWhWarningCoreService lWhWarningCoreService) {
this.lWhFormScrappedGoodsService = lWhFormScrappedGoodsService;
this.baseGoodsTemplateService = baseGoodsTemplateService;
this.lWhGoodsService = lWhGoodsService;
this.lWhGoodsRecordDetailsService = lWhGoodsRecordDetailsService;
this.lWhGoodsRecordServiceImpl = lWhGoodsRecordServiceImpl;
- this.lWarehouseFlowService = lWarehouseFlowService;
+ this.lWarehouseFlowServiceImpl = lWarehouseFlowServiceImpl;
this.goodsBaseService = goodsBaseService;
this.lWhWarningCoreService = lWhWarningCoreService;
}
@@ -211,7 +210,7 @@
warehouseFlow.setOperatorName(nickName);
warehouseFlow.setDealTime(dealTime);
// 鎻掑叆娴佹按鎬昏〃
- int flowInsertFlag = lWarehouseFlowService.insert(warehouseFlow);
+ int flowInsertFlag = lWarehouseFlowServiceImpl.insert(warehouseFlow);
if (flowInsertFlag == 0) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return null;
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferCoreService.java b/consum-base/src/main/java/com/consum/base/service/core/LWhFormTransferCoreService.java
similarity index 97%
rename from consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferCoreService.java
rename to consum-base/src/main/java/com/consum/base/service/core/LWhFormTransferCoreService.java
index 359084a..b2b55fc 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferCoreService.java
+++ b/consum-base/src/main/java/com/consum/base/service/core/LWhFormTransferCoreService.java
@@ -1,4 +1,4 @@
-package com.consum.base.service.impl;
+package com.consum.base.service.core;
import java.util.ArrayList;
import java.util.Arrays;
@@ -15,12 +15,11 @@
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import com.consum.base.core.WhBusinessEnum;
-import com.consum.base.core.service.LWhWarningCoreServiceImpl;
import com.consum.base.core.type.TransferStatesType;
import com.consum.base.core.utils.IdUtil;
import com.consum.base.core.utils.LockManage;
import com.consum.base.service.BaseGoodsTemplateService;
-import com.consum.base.service.GoodsBaseServiceImpl;
+import com.consum.base.service.GoodsBaseService;
import com.consum.base.service.LGoodsUserRecordServiceImpl;
import com.consum.base.service.LGoodsWhRecordServiceImpl;
import com.consum.base.service.LWarehouseFlowService;
@@ -28,6 +27,7 @@
import com.consum.base.service.LWhGoodsRecordService;
import com.consum.base.service.LWhGoodsService;
import com.consum.base.service.LWhProcureModelService;
+import com.consum.base.service.impl.LWhGoodsRecordDetailsService;
import com.consum.model.po.LGoodsUserRecord;
import com.consum.model.po.LWarehouseFlow;
import com.consum.model.po.LWhFormTransfer;
@@ -65,7 +65,7 @@
@Resource
private LWhFormOutputCoreService lWhFormOutputCoreService;
@Resource
- private GoodsBaseServiceImpl goodsBaseService;
+ private GoodsBaseService goodsBaseService;
@Resource
private LWhGoodsRecordService lWhGoodsRecordServiceImpl;
@Resource
@@ -73,13 +73,13 @@
@Resource
private LGoodsWhRecordServiceImpl lGoodsWhRecordService;
@Resource
- private LWarehouseFlowService lWarehouseFlowService;
+ private LWarehouseFlowService lWarehouseFlowServiceImpl;
@Resource
private LWhGoodsRecordDetailsService lWhGoodsRecordDetailsService;
@Resource
private LGoodsUserRecordServiceImpl lGoodsUserRecordService;
@Resource
- private LWhWarningCoreServiceImpl lWhWarningCoreService;
+ private LWhWarningCoreService lWhWarningCoreService;
/**
* 鎵ц璋冩嫧鍑哄簱鎿嶄綔
@@ -272,7 +272,7 @@
warehouseFlow.setOperatorName(nickName);
warehouseFlow.setDealTime(dealTime);
// 鎻掑叆娴佹按鎬昏〃
- int flowInsertFlag = lWarehouseFlowService.insert(warehouseFlow);
+ int flowInsertFlag = lWarehouseFlowServiceImpl.insert(warehouseFlow);
if (flowInsertFlag == 0) {
return null;
}
@@ -356,7 +356,7 @@
inwarehouseFlow.setOperatorId(userId);
inwarehouseFlow.setOperatorName(nickName);
inwarehouseFlow.setDealTime(dealTime);
- lWarehouseFlowService.insert(inwarehouseFlow);
+ lWarehouseFlowServiceImpl.insert(inwarehouseFlow);
ArrayList<Long> allChangModelList = new ArrayList<>();
LWhGoodsRecord lWhGoodsRecord = new LWhGoodsRecord();
diff --git a/consum-base/src/main/java/com/consum/base/core/service/LWhWarningCoreServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/core/LWhWarningCoreService.java
similarity index 95%
rename from consum-base/src/main/java/com/consum/base/core/service/LWhWarningCoreServiceImpl.java
rename to consum-base/src/main/java/com/consum/base/service/core/LWhWarningCoreService.java
index c7e6333..a840caa 100644
--- a/consum-base/src/main/java/com/consum/base/core/service/LWhWarningCoreServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/core/LWhWarningCoreService.java
@@ -1,4 +1,4 @@
-package com.consum.base.core.service;
+package com.consum.base.service.core;
import java.util.ArrayList;
import java.util.List;
@@ -15,7 +15,7 @@
import com.consum.base.core.utils.IdUtil;
import com.consum.base.service.BaseGoodsModelsService;
import com.consum.base.service.BaseWarehouseService;
-import com.consum.base.service.LWhWarningServiceImpl;
+import com.consum.base.service.LWhWarningService;
import com.consum.model.po.BaseWarehouse;
import com.consum.model.po.FinSysTenantUser;
import com.consum.model.po.WhWarning;
@@ -31,10 +31,10 @@
**/
@Service
@Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
-public class LWhWarningCoreServiceImpl {
+public class LWhWarningCoreService {
@Resource
- private LWhWarningServiceImpl lWhWarningService;
+ private LWhWarningService lWhWarningService;
@Resource
private BaseWarehouseService baseWarehouseService;
@Resource
@@ -56,7 +56,6 @@
// 鑾峰彇鍒拌揪鍒伴槇鍊肩殑鐗╁搧
List<Map<String, Object>> kuCunNotifyList =
lWhWarningService.checkKuCun(warehouseType, warehouseId, baseModelIdList);
- // log.info("娌℃湁杈惧埌闃堝�肩殑鐗╁搧");
if (CollectionUtils.isEmpty(kuCunNotifyList)) {
kuCunNormalModel(warehouseType, warehouseId, baseModelIdList);
return;
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/BaseWarehouseServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/BaseWarehouseServiceImpl.java
index dc2fe69..4eff7a9 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/BaseWarehouseServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/BaseWarehouseServiceImpl.java
@@ -14,7 +14,7 @@
import com.consum.base.pojo.BaseWarehouseParam;
import com.consum.base.service.BaseWarehouseService;
import com.consum.base.service.FinSysTenantService;
-import com.consum.base.service.SDictDataServiceImpl;
+import com.consum.base.service.SDictDataService;
import com.consum.model.po.BaseWarehouse;
import com.consum.model.po.FinSysTenant;
import com.consum.model.po.FinSysTenantUser;
@@ -37,7 +37,7 @@
@Autowired
private FinSysTenantService finSysTenantService;
@Autowired
- private SDictDataServiceImpl sDictDataService;
+ private SDictDataService sDictDataService;
/**
* @Description 鏂板
diff --git a/consum-base/src/main/java/com/consum/base/service/DepFormScrappedServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/DepFormScrappedServiceImpl.java
similarity index 76%
rename from consum-base/src/main/java/com/consum/base/service/DepFormScrappedServiceImpl.java
rename to consum-base/src/main/java/com/consum/base/service/impl/DepFormScrappedServiceImpl.java
index 4b178c1..3c8c399 100644
--- a/consum-base/src/main/java/com/consum/base/service/DepFormScrappedServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/DepFormScrappedServiceImpl.java
@@ -1,9 +1,19 @@
-package com.consum.base.service;
+package com.consum.base.service.impl;
-import cn.hutool.core.convert.Convert;
+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;
+
import com.consum.base.core.CodeGeneratorEnum;
import com.consum.base.core.CodeGeneratorService;
-import com.consum.base.core.DepFormScrappedCoreServiceImpl;
import com.consum.base.core.utils.IdUtil;
import com.consum.base.core.utils.MapperUtil;
import com.consum.base.pojo.DepFormScrappedGoodsParam;
@@ -11,7 +21,21 @@
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.*;
+import com.consum.base.service.BaseCategoryService;
+import com.consum.base.service.BaseGoodsModelsService;
+import com.consum.base.service.DepFormScrappedService;
+import com.consum.base.service.FinSysTenantDepartmentService;
+import com.consum.base.service.LWhFormTransferService;
+import com.consum.base.service.SDictDataService;
+import com.consum.base.service.core.DepFormScrappedCoreService;
+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.fasterxml.jackson.databind.ObjectMapper;
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
@@ -19,17 +43,8 @@
import com.walker.infrastructure.utils.DateUtils;
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 cn.hutool.core.convert.Convert;
/**
* @ClassName DepFormScrappedServiceImpl
@@ -39,7 +54,7 @@
* @Version 1.0
**/
@Service
-public class DepFormScrappedServiceImpl extends BaseServiceImpl {
+public class DepFormScrappedServiceImpl extends BaseServiceImpl implements DepFormScrappedService {
@Resource
private CodeGeneratorService codeGeneratorService;
@@ -50,20 +65,21 @@
@Resource
private BaseCategoryService baseCategoryService;
@Resource
- private SDictDataServiceImpl sDictDataService;
+ private SDictDataService sDictDataService;
@Resource
private BaseGoodsModelsService baseGoodsModelsService;
@Resource
- private DepFormScrappedCoreServiceImpl depFormScrappedCoreService;
+ private DepFormScrappedCoreService depFormScrappedCoreService;
@Transactional
- public ResponseValue add(LDeptFormScrappedParam param, S_user_core currentUser, FinSysTenantUser sysInfo) {
+ @Override
+ public void add(LDeptFormScrappedParam param, S_user_core currentUser, FinSysTenantUser sysInfo) throws Exception {
long dealTime = DateUtils.getDateTimeNumber(System.currentTimeMillis());
- //1.鏂板鎶ュ簾鍗曡褰�
+ // 1.鏂板鎶ュ簾鍗曡褰�
DepFormScrapped lDeptFormScrapped = new DepFormScrapped();
- //鎶ュ簾鍗昳d
+ // 鎶ュ簾鍗昳d
long lWhFormScrappedId = IdUtil.generateId();
lDeptFormScrapped.setId(lWhFormScrappedId);
lDeptFormScrapped.setBusinessFormCode(codeGeneratorService.createBusinessFormCode(CodeGeneratorEnum.Scrapped));
@@ -74,7 +90,7 @@
FinSysTenantDepartment sysTenantDepartment = departmentService.getById(param.getDepartmentId());
if (sysTenantDepartment == null) {
log.error("閮ㄩ棬涓嶅瓨鍦�");
- return ResponseValue.error("閮ㄩ棬涓嶅瓨鍦�");
+ throw new RuntimeException("閮ㄩ棬涓嶅瓨鍦�");
}
lDeptFormScrapped.setOutWarehouseName(sysTenantDepartment.getName());
@@ -83,7 +99,7 @@
lDeptFormScrapped.setDealTime(param.getDealTime());
lDeptFormScrapped.setAgencyId(Long.valueOf(sysInfo.getTenantId()));
lDeptFormScrapped.setAgencyName(sysInfo.getTenantName());
- //鏍规嵁閮ㄩ棬id鏌ヨ閮ㄩ棬
+ // 鏍规嵁閮ㄩ棬id鏌ヨ閮ㄩ棬
FinSysTenantDepartment department = this.departmentService.getById(sysInfo.getSysDeptId());
if (department != null) {
lDeptFormScrapped.setDepartmentId(sysInfo.getSysDeptId());
@@ -93,10 +109,10 @@
lDeptFormScrapped.setCreateTime(dealTime);
lDeptFormScrapped.setStates(1);
- //2.鎶ュ簾鍗曠墿鍝併�怐EP_FORM_SCRAPPED_GOODS銆�
+ // 2.鎶ュ簾鍗曠墿鍝併�怐EP_FORM_SCRAPPED_GOODS銆�
List<DepFormScrappedGoodsParam> scrappedGoodsInfo = param.getGoods();
if (CollectionUtils.isEmpty(scrappedGoodsInfo)) {
- return ResponseValue.error("鎶ュ簾鍗曠墿鍝佷笉鑳戒负绌�");
+ throw new RuntimeException("鎶ュ簾鍗曠墿鍝佷笉鑳戒负绌�");
}
ArrayList<DepFormScrappedGoods> scrappedGoodsArrayList = new ArrayList<>();
ArrayList<DepFormScrappedModel> modelArrayList = new ArrayList<>();
@@ -119,7 +135,7 @@
Long transBusinessId = depFormScrappedGoodsParam.getTransBusinessId();
LWhFormTransfer lWhFormTransfer = lWhFormTransferService.get(new LWhFormTransfer(transBusinessId));
if (lWhFormTransfer == null) {
- return ResponseValue.error("鎶ュ簾鍗曠墿鍝佷笉鑳戒负绌�");
+ throw new RuntimeException("鎶ュ簾鍗曠墿鍝佷笉鑳戒负绌�");
}
depFormScrappedGoods.setTransBusinessId(transBusinessId);
@@ -130,32 +146,34 @@
// 鍨嬪彿淇℃伅
List<DepFormScrappedModelParam> modelList = depFormScrappedGoodsParam.getModels();
if (CollectionUtils.isEmpty(modelList)) {
- return ResponseValue.error("鎶ュ簾鍗曠墿鍝佸瀷鍙蜂笉鑳戒负绌�");
+ throw new RuntimeException("鎶ュ簾鍗曠墿鍝佸瀷鍙蜂笉鑳戒负绌�");
}
- //鑾峰彇鎶ュ簾鍘熷洜code
- List<Long> scrappedCodeList = modelList.stream().map(params -> params.getScrappedCode()).collect(Collectors.toList());
- //鏍规嵁鎶ュ簾鍘熷洜code鏌ヨ鏁版嵁瀛楀吀
+ // 鑾峰彇鎶ュ簾鍘熷洜code
+ List<Long> scrappedCodeList =
+ modelList.stream().map(params -> params.getScrappedCode()).collect(Collectors.toList());
+ // 鏍规嵁鎶ュ簾鍘熷洜code鏌ヨ鏁版嵁瀛楀吀
List<SDictData> SDictDataList = sDictDataService.selectByScrappedCodeList(scrappedCodeList);
- Map<Long, String> scrappedNameMap = SDictDataList.stream().collect(Collectors.toMap(s -> s.getDict_code(), s -> s.getDict_label()));
+ Map<Long, String> scrappedNameMap =
+ SDictDataList.stream().collect(Collectors.toMap(s -> s.getDict_code(), s -> s.getDict_label()));
for (DepFormScrappedModelParam depFormScrappedModelParam : modelList) {
DepFormScrappedModel depFormScrappedModel = new DepFormScrappedModel();
depFormScrappedModel.setId(IdUtil.generateId());
depFormScrappedModel.setDepFormScrappedId(lWhFormScrappedId);
depFormScrappedModel.setDepFormScrappedGoodsId(depFormScrappedGoods.getId());
- //鎶ュ簾鍘熷洜
+ // 鎶ュ簾鍘熷洜
depFormScrappedModel.setScrappedCode(depFormScrappedModelParam.getScrappedCode());
depFormScrappedModel.setScrappedName(scrappedNameMap.get(depFormScrappedModel.getScrappedCode()));
// 鐗╁搧 鍙� 鍨嬪彿 淇℃伅
Long baseGoodsModelsId = depFormScrappedModelParam.getBaseGoodsModelsId();
if (baseGoodsModelsId == null) {
- return ResponseValue.error("鎶ュ簾鍗曠墿鍝佸瀷鍙蜂笉鑳戒负绌�");
+ throw new RuntimeException("鎶ュ簾鍗曠墿鍝佸瀷鍙蜂笉鑳戒负绌�");
}
List<Map<String, Object>> modelInfoList = baseGoodsModelsService.queryGoodsModelInfo(baseGoodsModelsId);
if (CollectionUtils.isEmpty(modelInfoList)) {
- return ResponseValue.error("鏈煡璇㈠埌鎶ュ簾鍗曠墿鍝佸瀷鍙�");
+ throw new RuntimeException("鏈煡璇㈠埌鎶ュ簾鍗曠墿鍝佸瀷鍙�");
}
Map<String, Object> modelInfo = modelInfoList.get(0);
depFormScrappedModel.setBaseGoodsTemplateId(Convert.toLong(modelInfo.get("goodsId")));
@@ -165,62 +183,64 @@
depFormScrappedModel.setBaseGoodsModelsId(baseGoodsModelsId);
depFormScrappedModel.setBaseGoodsModelsName(Convert.toStr(modelInfo.get("modelName")));
- //璋冩嫧鍗曚俊鎭�
+ // 璋冩嫧鍗曚俊鎭�
depFormScrappedModel.setProcureModelUserId(depFormScrappedModelParam.getModelUserId());
depFormScrappedModel.setGoodsUserName(depFormScrappedModelParam.getNowUserName());
depFormScrappedModel.setInitialCount(depFormScrappedModelParam.getGoodsNum());
depFormScrappedModel.setUseCount(depFormScrappedModelParam.getUserUseCount());
depFormScrappedModel.setCounts(depFormScrappedModelParam.getCounts());
- //澧炲姞鍒版壒閲忔彃鍏ist
+ // 澧炲姞鍒版壒閲忔彃鍏ist
modelArrayList.add(depFormScrappedModel);
}
- //澧炲姞鍒版壒閲忔彃鍏ist
+ // 澧炲姞鍒版壒閲忔彃鍏ist
scrappedGoodsArrayList.add(depFormScrappedGoods);
}
int flag1 = this.insert(lDeptFormScrapped);
if (flag1 == 0) {
log.error("鏂板鎶ュ簾鍗曞け璐�");
- return ResponseValue.error("鏂板鎶ュ簾鍗曞け璐�");
+ throw new RuntimeException("鏂板鎶ュ簾鍗曞け璐�");
}
- int i = insertBatch(scrappedGoodsArrayList);
- int i2 = insertBatch(modelArrayList);
- depFormScrappedCoreService.updateScrapped(lWhFormScrappedId,currentUser,dealTime);
- return ResponseValue.success();
+ insertBatch(scrappedGoodsArrayList);
+ insertBatch(modelArrayList);
+ depFormScrappedCoreService.updateScrapped(lWhFormScrappedId, currentUser, dealTime);
}
-
/**
* @Description 鍒楄〃鏌ヨ
*/
- private static String QUERY_LIST = "SELECT scrap.id,scrap.BUSINESS_FORM_CODE,scrap.AGENCY_NAME,scrap.DEPARTMENT_NAME,scrap.OPERATOR_NAME,scrap.DEAL_TIME,model.BASE_GOODS_TEMPLATE_ID,model.BASE_GOODS_TEMPLATE_NAME,SUM(model.COUNTS) total_Count,model.unit FROM DEP_FORM_SCRAPPED scrap LEFT JOIN DEP_FORM_SCRAPPED_MODEL model ON scrap.id=model.DEP_FORM_SCRAPPED_ID where 1=1";
- private static String QUERY_LIST_END = " GROUP BY scrap.id,scrap.BUSINESS_FORM_CODE,scrap.DEPARTMENT_NAME,scrap.OPERATOR_NAME,scrap.DEAL_TIME,model.BASE_GOODS_TEMPLATE_ID,model.BASE_GOODS_TEMPLATE_NAME ORDER BY scrap.DEAL_TIME DESC";
+ private static String QUERY_LIST =
+ "SELECT scrap.id,scrap.BUSINESS_FORM_CODE,scrap.AGENCY_NAME,scrap.DEPARTMENT_NAME,scrap.OPERATOR_NAME,scrap.DEAL_TIME,model.BASE_GOODS_TEMPLATE_ID,model.BASE_GOODS_TEMPLATE_NAME,SUM(model.COUNTS) total_Count,model.unit FROM DEP_FORM_SCRAPPED scrap LEFT JOIN DEP_FORM_SCRAPPED_MODEL model ON scrap.id=model.DEP_FORM_SCRAPPED_ID where 1=1";
+ private static String QUERY_LIST_END =
+ " GROUP BY scrap.id,scrap.BUSINESS_FORM_CODE,scrap.DEPARTMENT_NAME,scrap.OPERATOR_NAME,scrap.DEAL_TIME,model.BASE_GOODS_TEMPLATE_ID,model.BASE_GOODS_TEMPLATE_NAME ORDER BY scrap.DEAL_TIME DESC";
+ @Override
public GenericPager<Map<String, Object>> queryList(LDeptFormScrappedQry param) {
HashMap<String, Object> paramts = new HashMap<>();
StringBuilder sql = new StringBuilder(QUERY_LIST);
- //鎶ュ簾鍗曞彿
+ // 鎶ュ簾鍗曞彿
if (!StringUtils.isEmpty(param.getBusinessFormCode())) {
sql.append(" and scrap.BUSINESS_FORM_CODE = :businessFormCode ");
paramts.put("businessFormCode", param.getBusinessFormCode());
}
- //鏈烘瀯
+ // 鏈烘瀯
if (param.getAgencyId() != null) {
sql.append(" and scrap.AGENCY_ID = :agencyId ");
paramts.put("agencyId", param.getAgencyId());
}
- //鐗╁搧鍚嶇О
+ // 鐗╁搧鍚嶇О
if (!StringUtils.isEmpty(param.getGoodsTemplateName())) {
sql.append(" and model.BASE_GOODS_TEMPLATE_NAME LIKE :goodsTemplateName ");
- paramts.put("goodsTemplateName", StringUtils.CHAR_PERCENT + param.getGoodsTemplateName() + StringUtils.CHAR_PERCENT);
+ paramts.put("goodsTemplateName",
+ StringUtils.CHAR_PERCENT + param.getGoodsTemplateName() + StringUtils.CHAR_PERCENT);
}
- //鍒涘缓浜�
+ // 鍒涘缓浜�
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);
@@ -233,20 +253,20 @@
return selectSplit(sql.toString(), paramts, param.getPageNum(), param.getPageSize(), new MapperUtil());
}
-
/**
* @Description 鏍规嵁id鏌ヨ璇︽儏
*/
+ @Override
public DepFormScrappedExtendVo getById(Long id) {
DepFormScrappedExtendVo scrappedExtend = new DepFormScrappedExtendVo();
- //1.鏌ヨ鎶ュ簾鍗�
+ // 1.鏌ヨ鎶ュ簾鍗�
DepFormScrapped lWhFormScrapped = this.get(new DepFormScrapped(id));
if (lWhFormScrapped != null) {
BeanUtils.copyProperties(lWhFormScrapped, scrappedExtend);
}
ObjectMapper objectMapper = new ObjectMapper();
- //2.鏌ヨ鎶ュ簾鍗曠墿鍝�
+ // 2.鏌ヨ鎶ュ簾鍗曠墿鍝�
DepFormScrappedGoods goodsQuery = new DepFormScrappedGoods();
goodsQuery.setDepFormScrappedId(id);
List<DepFormScrappedGoods> formScrappedGoodsList = select(goodsQuery);
@@ -259,10 +279,8 @@
depFormScrappedModel.setDepFormScrappedGoodsId(scrappedGoodsId);
List<DepFormScrappedModel> scrappedModelList = select(depFormScrappedModel);
List<List<DepFormScrappedModel>> modelList = scrappedModelList.stream()
- .collect(Collectors.groupingBy(DepFormScrappedModel::getBaseGoodsModelsId))
- .values().stream()
- .map(list -> list.stream().collect(Collectors.toList()))
- .collect(Collectors.toList());
+ .collect(Collectors.groupingBy(DepFormScrappedModel::getBaseGoodsModelsId)).values().stream()
+ .map(list -> list.stream().collect(Collectors.toList())).collect(Collectors.toList());
scrappedGoodsMap.put("models", modelList);
goodsList.add(scrappedGoodsMap);
@@ -271,18 +289,20 @@
return scrappedExtend;
}
- private static String EXPORT_SQL = "SELECT scrap.id,scrap.BUSINESS_FORM_CODE,model.BASE_GOODS_TEMPLATE_NAME,model.BASE_GOODS_MODELS_NAME,model.COUNTS,scrap.AGENCY_NAME,scrap.DEPARTMENT_NAME,scrap.OPERATOR_NAME,scrap.DEAL_TIME,scrap.OUT_WAREHOUSE_NAME,ROUND( IFNULL( TOTAL_AMOUNT, 0 )/ 100, 2 ) AS TOTAL_PRICE,model.SCRAPPED_NAME,NULL AS bz FROM DEP_FORM_SCRAPPED scrap LEFT JOIN DEP_FORM_SCRAPPED_MODEL model ON scrap.id=model.DEP_FORM_SCRAPPED_ID WHERE 1=1 ";
+ private static String EXPORT_SQL =
+ "SELECT scrap.id,scrap.BUSINESS_FORM_CODE,model.BASE_GOODS_TEMPLATE_NAME,model.BASE_GOODS_MODELS_NAME,model.COUNTS,scrap.AGENCY_NAME,scrap.DEPARTMENT_NAME,scrap.OPERATOR_NAME,scrap.DEAL_TIME,scrap.OUT_WAREHOUSE_NAME,ROUND( IFNULL( TOTAL_AMOUNT, 0 )/ 100, 2 ) AS TOTAL_PRICE,model.SCRAPPED_NAME,NULL AS bz FROM DEP_FORM_SCRAPPED scrap LEFT JOIN DEP_FORM_SCRAPPED_MODEL model ON scrap.id=model.DEP_FORM_SCRAPPED_ID WHERE 1=1 ";
private static String EXPORT_SQL_END = "order by scrap.DEAL_TIME DESC";
+ @Override
public List<Map<String, Object>> export(Long id, String agencyId) {
HashMap<String, Object> paramts = new HashMap<>();
StringBuilder sql = new StringBuilder(EXPORT_SQL);
- //鎶ュ簾鍗曞彿
+ // 鎶ュ簾鍗曞彿
if (id != null) {
sql.append(" and scrap.id = :id");
paramts.put("id", id);
}
- //鏈烘瀯
+ // 鏈烘瀯
sql.append(" and scrap.AGENCY_ID = :agencyId ");
if (agencyId != null) {
paramts.put("agencyId", agencyId);
@@ -290,31 +310,33 @@
return select(sql.append(EXPORT_SQL_END).toString(), paramts, new MapperUtil());
}
+ @Override
public List<Map<String, Object>> listByModel(LDeptFormScrappedQry param) {
HashMap<String, Object> paramts = new HashMap<>();
StringBuilder sql = new StringBuilder(EXPORT_SQL);
- //鎶ュ簾鍗昳d
+ // 鎶ュ簾鍗昳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);
+ 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());
@@ -324,12 +346,12 @@
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);
@@ -341,31 +363,33 @@
return select(sql.append(EXPORT_SQL_END).toString(), paramts, new MapperUtil());
}
+ @Override
public GenericPager<Map<String, Object>> listByModel2(LDeptFormScrappedQry param) {
HashMap<String, Object> paramts = new HashMap<>();
StringBuilder sql = new StringBuilder(EXPORT_SQL);
- //鎶ュ簾鍗昳d
+ // 鎶ュ簾鍗昳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);
+ 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());
@@ -375,12 +399,12 @@
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);
@@ -389,30 +413,9 @@
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 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" +
- "\tscrGoods.TRANS_OUT_WAREHOUSE_TYPE,\n" +
- "\tscrGoods.TRANS_OUT_WAREHOUSE_ID,\n" +
- "\tgoodsModel.BASE_GOODS_TEMPLATE_ID,\n" +
- "\tgoodsModel.COUNTS,\n" +
- "\tgoodsModel.PROCURE_MODEL_USER_ID,\n" +
- "\tgoodsModel.GOODS_USER_NAME \n" +
- "FROM\n" +
- "\tDEP_FORM_SCRAPPED_GOODS scrGoods\n" +
- "\tLEFT JOIN DEP_FORM_SCRAPPED_MODEL goodsModel ON scrgoods.id = goodsModel.DEP_FORM_SCRAPPED_GOODS_ID";
-
- public List<Map<String, Object>> getBfModelList(Long lWhFormScrappedId) {
- HashMap<String, Object> paramts = new HashMap<>();
- StringBuilder sql = new StringBuilder(GET_BF_MODEL_LIST);
- //鎶ュ簾鍗昳d
- sql.append(" and scrGoods.DEP_FORM_SCRAPPED_ID = :lWhFormScrappedId");
- paramts.put("lWhFormScrappedId", lWhFormScrappedId);
- return select(sql.toString(), paramts, new MapperUtil());
- }
}
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/GoodsBaseServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/GoodsBaseServiceImpl.java
new file mode 100644
index 0000000..7411cd7
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/service/impl/GoodsBaseServiceImpl.java
@@ -0,0 +1,18 @@
+package com.consum.base.service.impl;
+
+import com.consum.base.service.GoodsBaseService;
+import org.springframework.stereotype.Service;
+
+import com.walker.jdbc.service.BaseServiceImpl;
+
+/**
+ * @ClassName GoodsBaseServiceImpl
+ *
+ * @Date 2023/11/2
+ * @Description
+ * @Version 1.0
+ **/
+@Service
+public class GoodsBaseServiceImpl extends BaseServiceImpl implements GoodsBaseService {
+
+}
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryServiceImpl.java
index 8467aa2..fe2f612 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryServiceImpl.java
@@ -1,5 +1,6 @@
package com.consum.base.service.impl;
+import com.consum.base.service.core.LWhFormInventoryCoreService;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormOutputServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormOutputServiceImpl.java
index 6d7034a..947afe0 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormOutputServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormOutputServiceImpl.java
@@ -1,5 +1,6 @@
package com.consum.base.service.impl;
+import com.consum.base.service.core.LWhFormOutputCoreService;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormScrappedServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormScrappedServiceImpl.java
index 27e0c1a..067df3e 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormScrappedServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormScrappedServiceImpl.java
@@ -40,7 +40,8 @@
import com.consum.base.service.LWhFormScrappedGoodsService;
import com.consum.base.service.LWhFormScrappedService;
import com.consum.base.service.LWhGoodsService;
-import com.consum.base.service.SDictDataServiceImpl;
+import com.consum.base.service.SDictDataService;
+import com.consum.base.service.core.LWhFormScrappedCoreService;
import com.consum.model.po.BaseGoodsModels;
import com.consum.model.po.BaseGoodsTemplate;
import com.consum.model.po.BaseWarehouse;
@@ -74,7 +75,7 @@
@Autowired
private LWhFormScrappedGoodsService scrappedGoodsService;
@Autowired
- private SDictDataServiceImpl sDictDataService;
+ private SDictDataService sDictDataService;
@Autowired
private BaseGoodsModelsService baseGoodsModelsService;
@Autowired
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/LWhGoodsStatisticsServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhGoodsStatisticsServiceImpl.java
new file mode 100644
index 0000000..15cb0ac
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhGoodsStatisticsServiceImpl.java
@@ -0,0 +1,107 @@
+package com.consum.base.service.impl;
+
+import com.consum.base.service.LWhGoodsStatisticsService;
+import java.util.HashMap;
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+
+import com.consum.base.core.utils.MapperUtil;
+import com.consum.base.pojo.query.LWhGoodsStatisQry;
+import com.walker.infrastructure.utils.StringUtils;
+import com.walker.jdbc.service.BaseServiceImpl;
+
+/**
+ * @ClassName LWhGoodsStatisticsServiceImpl
+ * @Author cy
+ * @Date 2023/11/21
+ * @Description
+ * @Version 1.0
+ **/
+@Service
+public class LWhGoodsStatisticsServiceImpl extends BaseServiceImpl implements LWhGoodsStatisticsService {
+ private String GET_WHGOODS_STATIS_LIST_COLUMN =
+ "SELECT tCangKu.org_name,tCangKu.WAREHOUSE_NAME,goodsTemp.GOODS_CODE,tKuCun.GOODS_TEMPLATE_NAME,tKuCun.BASE_GOODS_MODELS_NAME,CASE tKuCun.COST_TYPE WHEN 1 THEN 'A绫�' WHEN 2 THEN 'B绫�' WHEN 3 THEN 'C绫�' END AS cost_Type,tKuCun.total_num,tKuCun.zai_ku_num,tKuCun.diao_bo_num,tKuCun.bao_fei_num FROM ";
+ private String GET_WHGOODS_STATIS_LIST_T_CANGKU =
+ "(SELECT tenant.id tenantId,tenant.NAME AS org_name,ware.*FROM fin_sys_tenant tenant right JOIN (SELECT 0 WAREHOUSE_TYPE,id,AGENCY_ID,WAREHOUSE_NAME FROM BASE_WAREHOUSE UNION ALL SELECT 1 WAREHOUSE_TYPE,id,TENANT_ID AGENCY_ID,`NAME` WAREHOUSE_NAME FROM fin_sys_tenant_department) ware ON tenant.id=ware.AGENCY_ID ";
+ private String GET_WHGOODS_STATIS_LIST_T_CANGKU_WHERE = "where 1=1";
+ private String GET_WHGOODS_STATIS_LIST_T_CANGKU_END = ") tCangKu LEFT JOIN";
+ private String GET_WHGOODS_STATIS_LIST_T_KUCUN =
+ "(SELECT WAREHOUSE_TYPE,WAREHOUSE_ID,BASE_GOODS_TEMPLATE_ID,GOODS_TEMPLATE_NAME,COST_TYPE,BASE_GOODS_MODELS_ID,BASE_GOODS_MODELS_NAME,COUNT(CASE WHEN goods.STATES BETWEEN 0 AND 2 THEN 1 END) AS total_num,count(CASE WHEN goods.STATES=1 OR goods.STATES=2 THEN 1 END) zai_ku_num,count(CASE WHEN goods.STATES=0 THEN 1 END) diao_bo_num,count(CASE WHEN goods.STATES=3 THEN 1 END) bao_fei_num FROM l_wh_goods goods ";
+ private String GET_WHGOODS_STATIS_LIST_T_KUCUN_WHERE = "where 1=1";
+ private String GET_WHGOODS_STATIS_LIST_T_KUCUN_GROUP_BY =
+ " GROUP BY WAREHOUSE_TYPE,WAREHOUSE_ID,BASE_GOODS_TEMPLATE_ID,GOODS_TEMPLATE_NAME,BASE_GOODS_MODELS_ID,BASE_GOODS_MODELS_NAME,COST_TYPE) tKuCun ON tCangKu.WAREHOUSE_TYPE=tKuCun.WAREHOUSE_TYPE and tCangKu.id = tKuCun.WAREHOUSE_ID LEFT JOIN BASE_GOODS_TEMPLATE goodsTemp ON goodsTemp.id=tKuCun.BASE_GOODS_TEMPLATE_ID ";
+ private String GET_WHGOODS_STATIS_LIST_T_END_WHERE = " where 1=1";
+
+ @Override
+ public List getWhGoodsStatisList(LWhGoodsStatisQry param) {
+ StringBuilder sqlColumn = new StringBuilder(GET_WHGOODS_STATIS_LIST_COLUMN);
+ StringBuilder sqlCangKu = new StringBuilder(GET_WHGOODS_STATIS_LIST_T_CANGKU);
+ StringBuilder sqlCangKuWhere = new StringBuilder(GET_WHGOODS_STATIS_LIST_T_CANGKU_WHERE);
+ StringBuilder sqlCangKuEnd = new StringBuilder(GET_WHGOODS_STATIS_LIST_T_CANGKU_END);
+ StringBuilder sqlKuCun = new StringBuilder(GET_WHGOODS_STATIS_LIST_T_KUCUN);
+ StringBuilder sqlKuCunWhere = new StringBuilder(GET_WHGOODS_STATIS_LIST_T_KUCUN_WHERE);
+ StringBuilder sqlKuCunGoupBy = new StringBuilder(GET_WHGOODS_STATIS_LIST_T_KUCUN_GROUP_BY);
+ StringBuilder sqlEndWhere = new StringBuilder(GET_WHGOODS_STATIS_LIST_T_END_WHERE);
+
+ HashMap<String, Object> paramts = new HashMap<>();
+ // 鏈烘瀯
+ if (param.getAgencyId() != null) {
+ // sqlCangKuWhere.append(" AND left(tenant.id, length(:lengthAgencyId)) = :agencyId");
+ sqlCangKuWhere.append(" AND tenant.id = :agencyId");
+ // paramts.put("lengthAgencyId", param.getAgencyId());
+ paramts.put("agencyId", param.getAgencyId());
+ }
+ // 閮ㄩ棬
+ if (param.getDepartmentId() != null) {
+ sqlCangKuWhere.append(" AND ware.WAREHOUSE_TYPE=1 and ware.id = :departmentId");
+ paramts.put("departmentId", param.getDepartmentId());
+ }
+ // 浠撳簱
+ if (param.getBaseWarehouseId() != null) {
+ sqlCangKuWhere.append(" AND ware.WAREHOUSE_TYPE =0 and ware.id = :warehouseId");
+ paramts.put("warehouseId", param.getBaseWarehouseId());
+ }
+ // 鐗╁搧鍚嶇О
+ if (StringUtils.isNotEmpty(param.getGoodsTemplateName())) {
+ sqlKuCunWhere.append(" AND goods.GOODS_TEMPLATE_NAME like :goodsTemplateName");
+ paramts.put("goodsTemplateName",
+ StringUtils.CHAR_PERCENT + param.getGoodsTemplateName() + StringUtils.CHAR_PERCENT);
+ }
+ if (param.getGoodsTemplateId() != null) {
+ sqlKuCunWhere.append(" AND goods.BASE_GOODS_TEMPLATE_ID=:goodsTemplateId");
+ paramts.put("goodsTemplateId", param.getGoodsTemplateId());
+ }
+ // 瑙勬牸鍨嬪彿
+ if (param.getBaseGoodsModelsId() != null) {
+ sqlKuCunWhere.append(" AND goods.BASE_GOODS_MODELS_ID=:baseGoodsModelsId");
+ paramts.put("baseGoodsModelsId", param.getBaseGoodsModelsId());
+ }
+ // 浠峰�肩被鍨�
+ if (param.getCostType() != null) {
+ // 灏嗘暟瀛楄浆鎹负瀵瑰簲鐨勫瓧绗�
+ char costType = (char)('A' + param.getCostType() - 1);
+ sqlKuCunWhere.append(" AND goods.COST_TYPE=':costType'");
+ paramts.put("costType", costType);
+ }
+
+ // // 鎿嶄綔鏃堕棿
+ // if (param.getDealTimeStart() != null) {
+ // sqlEnd.append(" and flow.DEAL_TIME >=:dealTimeStart ");
+ // paramts.put("dealTimeStart", param.getDealTimeStart() * 1000000);
+ // }
+ // if (param.getDealTimeEnd() != null) {
+ // sqlEnd.append(" and flow.DEAL_TIME <:dealTimeEnd ");
+ // paramts.put("dealTimeEnd", param.getDealTimeEnd() * 1000000 + 240000);
+ // }
+ sqlEndWhere.append(" ORDER BY tKuCun.total_num desc,tCangKu.tenantId asc");
+
+ StringBuilder sql = new StringBuilder();
+ sql.append(sqlColumn).append(sqlCangKu).append(sqlCangKuWhere).append(sqlCangKuEnd).append(sqlKuCun)
+ .append(sqlKuCunWhere).append(sqlKuCunGoupBy)
+
+ .append(sqlEndWhere);
+
+ return select(sql.toString(), paramts, new MapperUtil());
+ }
+}
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhWarningConfigServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhWarningConfigServiceImpl.java
similarity index 67%
rename from consum-base/src/main/java/com/consum/base/service/LWhWarningConfigServiceImpl.java
rename to consum-base/src/main/java/com/consum/base/service/impl/LWhWarningConfigServiceImpl.java
index 236c1d9..f6df665 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhWarningConfigServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhWarningConfigServiceImpl.java
@@ -1,4 +1,11 @@
-package com.consum.base.service;
+package com.consum.base.service.impl;
+
+import com.consum.base.service.LWhWarningConfigService;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.stereotype.Service;
import com.consum.base.core.utils.MapperUtil;
import com.consum.base.pojo.query.WhWarningConfigQry;
@@ -6,11 +13,6 @@
import com.walker.infrastructure.utils.CollectionUtils;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.jdbc.service.BaseServiceImpl;
-import org.springframework.stereotype.Service;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
/**
* @ClassName LWhWarningConfigServiceImpl
@@ -20,29 +22,31 @@
* @Version 1.0
**/
@Service
-public class LWhWarningConfigServiceImpl extends BaseServiceImpl {
- private static String GET_CONFIG_LIST_WITH_PAGE = "SELECT wareConf.*,ware.AGENCY_NAME,ware.WAREHOUSE_NAME,goodsTemp.CATEGORY_NAME,CONCAT(cate.CLASSIFICATION,'绫�') cost_Type,goodsTemp.GOODS_NAME,baseModel.MODEL_NAME FROM WH_WARNING_CONFIG wareConf LEFT JOIN BASE_GOODS_MODELS baseModel ON baseModel.ID=wareConf.BASE_GOODS_MODELS_ID LEFT JOIN BASE_GOODS_TEMPLATE goodsTemp ON wareConf.BASE_GOODS_TEMPLATE_ID=goodsTemp.id LEFT JOIN BASE_CATEGORY cate ON cate.id=goodsTemp.CATEGORY_ID LEFT JOIN BASE_WAREHOUSE ware ON ware.id=wareConf.BASE_WAREHOUSE_ID WHERE 1=1 ";
+public class LWhWarningConfigServiceImpl extends BaseServiceImpl implements LWhWarningConfigService {
+ private static String GET_CONFIG_LIST_WITH_PAGE =
+ "SELECT wareConf.*,ware.AGENCY_NAME,ware.WAREHOUSE_NAME,goodsTemp.CATEGORY_NAME,CONCAT(cate.CLASSIFICATION,'绫�') cost_Type,goodsTemp.GOODS_NAME,baseModel.MODEL_NAME FROM WH_WARNING_CONFIG wareConf LEFT JOIN BASE_GOODS_MODELS baseModel ON baseModel.ID=wareConf.BASE_GOODS_MODELS_ID LEFT JOIN BASE_GOODS_TEMPLATE goodsTemp ON wareConf.BASE_GOODS_TEMPLATE_ID=goodsTemp.id LEFT JOIN BASE_CATEGORY cate ON cate.id=goodsTemp.CATEGORY_ID LEFT JOIN BASE_WAREHOUSE ware ON ware.id=wareConf.BASE_WAREHOUSE_ID WHERE 1=1 ";
+ @Override
public GenericPager<Map<String, Object>> getConfigListWithPage(WhWarningConfigQry param) {
Map<String, Object> configListQueryMap = getConfigListQueryMap(param);
- StringBuilder sql = (StringBuilder) configListQueryMap.get("sql");
- HashMap<String, Object> paramts = (HashMap<String, Object>) configListQueryMap.get("paramts");
+ StringBuilder sql = (StringBuilder)configListQueryMap.get("sql");
+ HashMap<String, Object> paramts = (HashMap<String, Object>)configListQueryMap.get("paramts");
return selectSplit(sql.toString(), paramts, param.getPageNum(), param.getPageSize(), new MapperUtil());
}
-
- private Map<String, Object> getConfigListQueryMap(WhWarningConfigQry param) {
+ @Override
+ public Map<String, Object> getConfigListQueryMap(WhWarningConfigQry param) {
Map<String, Object> configListQueryMap = new HashMap<>();
StringBuilder sql = new StringBuilder(GET_CONFIG_LIST_WITH_PAGE);
HashMap<String, Object> paramts = new HashMap<>();
- //鏈烘瀯
+ // 鏈烘瀯
if (param.getAgencyId() != null) {
-// sql.append(" and left(ware.AGENCY_ID, length(:lengthAgencyId)) = :agencyId");
+ // sql.append(" and left(ware.AGENCY_ID, length(:lengthAgencyId)) = :agencyId");
sql.append(" and ware.AGENCY_ID = :agencyId");
-// paramts.put("lengthAgencyId", param.getAgencyId());
+ // paramts.put("lengthAgencyId", param.getAgencyId());
paramts.put("agencyId", param.getAgencyId());
}
- //浠撳簱绫诲瀷
+ // 浠撳簱绫诲瀷
if (param.getWarehouseType() != null) {
sql.append(" AND wareConf.WAREHOUSE_TYPE = :warehouseType");
paramts.put("warehouseType", param.getWarehouseType());
@@ -51,24 +55,25 @@
sql.append(" AND wareConf.BASE_WAREHOUSE_ID = :warehouseId");
paramts.put("warehouseId", param.getBaseWarehouseId());
}
- //鐗╁搧鍚嶇О
+ // 鐗╁搧鍚嶇О
if (StringUtils.isNotEmpty(param.getGoodsTemplateName())) {
sql.append(" AND goodsTemp.GOODS_NAME like :goodsTemplateName");
- paramts.put("goodsTemplateName", StringUtils.CHAR_PERCENT + param.getGoodsTemplateName() + StringUtils.CHAR_PERCENT);
+ paramts.put("goodsTemplateName",
+ StringUtils.CHAR_PERCENT + param.getGoodsTemplateName() + StringUtils.CHAR_PERCENT);
}
if (param.getBaseGoodsTemplateId() != null) {
sql.append(" AND wareConf.BASE_GOODS_TEMPLATE_ID=:baseGoodsTemplateId");
paramts.put("baseGoodsTemplateId", param.getBaseGoodsTemplateId());
}
- //鍒嗙被
+ // 鍒嗙被
if (param.getCategoryId() != null) {
sql.append(" AND cate.id=:categoryId");
paramts.put("categoryId", param.getCategoryId());
}
- //浠峰�肩被鍨�
+ // 浠峰�肩被鍨�
if (param.getCostType() != null) {
// 灏嗘暟瀛楄浆鎹负瀵瑰簲鐨勫瓧绗�
- char costType = (char) ('A' + param.getCostType() - 1);
+ char costType = (char)('A' + param.getCostType() - 1);
sql.append(" AND cate.CLASSIFICATION=:costType");
paramts.put("costType", costType);
}
@@ -78,13 +83,14 @@
return configListQueryMap;
}
- private String QUERY_MODEL_IS_EXIST = "";
-
- public List<Map<String, Object>> queryModelIsExist(Integer warehouseType, Long baseWarehouseId, List<Long> modelIds) {
- StringBuilder sql = new StringBuilder("select WAREHOUSE_TYPE, BASE_WAREHOUSE_ID, BASE_GOODS_MODELS_ID from WH_WARNING_CONFIG where 1=1");
+ @Override
+ public List<Map<String, Object>> queryModelIsExist(Integer warehouseType, Long baseWarehouseId,
+ List<Long> modelIds) {
+ StringBuilder sql = new StringBuilder(
+ "select WAREHOUSE_TYPE, BASE_WAREHOUSE_ID, BASE_GOODS_MODELS_ID from WH_WARNING_CONFIG where 1=1");
HashMap<String, Object> paramts = new HashMap<>();
- //浠撳簱绫诲瀷
+ // 浠撳簱绫诲瀷
if (warehouseType != null) {
sql.append(" AND WAREHOUSE_TYPE = :warehouseType");
paramts.put("warehouseType", warehouseType);
@@ -99,6 +105,5 @@
}
return select(sql.toString(), paramts, new MapperUtil());
}
-
}
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhWarningServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhWarningServiceImpl.java
similarity index 70%
rename from consum-base/src/main/java/com/consum/base/service/LWhWarningServiceImpl.java
rename to consum-base/src/main/java/com/consum/base/service/impl/LWhWarningServiceImpl.java
index a776d44..bdce8a6 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhWarningServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhWarningServiceImpl.java
@@ -1,4 +1,11 @@
-package com.consum.base.service;
+package com.consum.base.service.impl;
+
+import com.consum.base.service.LWhWarningService;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.stereotype.Service;
import com.consum.base.core.utils.MapperUtil;
import com.consum.base.pojo.query.WhWarningQry;
@@ -6,11 +13,6 @@
import com.walker.infrastructure.utils.CollectionUtils;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.jdbc.service.BaseServiceImpl;
-import org.springframework.stereotype.Service;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
/**
* @ClassName LWhWarningServiceImpl
@@ -20,9 +22,11 @@
* @Version 1.0
**/
@Service
-public class LWhWarningServiceImpl extends BaseServiceImpl {
- private static String GET_WARNING_TYPE_NUM = "SELECT COUNT(1) AS total_num,count(CASE WHEN wareWarn.WARNING_TYPE=1 THEN 1 ELSE NULL END) AS up_num,count(CASE WHEN wareWarn.WARNING_TYPE=2 THEN 1 ELSE NULL END) AS low_num FROM WH_WARNING wareWarn LEFT JOIN BASE_WAREHOUSE ware ON ware.id=wareWarn.BASE_WAREHOUSE_ID WHERE 1=1 ";
+public class LWhWarningServiceImpl extends BaseServiceImpl implements LWhWarningService {
+ private static String GET_WARNING_TYPE_NUM =
+ "SELECT COUNT(1) AS total_num,count(CASE WHEN wareWarn.WARNING_TYPE=1 THEN 1 ELSE NULL END) AS up_num,count(CASE WHEN wareWarn.WARNING_TYPE=2 THEN 1 ELSE NULL END) AS low_num FROM WH_WARNING wareWarn LEFT JOIN BASE_WAREHOUSE ware ON ware.id=wareWarn.BASE_WAREHOUSE_ID WHERE 1=1 ";
+ @Override
public Map<String, Object> getWarningTypeNum(WhWarningQry param) {
StringBuilder sql = new StringBuilder(GET_WARNING_TYPE_NUM);
HashMap<String, Object> paramts = new HashMap<>();
@@ -30,7 +34,7 @@
sql.append(" AND wareWarn.states = :states");
paramts.put("states", param.getStates());
}
- //鏈烘瀯
+ // 鏈烘瀯
if (param.getAgencyId() != null) {
sql.append(" and ware.AGENCY_ID=:agencyId");
paramts.put("agencyId", param.getAgencyId());
@@ -47,8 +51,10 @@
}
- private static String GET_LIST_WITH_PAGE = "SELECT wareWarn.*,ware.WAREHOUSE_NAME,goodsTemp.CATEGORY_NAME,CONCAT(cate.CLASSIFICATION,'绫�') cost_Type,goodsTemp.GOODS_NAME,baseModel.MODEL_NAME,basemodel.UNIT FROM WH_WARNING wareWarn LEFT JOIN BASE_GOODS_MODELS baseModel ON baseModel.ID=wareWarn.BASE_GOODS_MODELS_ID LEFT JOIN BASE_GOODS_TEMPLATE goodsTemp ON wareWarn.BASE_GOODS_TEMPLATE_ID=goodsTemp.id LEFT JOIN BASE_CATEGORY cate ON cate.id=goodsTemp.CATEGORY_ID LEFT JOIN BASE_WAREHOUSE ware ON ware.id=wareWarn.BASE_WAREHOUSE_ID WHERE 1=1 ";
+ private static String GET_LIST_WITH_PAGE =
+ "SELECT wareWarn.*,ware.WAREHOUSE_NAME,goodsTemp.CATEGORY_NAME,CONCAT(cate.CLASSIFICATION,'绫�') cost_Type,goodsTemp.GOODS_NAME,baseModel.MODEL_NAME,basemodel.UNIT FROM WH_WARNING wareWarn LEFT JOIN BASE_GOODS_MODELS baseModel ON baseModel.ID=wareWarn.BASE_GOODS_MODELS_ID LEFT JOIN BASE_GOODS_TEMPLATE goodsTemp ON wareWarn.BASE_GOODS_TEMPLATE_ID=goodsTemp.id LEFT JOIN BASE_CATEGORY cate ON cate.id=goodsTemp.CATEGORY_ID LEFT JOIN BASE_WAREHOUSE ware ON ware.id=wareWarn.BASE_WAREHOUSE_ID WHERE 1=1 ";
+ @Override
public GenericPager<Map<String, Object>> getListWithPage(WhWarningQry param) {
StringBuilder sql = new StringBuilder(GET_LIST_WITH_PAGE);
HashMap<String, Object> paramts = new HashMap<>();
@@ -56,13 +62,13 @@
sql.append(" AND wareWarn.states = :states");
paramts.put("states", param.getStates());
}
- //鏈烘瀯
+ // 鏈烘瀯
if (param.getAgencyId() != null) {
sql.append(" and ware.AGENCY_ID=:agencyId");
-// paramts.put("lengthAgencyId", param.getAgencyId());
+ // paramts.put("lengthAgencyId", param.getAgencyId());
paramts.put("agencyId", param.getAgencyId());
}
- //浠撳簱绫诲瀷
+ // 浠撳簱绫诲瀷
if (param.getWarehouseType() != null) {
sql.append(" AND wareWarn.WAREHOUSE_TYPE = :warehouseType");
paramts.put("warehouseType", param.getWarehouseType());
@@ -71,24 +77,25 @@
sql.append(" AND wareWarn.WAREHOUSE_ID = :warehouseId");
paramts.put("warehouseId", param.getBaseWarehouseId());
}
- //鐗╁搧鍚嶇О
+ // 鐗╁搧鍚嶇О
if (StringUtils.isNotEmpty(param.getGoodsTemplateName())) {
sql.append(" AND goodsTemp.GOODS_NAME like :goodsTemplateName");
- paramts.put("goodsTemplateName", StringUtils.CHAR_PERCENT + param.getGoodsTemplateName() + StringUtils.CHAR_PERCENT);
+ paramts.put("goodsTemplateName",
+ StringUtils.CHAR_PERCENT + param.getGoodsTemplateName() + StringUtils.CHAR_PERCENT);
}
if (param.getGoodsTemplateId() != null) {
sql.append(" AND goodsTemp.id=:goodsTemplateId");
paramts.put("goodsTemplateId", param.getGoodsTemplateId());
}
- //鍒嗙被
+ // 鍒嗙被
if (param.getCategoryId() != null) {
sql.append(" AND cate.id=:categoryId");
paramts.put("categoryId", param.getCategoryId());
}
- //浠峰�肩被鍨�
+ // 浠峰�肩被鍨�
if (param.getCostType() != null) {
// 灏嗘暟瀛楄浆鎹负瀵瑰簲鐨勫瓧绗�
- char costType = (char) ('A' + param.getCostType() - 1);
+ char costType = (char)('A' + param.getCostType() - 1);
sql.append(" AND cate.CLASSIFICATION=':costType'");
paramts.put("costType", costType);
}
@@ -96,7 +103,7 @@
sql.append(" AND wareWarn.WARNING_TYPE=:warningType");
paramts.put("warningType", param.getWarningType());
}
- //瑙勬牸鍨嬪彿
+ // 瑙勬牸鍨嬪彿
if (param.getBaseGoodsModelsId() != null) {
sql.append(" AND wareWarn.BASE_GOODS_MODELS_ID=:baseGoodsModelsId");
paramts.put("baseGoodsModelsId", param.getBaseGoodsModelsId());
@@ -113,18 +120,23 @@
* @param warehouseId
* @param baseModelId
*/
- private String CHECK_KUCUN_PREFIX = "SELECT warnConf.*,goods.goods_Num,CASE WHEN warnConf.LOWER_LIMIT>=goods.goods_Num THEN 2 WHEN warnConf.UPPER_LIMIT<=goods.goods_Num THEN 1 END AS WARNING_TYPE FROM (";
- private String CHECK_KUCUN_CONFIG_PREFIX = "SELECT WAREHOUSE_TYPE,BASE_WAREHOUSE_ID,BASE_GOODS_MODELS_ID,LOWER_LIMIT,UPPER_LIMIT FROM WH_WARNING_CONFIG";
+ private String CHECK_KUCUN_PREFIX =
+ "SELECT warnConf.*,goods.goods_Num,CASE WHEN warnConf.LOWER_LIMIT>=goods.goods_Num THEN 2 WHEN warnConf.UPPER_LIMIT<=goods.goods_Num THEN 1 END AS WARNING_TYPE FROM (";
+ private String CHECK_KUCUN_CONFIG_PREFIX =
+ "SELECT WAREHOUSE_TYPE,BASE_WAREHOUSE_ID,BASE_GOODS_MODELS_ID,LOWER_LIMIT,UPPER_LIMIT FROM WH_WARNING_CONFIG";
private String CHECK_KUCUN_CONFIG_WHERE = " WHERE 1=1";
private String CHECK_KUCUN_CONFIG_JOINTKUCUN = ") warnConf LEFT JOIN (";
- private String CHECK_KUCUN_KUCUN_PREFIX = "SELECT WAREHOUSE_TYPE,WAREHOUSE_ID,BASE_GOODS_MODELS_ID,count(1) goods_Num FROM L_WH_GOODS";
+ private String CHECK_KUCUN_KUCUN_PREFIX =
+ "SELECT WAREHOUSE_TYPE,WAREHOUSE_ID,BASE_GOODS_MODELS_ID,count(1) goods_Num FROM L_WH_GOODS";
private String CHECK_KUCUN_KUCUN_WHERE = " WHERE 1=1 and STATES=1";
private String CHECK_KUCUN_KUCUN_END = " GROUP BY BASE_GOODS_MODELS_ID)";
- private String CHECK_KUCUN_END = "goods ON goods.BASE_GOODS_MODELS_ID=warnConf.BASE_GOODS_MODELS_ID AND goods.WAREHOUSE_TYPE=warnConf.WAREHOUSE_TYPE AND goods.BASE_GOODS_MODELS_ID=warnConf.BASE_GOODS_MODELS_ID WHERE (warnConf.LOWER_LIMIT>=goods.goods_Num OR warnConf.UPPER_LIMIT<=goods.goods_Num)";
+ private String CHECK_KUCUN_END =
+ "goods ON goods.BASE_GOODS_MODELS_ID=warnConf.BASE_GOODS_MODELS_ID AND goods.WAREHOUSE_TYPE=warnConf.WAREHOUSE_TYPE AND goods.BASE_GOODS_MODELS_ID=warnConf.BASE_GOODS_MODELS_ID WHERE (warnConf.LOWER_LIMIT>=goods.goods_Num OR warnConf.UPPER_LIMIT<=goods.goods_Num)";
+ @Override
public List<Map<String, Object>> checkKuCun(Short warehouseType, Long warehouseId, List<Long> baseModelIdList) {
StringBuilder checkKucunPrefix = new StringBuilder(CHECK_KUCUN_PREFIX);
StringBuilder checkKucunConfigPrefix = new StringBuilder(CHECK_KUCUN_CONFIG_PREFIX);
@@ -155,13 +167,9 @@
paramMap.put("KuCunBaseModelIds", baseModelIdList);
}
- checkKucunPrefix.append(checkKucunConfigPrefix)
- .append(checkKucunConfigWhere)
- .append(checkKucunConfigJointkucun)
- .append(checkKucunKucunPrefix)
- .append(checkKucunKucunWhere)
- .append(checkKucunKucunEnd)
- .append(checkKucunEnd);
+ checkKucunPrefix.append(checkKucunConfigPrefix).append(checkKucunConfigWhere).append(checkKucunConfigJointkucun)
+ .append(checkKucunKucunPrefix).append(checkKucunKucunWhere).append(checkKucunKucunEnd)
+ .append(checkKucunEnd);
return select(checkKucunPrefix.toString(), paramMap, new MapperUtil());
}
diff --git a/consum-base/src/main/java/com/consum/base/service/SDictDataServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/SDictDataServiceImpl.java
similarity index 64%
rename from consum-base/src/main/java/com/consum/base/service/SDictDataServiceImpl.java
rename to consum-base/src/main/java/com/consum/base/service/impl/SDictDataServiceImpl.java
index 32cac01..155adf3 100644
--- a/consum-base/src/main/java/com/consum/base/service/SDictDataServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/SDictDataServiceImpl.java
@@ -1,22 +1,25 @@
-package com.consum.base.service;
+package com.consum.base.service.impl;
-import com.consum.model.po.SDictData;
-import com.walker.jdbc.service.BaseServiceImpl;
+import com.consum.base.service.SDictDataService;
+import java.util.HashMap;
+import java.util.List;
+
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
-import java.util.HashMap;
-import java.util.List;
+import com.consum.model.po.SDictData;
+import com.walker.jdbc.service.BaseServiceImpl;
@Service
-public class SDictDataServiceImpl extends BaseServiceImpl {
+public class SDictDataServiceImpl extends BaseServiceImpl implements SDictDataService {
/**
* @Description 鏍规嵁鎶ュ簾鍘熷洜code鏌ヨ鏁版嵁瀛楀吀
* @Author 鍗㈠簡闃�
* @Date 2023/11/2
*/
+ @Override
public List<SDictData> selectByScrappedCodeList(List scrappedCodeList) {
if (CollectionUtils.isEmpty(scrappedCodeList)) {
log.error("鍙傛暟閿欒");
@@ -25,16 +28,7 @@
StringBuilder sql = new StringBuilder("SELECT * FROM s_dict_data WHERE 1 = 1 ");
HashMap<String, Object> paramts = new HashMap<>();
- sql.append(" and dict_code in ( ").append(
- StringUtils.join(scrappedCodeList, ",")).append(")");
-
-// for (int i = 0; i < scrappedCodeList.size(); i++) {
-// sql.append(scrappedCodeList.get(i));
-// if (i < scrappedCodeList.size() - 1) {
-// sql.append(",");
-// }
-// }
-// sql.append(" ) ");
+ sql.append(" and dict_code in ( ").append(StringUtils.join(scrappedCodeList, ",")).append(")");
return this.select(sql.toString(), paramts, new SDictData());
}
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/UsingFormBackServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/UsingFormBackServiceImpl.java
index 624c3ea..644b65b 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/UsingFormBackServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/UsingFormBackServiceImpl.java
@@ -2,7 +2,7 @@
import com.consum.base.core.CodeGeneratorEnum;
import com.consum.base.core.CodeGeneratorService;
-import com.consum.base.core.DepUsingFormBackCoreServiceImpl;
+import com.consum.base.service.core.DepUsingFormBackCoreService;
import com.consum.base.core.utils.IdUtil;
import com.consum.base.core.utils.MapUtils;
import com.consum.base.core.utils.MapperUtil;
@@ -56,7 +56,7 @@
@Autowired
private LWhFormTransferService lWhFormTransferService;
@Resource
- private DepUsingFormBackCoreServiceImpl depUsingFormBackCoreService;
+ private DepUsingFormBackCoreService depUsingFormBackCoreService;
@Resource
private UsingFormBackModelService UsingFormBackModelService;
--
Gitblit v1.9.1