From 4a42e8745fe27cf8edf500eaa5b2d65e080c09b0 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期二, 06 五月 2025 16:10:34 +0800
Subject: [PATCH] 住掉无用的仓库管理代码(防类名冲突)、start模块添加tms模块依赖
---
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/WarehouseController.java | 1544 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 772 insertions(+), 772 deletions(-)
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/WarehouseController.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/WarehouseController.java
index f20c382..bcae083 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/WarehouseController.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/WarehouseController.java
@@ -1,772 +1,772 @@
-package org.jeecg.modules.base.controller;
-
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import org.jeecg.common.system.query.QueryGenerator;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.system.base.controller.JeecgController;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.modules.base.entity.*;
-import org.jeecg.modules.base.service.*;
-import org.jeecg.modules.quartz.entity.QuartzJob;
-import org.jeecg.modules.quartz.service.IQuartzJobService;
-import org.jeecg.common.system.base.entity.DataVersion;
-import org.jeecg.modules.system.service.IDataVersionService;
-import org.jeecg.modules.system.service.ISysUserService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.web.servlet.ModelAndView;
-
-import java.text.ParseException;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.*;
-
-import org.jeecg.common.util.oConvertUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.apache.shiro.SecurityUtils;
-import org.jeecg.common.system.vo.LoginUser;
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import java.io.IOException;
-import java.util.stream.Collectors;
-
- /**
- * @Description: 浠撳簱
- * @Author: jeecg-boot
- * @Date: 2022-11-07
- * @Version: V1.0
- */
-@Api(tags="浠撳簱绠＄悊")
-@RestController
- @RequestMapping("/base/warehouse")
-@Slf4j
-public class WarehouseController extends JeecgController<Warehouse, IWarehouseService> {
-
- @Autowired
- private IWarehouseService warehouseService;
-
- @Autowired
- private IWarehouseClientService warehouseClientService;
-
- @Autowired
- private IEnterpriseService enterpriseService;
-
- @Autowired
- private ISysUserService sysUserService;
-
- @Autowired
- private IDataVersionService dataVersionService;
-
- @Autowired
- private IQuartzJobService quartzJobService;
-
- @Autowired
- private IWarehouseAreaService warehouseAreaService;
-
- @Autowired
- private IWarehouseLocationService warehouseLocationService;
-
-
- /*---------------------------------涓昏〃澶勭悊-begin-------------------------------------*/
- /**
- * 鑾峰彇鍒濆淇℃伅
- *
- *
- */
- @GetMapping("/getWarehouseInfo")
- public Result<?> getFactoryInfo(){
- Map<String,Object> infoMap = new HashMap<>(2);
- LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-// infoMap.put("enterpriseId",loginUser.getEnterpriseId());
-// infoMap.put("version",warehouseService.getInitVersion());
- return Result.OK(infoMap);
- }
- /**
- * 琛ㄥ崟鏍￠獙
- */
- @GetMapping("/check")
- public Result<?> check(@RequestParam(name="name",required = false) String name,
- @RequestParam(name="enterpriseId",required = false) String enterpriseId,
- @RequestParam(name="version",required = false) Integer version
- ){
- QueryWrapper<Warehouse> queryWrapper = new QueryWrapper<>();
- if(!StringUtils.isBlank(name)){
- queryWrapper.eq("name",name);
- }
- if(!StringUtils.isBlank(enterpriseId)){
- queryWrapper.eq("enterprise_id",enterpriseId);
- }
- if(version!=null){
- queryWrapper.eq("version",version);
- }
- queryWrapper.eq("del_flag","0");
- return Result.OK(warehouseService.list(queryWrapper));
- }
- /**
- * 鍒嗛〉鍒楄〃鏌ヨ
- * @param map
- * @param pageNo
- * @param pageSize
- * @param version
- * @param enterpriseId
- * @return
- */
- //@AutoLog(value = "浠撳簱-鍒嗛〉鍒楄〃鏌ヨ")
- @ApiOperation(value="浠撳簱-鍒嗛〉鍒楄〃鏌ヨ", notes="浠撳簱-鍒嗛〉鍒楄〃鏌ヨ")
- @GetMapping("/list")
- public Result<?> list(Map map,
- @RequestParam(name ="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name ="pageSize", defaultValue="10") Integer pageSize,
- @RequestParam(name = "enterpriseId",required = false) String enterpriseId,
- @RequestParam(name="version",required = false) Integer version){
- Page<Map<String,Object>> page = new Page(pageNo, pageSize);
- IPage<Map<String,Object>> pageList = warehouseService.getWarehouseList(page,version,enterpriseId);
- return Result.OK(pageList);
- }
- /**
- * 鑾峰彇褰撳墠鐢熸晥鐗堟湰鍜屼笂涓�娆＄敓鏁堢増鏈殑鐗堟湰鍙�
- *
- * @return
- */
- @GetMapping("/getNowAndLastUsableVersion")
- public Result<?> getNowAndLastUsableVersion(){
- return Result.OK(warehouseService.getNowAndLastUsableVersion());
- }
- /**
- * 鑾峰彇鎵�鏈夌増鏈彿
- *
- *
- */
- @GetMapping("/getVersionList")
- public Result<?> getAllVersion(){
- return Result.OK(warehouseService.getVersionList());
- }
- /**
- * 鏍规嵁鐗堟湰鑾峰彇鐗堟湰鍙�
- * @param version
- * @return
- *
- */
- @GetMapping("/getVersionStatusByVersion")
- public Result<?> getVersionStatusByVersion(@RequestParam(value = "version",required = false) Integer version){
- return Result.OK(warehouseService.getVersionStatusByVersion(version));
- }
- /**
- *
- * 鏌ヨ鐗堟湰鏄惁涓哄巻鍙茬増鏈�
- *
- */
- @GetMapping(value = "/getUpdateVersionPermission")
- public Result<?> getUpdatePermission(@RequestParam("version") Integer version){
- List<String> usableEnterpriseIds = enterpriseService.getUsableIdList();
- return Result.OK(warehouseService.list(new QueryWrapper<Warehouse>()
- .in("enterprise_id",usableEnterpriseIds)
- .eq("version",version)
- .eq("del_flag",0)));
- }
- /**
- *
- * 鏌ュ綋鍓嶇敓鏁堜紒涓氫笅鏈夋棤浠撳簱鍘嗗彶鐗堟湰
- *
- */
- @GetMapping(value = "/getNewVersionPermission")
- public Result<?> getNewVersionPermission(){
- List<String> usableEnterpriseIds = enterpriseService.getUsableIdList();
- return Result.OK(warehouseService.list(new QueryWrapper<Warehouse>().in("enterprise_id",usableEnterpriseIds).eq("del_flag",0)));
- }
- /**
- * 缁存姢鍗囩増
- * 闇�瑕佷竴娆″畬鎴�
- * @param
- * @return
- */
- @PostMapping("/updateVersionForChange")
- @Transactional
- public Result<?> updateVersionForChange(){
- Set<Integer> set = warehouseService.getVersionList();
- return Result.OK(set.stream().findFirst().get()+1);
- }
- /**
- * 娣诲姞
- * @param map
- * @return
- */
- @AutoLog(value = "浠撳簱-娣诲姞")
- @ApiOperation(value="浠撳簱-娣诲姞", notes="浠撳簱-娣诲姞")
- //@RequiresPermissions("org.jeecg.modules.demo:mom_base_warehouse:add")
- @PostMapping(value = "/add")
- public Result<String> add(@RequestBody Map<String,Object> map) {
- Warehouse warehouse = new Warehouse();
- warehouse.setCode(String.valueOf(map.get("code")))
- .setName(String.valueOf(map.get("name")))
- .setVersion(Integer.parseInt(String.valueOf(map.get("version"))))
- .setEnterpriseId(String.valueOf(map.get("enterpriseId")))
- .setRemark(String.valueOf(map.get("remark")))
- .setStatus(String.valueOf(map.get("status")))
- .setDelFlag(0);
- warehouseService.save(warehouse);
- QueryWrapper<Warehouse> queryWrapper = new QueryWrapper<Warehouse>()
- .eq("code",warehouse.getCode())
- .eq("version",warehouse.getVersion())
- .eq("del_flag",0);
- Warehouse selectWarehouse = warehouseService.getOne(queryWrapper,true);
- DataVersion dataVersion = new DataVersion();
- dataVersion.setBusinessId(selectWarehouse.getId())
- .setBusinessType("浠撳簱绠＄悊")
- .setVersion(selectWarehouse.getVersion())
- .setVersionStatus(String.valueOf(map.get("versionStatus")))
- .setDelFlag(0)
- .setEffectiveType("0")
- .setIsLastUsable("0");
- dataVersionService.save(dataVersion);
- QueryWrapper<DataVersion> queryWrapper1 = new QueryWrapper<DataVersion>()
- .eq("business_id",selectWarehouse.getId()).eq("del_flag",0);
- DataVersion selectDataVersion = dataVersionService.getOne(queryWrapper1,true);
- selectWarehouse.setDataVersionId(selectDataVersion.getId());
- warehouseService.saveOrUpdate(selectWarehouse);
- return Result.OK("娣诲姞鎴愬姛锛�");
- }
- /**
- * 鍗囩増
- * 闇�瑕佷竴娆″畬鎴�
- * @param map
- * @param
- * @return
- */
- @PostMapping("/updateVersion")
- @Transactional
- public Result<?> updateVersion(@RequestBody Map<String,Object> map){
- Integer version = Integer.parseInt((String)map.get("version"));
- //鑾峰彇鍗囩増鏁版嵁
- List<Warehouse> list = warehouseService.list(new QueryWrapper<Warehouse>()
- .eq("version",version)
- .eq("del_flag",0));
- //鑾峰彇鍗囩増鏁版嵁鐨勭増鏈俊鎭�
- QueryWrapper<DataVersion> queryWrapper = new QueryWrapper<DataVersion>()
- .in("business_id", list.stream().map(Warehouse::getId).collect(Collectors.toList()))
- .eq("del_flag",0);
- List<DataVersion> dataVersionList = dataVersionService.list(queryWrapper);
- Set<Integer> set = warehouseService.getVersionList();
- Optional<Integer> maxVersion = set.stream().findFirst();
- list.stream().forEach(warehouse -> {
- warehouse.setId("");
- warehouse.setVersion(maxVersion.get()+1);
- });
- warehouseService.saveBatch(list);
- List<Warehouse> newList = warehouseService
- .list(new QueryWrapper<Warehouse>()
- .eq("version",maxVersion.get()+1));
- List<DataVersion> newDataVersionList = new ArrayList<>();
- for(int i=0;i<newList.size();i++){
- DataVersion dataVersion = new DataVersion();
- for(int j=0;j<list.size();j++){
- for(int k=0;k<dataVersionList.size();k++){
- if(list.get(j).getCode().equals(newList.get(i).getCode())
- &&list.get(j).getDataVersionId().equals(dataVersionList.get(k).getId())) {
- dataVersion
- .setVersion(maxVersion.get() + 1)
- .setVersionStatus("1")
- .setBusinessId(newList.get(i).getId())
- .setDelFlag(0)
- .setSourceVersionId(dataVersionList.get(k).getId())
- .setBusinessType("浠撳簱绠＄悊")
- .setIsLastUsable("0");
- }
- }
- }
- newDataVersionList.add(dataVersion);
- }
- dataVersionService.saveBatch(newDataVersionList);
- List<String> dataVersionBusinessIdList = newDataVersionList.stream().map(DataVersion::getBusinessId).collect(Collectors.toList());
- QueryWrapper<DataVersion> queryWrapper1 = new QueryWrapper<DataVersion>().in("business_id",dataVersionBusinessIdList).eq("del_flag",0);
- List<DataVersion> selectDataVersionList = dataVersionService.list(queryWrapper1);
- for(int i=0;i<newList.size();i++){
- for(int j=0;j<selectDataVersionList.size();j++){
- if(newList.get(i).getId().equals(selectDataVersionList.get(j).getBusinessId())){
- newList.get(i).setDataVersionId(selectDataVersionList.get(j).getId());
- }
- }
- }
- warehouseService.updateBatchById(newList);
- return Result.OK(maxVersion.get()+1);
- }
- /**
- * 鐢熸晥
- * 闇�瑕佷竴娆℃�у畬鎴�
- * @param
- * @param map
- * @return
- */
- @PostMapping("/updateVersionStatusToUsable")
- @Transactional
- public Result<?> updateVersionStatusToUsable(@RequestBody Map<String,Object> map){
- Date date = new Date(System.currentTimeMillis());
- QuartzJob quartzJob = quartzJobService.getOne(new QueryWrapper<QuartzJob>()
- .eq("job_class_name","org.jeecg.modules.quartz.job.WarehouseSetUsableJob"),true);
- if(ObjectUtils.isNotNull(quartzJob)){
- quartzJobService.deleteAndStopJob(quartzJob);
- }
- Integer version = Integer.parseInt((String)map.get("version"));
- //鑾峰彇涓婃鐢熸晥鐗堟湰骞跺皢鍏舵槸鍚︿笂娆＄敓鏁堜綅缃疆涓哄惁
- List<Warehouse> lastUsableList = warehouseService.getLastUsableList();
- if(CollectionUtils.isNotEmpty(lastUsableList)){
- QueryWrapper<DataVersion> queryWrapper2 = new QueryWrapper<DataVersion>()
- .in("business_id",lastUsableList.stream()
- .map(Warehouse::getId)
- .collect(Collectors.toList()));
- List<DataVersion> lastUsableVersionList = dataVersionService.list(queryWrapper2);
- lastUsableVersionList.stream().forEach(dataVersion -> {
- dataVersion
- .setIsLastUsable("0");
- });
- dataVersionService.updateBatchById(lastUsableVersionList);
- }
- //鑾峰彇鐢熸晥鐗堟湰鍙婄増鏈俊鎭苟灏嗗叾缃负澶辨晥
- List<Warehouse> usableList = warehouseService.getUsableList();
- if(CollectionUtils.isNotEmpty(usableList)){
- QueryWrapper<DataVersion> queryWrapper = new QueryWrapper<DataVersion>()
- .in("business_id",usableList.stream()
- .map(Warehouse::getId)
- .collect(Collectors.toList()));
- List<DataVersion> usableDataVersionList = dataVersionService.list(queryWrapper);
- usableDataVersionList.stream().forEach(dataVersion -> {
- dataVersion
- .setVersionStatus("3")
- .setIsLastUsable("1")
- .setExpiredTime(date);
- });
- dataVersionService.updateBatchById(usableDataVersionList);
- }
- //鑾峰彇寰呯敓鏁堢増鏈強鐗堟湰淇℃伅骞跺皢鍏剁疆涓虹敓鏁�
- QueryWrapper<DataVersion> queryWrapper1 = new QueryWrapper<DataVersion>()
- .in("business_id",warehouseService.list(new QueryWrapper<Warehouse>()
- .eq("version",version)
- .eq("del_flag",0))
- .stream().map(Warehouse::getId)
- .collect(Collectors.toList()));
- List<DataVersion> dataVersionList = dataVersionService.list(queryWrapper1);
- dataVersionList.stream().forEach(dataVersion -> {
- dataVersion.setVersionStatus("2")
- .setEffectiveType("2")
- .setEffectiveTime(date)
- .setIsLastUsable("0");
- });
- //瀛樺叆鏁版嵁搴�
- dataVersionService.updateBatchById(dataVersionList);
- return Result.OK("鐢熸晥鎴愬姛");
- }
- /**
- * 瀹氭椂鐢熸晥
- * 闇�瑕佷竴娆℃�у畬鎴�
- * @param quartzJob
- * @param
- * @return
- */
- @PostMapping("/updateVersionStatusToUsableBySetTime")
- @Transactional
- public Result<?> updateVersionStatusToUsableBySetTime(@RequestBody QuartzJob quartzJob) throws ParseException {
- DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
- DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("ss mm HH dd MM ? yyyy");
- String jobClassName = quartzJob.getJobClassName();
- String time = quartzJob.getCronExpression();
- System.out.println(time);
- LocalDateTime localDateTime = LocalDateTime.parse(time,dateTimeFormatter);
- String cronStr=dateTimeFormatter1.format(localDateTime);
- quartzJob.setCronExpression(cronStr);
- QueryWrapper<QuartzJob> queryWrapper = new QueryWrapper();
- queryWrapper.eq("JOB_CLASS_NAME",jobClassName);
- List<QuartzJob> quartzJobs = quartzJobService.list(queryWrapper);
- if(CollectionUtils.isEmpty(quartzJobs)){
- quartzJobService.saveAndScheduleJob(quartzJob);
- quartzJobs = quartzJobService.list(queryWrapper);
- quartzJob.setId(quartzJobs.get(0).getId());
- quartzJobService.resumeJob(quartzJob);
- return Result.OK(quartzJob);
- }else{
- quartzJob.setId(quartzJobs.get(0).getId());
- quartzJobService.resumeJob(quartzJob);
- return Result.OK(quartzJob);
- }
-
- }
-
- /**
- * 缂栬緫
- * @param warehouse
- * @return
- */
- @AutoLog(value = "浠撳簱-缂栬緫")
- @ApiOperation(value="浠撳簱-缂栬緫", notes="浠撳簱-缂栬緫")
- //@RequiresPermissions("org.jeecg.modules.demo:mom_base_warehouse:edit")
- @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
- public Result<String> edit(@RequestBody Warehouse warehouse) {
- warehouseService.updateById(warehouse);
- return Result.OK("缂栬緫鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鍒犻櫎
- * @param id
- * @return
- */
- @AutoLog(value = "浠撳簱-閫氳繃id鍒犻櫎")
- @ApiOperation(value="浠撳簱-閫氳繃id鍒犻櫎", notes="浠撳簱-閫氳繃id鍒犻櫎")
- //@RequiresPermissions("org.jeecg.modules.demo:mom_base_warehouse:delete")
- @DeleteMapping(value = "/delete")
- public Result<String> delete(@RequestParam(name="id",required=true) String id) {
- dataVersionService.update(new UpdateWrapper<DataVersion>()
- .set("del_flag",1)
- .eq("business_id",id));
- UpdateWrapper updateWrapper = new UpdateWrapper();
- updateWrapper.set("del_flag","1");
- updateWrapper.eq("id",id);
- warehouseService.update(updateWrapper);
- return Result.OK("鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 鎵归噺鍒犻櫎
- * @param ids
- * @return
- */
- @AutoLog(value = "浠撳簱-鎵归噺鍒犻櫎")
- @ApiOperation(value="浠撳簱-鎵归噺鍒犻櫎", notes="浠撳簱-鎵归噺鍒犻櫎")
- //@RequiresPermissions("org.jeecg.modules.demo:mom_base_warehouse:deleteBatch")
- @DeleteMapping(value = "/deleteBatch")
- public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
- dataVersionService.update(new UpdateWrapper<DataVersion>()
- .set("del_flag",1)
- .in("business_id",Arrays.asList(ids.split(","))));
- warehouseService
- .update(new UpdateWrapper<Warehouse>()
- .in("id",Arrays.asList(ids.split(","))).set("del_flag",1));
- return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 瀵煎嚭
- * @return
- */
- //@RequiresPermissions("org.jeecg.modules.demo:mom_base_warehouse:exportXls")
- @RequestMapping(value = "/exportXls")
- public ModelAndView exportXls(HttpServletRequest request, Warehouse warehouse) {
- return super.exportXls(request, warehouse, Warehouse.class, "浠撳簱");
- }
-
- /**
- * 瀵煎叆
- * @return
- */
- //@RequiresPermissions("org.jeecg.modules.demo:mom_base_warehouse:importExcel")
- @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
- public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
- return super.importExcel(request, response, Warehouse.class);
- }
- /*---------------------------------涓昏〃澶勭悊-end-------------------------------------*/
-
-
- /*--------------------------------瀛愯〃澶勭悊-浠撳簱鏈嶅姟瀵硅薄-begin----------------------------------------------*/
- /**
- * 閫氳繃涓昏〃ID鏌ヨ
- * @return
- */
- @GetMapping("/checkWarehouseClient")
- public Result<?> checkClient(
- @RequestParam(name="clientId",required = false) String clientId,
- @RequestParam(name="warehouseId") String warehouseId){
- QueryWrapper<WarehouseClient> queryWrapper = new QueryWrapper<>();
- if(!StringUtils.isBlank(clientId)){
- queryWrapper.eq("client_id",clientId);
- }
- if(!StringUtils.isBlank(warehouseId)){
- queryWrapper.eq("warehouse_id",warehouseId);
- }
- queryWrapper.eq("del_flag","0");
- return Result.OK(warehouseClientService.list(queryWrapper));
- }
- /**
- * 閫氳繃涓昏〃ID鏌ヨ
- * @return
- */
- //@AutoLog(value = "浠撳簱鏈嶅姟瀵硅薄-閫氳繃涓昏〃ID鏌ヨ")
- @ApiOperation(value="浠撳簱鏈嶅姟瀵硅薄-閫氳繃涓昏〃ID鏌ヨ", notes="浠撳簱鏈嶅姟瀵硅薄-閫氳繃涓昏〃ID鏌ヨ")
- @GetMapping(value = "/listWarehouseClientByMainId")
- public Result<IPage<WarehouseClient>> listWarehouseClientByMainId(WarehouseClient warehouseClient,
- @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
- @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
- HttpServletRequest req) {
- QueryWrapper<WarehouseClient> queryWrapper = QueryGenerator.initQueryWrapper(warehouseClient, req.getParameterMap());
- queryWrapper.eq("del_flag",0);
- Page<WarehouseClient> page = new Page<WarehouseClient>(pageNo, pageSize);
- IPage<WarehouseClient> pageList = warehouseClientService.page(page, queryWrapper);
- return Result.OK(pageList);
- }
-
- /**
- * 娣诲姞
- * @param map
- * @return
- */
- @AutoLog(value = "浠撳簱鏈嶅姟瀵硅薄-娣诲姞")
- @ApiOperation(value="浠撳簱鏈嶅姟瀵硅薄-娣诲姞", notes="浠撳簱鏈嶅姟瀵硅薄-娣诲姞")
- @PostMapping(value = "/addWarehouseClient")
- public Result<String> addWarehouseClient(@RequestBody Map<String,Object> map) {
- List<Map<String,Object>> addDepartIds = (List<Map<String, Object>>) map.get("addDepartIds");
- List<Map<String,Object>> addFactoryIds = (List<Map<String, Object>>) map.get("addFactoryIds");
- String warehouseId = (String) map.get("warehouseId");
- if(CollectionUtils.isNotEmpty(addDepartIds)){
- List<WarehouseClient> warehouseClients=new ArrayList<>();
- addDepartIds.forEach(departMap->{
- WarehouseClient warehouseClient = new WarehouseClient();
- warehouseClient.setClientId((String) departMap.get("id"))
- .setWarehouseId(warehouseId)
- .setCode((String) departMap.get("orgCode"))
- .setName((String) departMap.get("departName"))
- .setElementType("缁勭粐閮ㄩ棬")
- .setDelFlag(0);
- warehouseClients.add(warehouseClient);
- });
- warehouseClientService.saveBatch(warehouseClients);
- }
-
- if(CollectionUtils.isNotEmpty(addFactoryIds)){
- List<WarehouseClient> warehouseClients=new ArrayList<>();
- addFactoryIds.forEach(factoryMap->{
- WarehouseClient warehouseClient = new WarehouseClient();
- warehouseClient.setClientId((String) factoryMap.get("id"))
- .setWarehouseId(warehouseId)
- .setCode((String) factoryMap.get("code"))
- .setName((String) factoryMap.get("name"))
- .setElementType("宸ュ巶")
- .setDelFlag(0);
- warehouseClients.add(warehouseClient);
- });
- warehouseClientService.saveBatch(warehouseClients);
- }
- return Result.OK("娣诲姞鎴愬姛锛�");
- }
-
- /**
- * 缂栬緫
- * @param map
- * @return
- */
- @AutoLog(value = "浠撳簱鏈嶅姟瀵硅薄-缂栬緫")
- @ApiOperation(value="浠撳簱鏈嶅姟瀵硅薄-缂栬緫", notes="浠撳簱鏈嶅姟瀵硅薄-缂栬緫")
- @RequestMapping(value = "/editWarehouseClient", method = {RequestMethod.PUT,RequestMethod.POST})
- public Result<String> editWarehouseClient(@RequestBody Map<String,Object> map) {
- List<Map<String,Object>> addDepartIds = (List<Map<String, Object>>) map.get("addDepartIds");
- List<Map<String,Object>> addFactoryIds = (List<Map<String, Object>>) map.get("addFactoryIds");
- String id = (String) map.get("id");
- if(CollectionUtils.isNotEmpty(addDepartIds)){
- UpdateWrapper<WarehouseClient> updateWrapper = new UpdateWrapper<WarehouseClient>()
- .eq("id",id)
- .set("code",(String)addDepartIds.get(0).get("orgCode"))
- .set("name",(String) addDepartIds.get(0).get("departName"));
- warehouseClientService.update(updateWrapper);
- }
-
- if(CollectionUtils.isNotEmpty(addFactoryIds)){
- UpdateWrapper<WarehouseClient> updateWrapper = new UpdateWrapper<WarehouseClient>()
- .eq("id",id)
- .set("code",(String)addFactoryIds.get(0).get("code"))
- .set("name",(String)addFactoryIds.get(0).get("name"));
- warehouseClientService.update(updateWrapper);
- }
- return Result.OK("缂栬緫鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鍒犻櫎
- * @param id
- * @return
- */
- @AutoLog(value = "浠撳簱鏈嶅姟瀵硅薄-閫氳繃id鍒犻櫎")
- @ApiOperation(value="浠撳簱鏈嶅姟瀵硅薄-閫氳繃id鍒犻櫎", notes="浠撳簱鏈嶅姟瀵硅薄-閫氳繃id鍒犻櫎")
- @DeleteMapping(value = "/deleteWarehouseClient")
- public Result<String> deleteWarehouseClient(@RequestParam(name="id",required=true) String id) {
- warehouseClientService.update( new UpdateWrapper<WarehouseClient>()
- .set("del_flag",1)
- .eq("id",id));
- return Result.OK("鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 鎵归噺鍒犻櫎
- * @param ids
- * @return
- */
- @AutoLog(value = "浠撳簱鏈嶅姟瀵硅薄-鎵归噺鍒犻櫎")
- @ApiOperation(value="浠撳簱鏈嶅姟瀵硅薄-鎵归噺鍒犻櫎", notes="浠撳簱鏈嶅姟瀵硅薄-鎵归噺鍒犻櫎")
- @DeleteMapping(value = "/deleteBatchWarehouseClient")
- public Result<String> deleteBatchWarehouseClient(@RequestParam(name="ids",required=true) String ids) {
- warehouseClientService.update(new UpdateWrapper<WarehouseClient>()
- .in("id",Arrays.asList(ids.split(",")))
- .set("del_flag",1));
- return Result.OK("鍒犻櫎鎴愬姛");
- }
-
- /**
- * 瀵煎嚭
- * @return
- */
- @RequestMapping(value = "/exportWarehouseClient")
- public ModelAndView exportWarehouseClient(HttpServletRequest request, WarehouseClient warehouseClient) {
- // Step.1 缁勮鏌ヨ鏉′欢
- QueryWrapper<WarehouseClient> queryWrapper = QueryGenerator.initQueryWrapper(warehouseClient, request.getParameterMap());
- LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-
- // Step.2 鑾峰彇瀵煎嚭鏁版嵁
- List<WarehouseClient> pageList = warehouseClientService.list(queryWrapper);
- List<WarehouseClient> exportList = null;
-
- // 杩囨护閫変腑鏁版嵁
- String selections = request.getParameter("selections");
- if (oConvertUtils.isNotEmpty(selections)) {
- List<String> selectionList = Arrays.asList(selections.split(","));
- exportList = pageList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList());
- } else {
- exportList = pageList;
- }
-
- // Step.3 AutoPoi 瀵煎嚭Excel
- ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
- //姝ゅ璁剧疆鐨刦ilename鏃犳晥,鍓嶇浼氶噸鏇存柊璁剧疆涓�涓�
- mv.addObject(NormalExcelConstants.FILE_NAME, "浠撳簱鏈嶅姟瀵硅薄");
- mv.addObject(NormalExcelConstants.CLASS, WarehouseClient.class);
- mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("浠撳簱鏈嶅姟瀵硅薄鎶ヨ〃", "瀵煎嚭浜�:" + sysUser.getRealname(), "浠撳簱鏈嶅姟瀵硅薄"));
- mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
- return mv;
- }
-
- /**
- * 瀵煎叆
- * @return
- */
- @RequestMapping(value = "/importWarehouseClient/{mainId}")
- public Result<?> importWarehouseClient(HttpServletRequest request, HttpServletResponse response, @PathVariable("mainId") String mainId) {
- MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
- Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
- for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
- // 鑾峰彇涓婁紶鏂囦欢瀵硅薄
- MultipartFile file = entity.getValue();
- ImportParams params = new ImportParams();
- params.setTitleRows(2);
- params.setHeadRows(1);
- params.setNeedSave(true);
- try {
- List<WarehouseClient> list = ExcelImportUtil.importExcel(file.getInputStream(), WarehouseClient.class, params);
- for (WarehouseClient temp : list) {
- temp.setWarehouseId(mainId);
- }
- long start = System.currentTimeMillis();
- warehouseClientService.saveBatch(list);
- log.info("娑堣�楁椂闂�" + (System.currentTimeMillis() - start) + "姣");
- return Result.OK("鏂囦欢瀵煎叆鎴愬姛锛佹暟鎹鏁帮細" + list.size());
- } catch (Exception e) {
- log.error(e.getMessage(), e);
- return Result.error("鏂囦欢瀵煎叆澶辫触:" + e.getMessage());
- } finally {
- try {
- file.getInputStream().close();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- }
- return Result.error("鏂囦欢瀵煎叆澶辫触锛�");
- }
- @GetMapping("/enterpriseList")
- public Result<?> getEnterpriseList(){
- return Result.OK(enterpriseService.getEnterpriseListByPid(new Page<>(),1,"0"));
- }
-
- /*--------------------------------瀛愯〃澶勭悊-浠撳簱鏈嶅姟瀵硅薄-end----------------------------------------------*/
-
-
-
- /**
- * 浠撳簱绠＄悊 鏂板
- * qsw
- */
- @PostMapping(value = "/addWarehouse")
- public Result<String> addWarehouse(@RequestBody Warehouse warehouse) {
- warehouseService.save(warehouse);
- return Result.OK("娣诲姞鎴愬姛锛�");
- }
-
-
- /**
- * 鍒嗛〉鍒楄〃鏌ヨ
- * qsw
- */
- @GetMapping(value = "/find")
- public Result<IPage<Warehouse>> queryPageList(Warehouse warehouse,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req) {
- QueryWrapper<Warehouse> queryWrapper = QueryGenerator.initQueryWrapper(warehouse, req.getParameterMap());
- Page<Warehouse> page = new Page<Warehouse>(pageNo, pageSize);
- IPage<Warehouse> pageList = warehouseService.page(page, queryWrapper);
- return Result.OK(pageList);
- }
-
- /**
- * 閫氳繃id鍒犻櫎
- * @param id
- * @return
- * qsw
- */
- @AutoLog(value = "浠撳簱-閫氳繃id鍒犻櫎")
- @ApiOperation(value="浠撳簱-閫氳繃id鍒犻櫎", notes="浠撳簱-閫氳繃id鍒犻櫎")
- //@RequiresPermissions("org.jeecg.modules.demo:mom_base_warehouse:delete")
- @DeleteMapping(value = "/deleteWarehouseAreaLocation")
- public Result<String> deleteWarehouseAreaLocation(@RequestParam(name="id",required=true) String id) {
-
- List<WarehouseLocation> warehouseLocations = warehouseLocationService.lambdaQuery()
- .eq(WarehouseLocation::getWarehouseId, id).eq(WarehouseLocation::getDelFlag, 0)
- .list();
- for (WarehouseLocation warehouseLocation : warehouseLocations) {
- warehouseLocationService.removeById(warehouseLocation);
- }
-
- List<WarehouseArea> warehouseAreas = warehouseAreaService.lambdaQuery()
- .eq(WarehouseArea::getWarehouseId, id)
- .eq(WarehouseArea::getDelFlag, 0).list();
- for (WarehouseArea warehouseArea : warehouseAreas) {
- warehouseAreaService.removeById(warehouseArea);
- }
- warehouseService.removeById(id);
- return Result.OK("鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鏌ヨ
- *qsw
- */
- @GetMapping(value = "/queryById")
- public Result<Warehouse> queryById(@RequestParam(name="id",required=true) String id) {
- Warehouse warehouse = warehouseService.getById(id);
- if(warehouse ==null) {
- return Result.error("鏈壘鍒板搴旀暟鎹�");
- }
- return Result.OK(warehouse);
- }
-
-}
+//package org.jeecg.modules.base.controller;
+//
+//import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+//import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+//import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+//import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+//import org.jeecg.common.system.query.QueryGenerator;
+//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+//import com.baomidou.mybatisplus.core.metadata.IPage;
+//import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+//import lombok.extern.slf4j.Slf4j;
+//import org.jeecg.common.system.base.controller.JeecgController;
+//import org.jeecg.common.api.vo.Result;
+//import org.jeecg.modules.base.entity.*;
+//import org.jeecg.modules.base.service.*;
+//import org.jeecg.modules.quartz.entity.QuartzJob;
+//import org.jeecg.modules.quartz.service.IQuartzJobService;
+//import org.jeecg.common.system.base.entity.DataVersion;
+//import org.jeecg.modules.system.service.IDataVersionService;
+//import org.jeecg.modules.system.service.ISysUserService;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.transaction.annotation.Transactional;
+//import org.springframework.web.bind.annotation.*;
+//import javax.servlet.http.HttpServletRequest;
+//import javax.servlet.http.HttpServletResponse;
+//import org.springframework.web.servlet.ModelAndView;
+//
+//import java.text.ParseException;
+//import java.time.LocalDateTime;
+//import java.time.format.DateTimeFormatter;
+//import java.util.*;
+//
+//import org.jeecg.common.util.oConvertUtils;
+//import io.swagger.annotations.Api;
+//import io.swagger.annotations.ApiOperation;
+//import org.jeecg.common.aspect.annotation.AutoLog;
+//import org.apache.shiro.SecurityUtils;
+//import org.jeecg.common.system.vo.LoginUser;
+//import org.jeecgframework.poi.excel.ExcelImportUtil;
+//import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+//import org.jeecgframework.poi.excel.entity.ExportParams;
+//import org.jeecgframework.poi.excel.entity.ImportParams;
+//import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+//import org.springframework.web.multipart.MultipartFile;
+//import org.springframework.web.multipart.MultipartHttpServletRequest;
+//import java.io.IOException;
+//import java.util.stream.Collectors;
+//
+// /**
+// * @Description: 浠撳簱
+// * @Author: jeecg-boot
+// * @Date: 2022-11-07
+// * @Version: V1.0
+// */
+//@Api(tags="浠撳簱绠＄悊")
+//@RestController
+// @RequestMapping("/base/warehouse")
+//@Slf4j
+//public class WarehouseController extends JeecgController<Warehouse, IWarehouseService> {
+//
+// @Autowired
+// private IWarehouseService warehouseService;
+//
+// @Autowired
+// private IWarehouseClientService warehouseClientService;
+//
+// @Autowired
+// private IEnterpriseService enterpriseService;
+//
+// @Autowired
+// private ISysUserService sysUserService;
+//
+// @Autowired
+// private IDataVersionService dataVersionService;
+//
+// @Autowired
+// private IQuartzJobService quartzJobService;
+//
+// @Autowired
+// private IWarehouseAreaService warehouseAreaService;
+//
+// @Autowired
+// private IWarehouseLocationService warehouseLocationService;
+//
+//
+// /*---------------------------------涓昏〃澶勭悊-begin-------------------------------------*/
+// /**
+// * 鑾峰彇鍒濆淇℃伅
+// *
+// *
+// */
+// @GetMapping("/getWarehouseInfo")
+// public Result<?> getFactoryInfo(){
+// Map<String,Object> infoMap = new HashMap<>(2);
+// LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+//// infoMap.put("enterpriseId",loginUser.getEnterpriseId());
+//// infoMap.put("version",warehouseService.getInitVersion());
+// return Result.OK(infoMap);
+// }
+// /**
+// * 琛ㄥ崟鏍￠獙
+// */
+// @GetMapping("/check")
+// public Result<?> check(@RequestParam(name="name",required = false) String name,
+// @RequestParam(name="enterpriseId",required = false) String enterpriseId,
+// @RequestParam(name="version",required = false) Integer version
+// ){
+// QueryWrapper<Warehouse> queryWrapper = new QueryWrapper<>();
+// if(!StringUtils.isBlank(name)){
+// queryWrapper.eq("name",name);
+// }
+// if(!StringUtils.isBlank(enterpriseId)){
+// queryWrapper.eq("enterprise_id",enterpriseId);
+// }
+// if(version!=null){
+// queryWrapper.eq("version",version);
+// }
+// queryWrapper.eq("del_flag","0");
+// return Result.OK(warehouseService.list(queryWrapper));
+// }
+// /**
+// * 鍒嗛〉鍒楄〃鏌ヨ
+// * @param map
+// * @param pageNo
+// * @param pageSize
+// * @param version
+// * @param enterpriseId
+// * @return
+// */
+// //@AutoLog(value = "浠撳簱-鍒嗛〉鍒楄〃鏌ヨ")
+// @ApiOperation(value="浠撳簱-鍒嗛〉鍒楄〃鏌ヨ", notes="浠撳簱-鍒嗛〉鍒楄〃鏌ヨ")
+// @GetMapping("/list")
+// public Result<?> list(Map map,
+// @RequestParam(name ="pageNo", defaultValue="1") Integer pageNo,
+// @RequestParam(name ="pageSize", defaultValue="10") Integer pageSize,
+// @RequestParam(name = "enterpriseId",required = false) String enterpriseId,
+// @RequestParam(name="version",required = false) Integer version){
+// Page<Map<String,Object>> page = new Page(pageNo, pageSize);
+// IPage<Map<String,Object>> pageList = warehouseService.getWarehouseList(page,version,enterpriseId);
+// return Result.OK(pageList);
+// }
+// /**
+// * 鑾峰彇褰撳墠鐢熸晥鐗堟湰鍜屼笂涓�娆＄敓鏁堢増鏈殑鐗堟湰鍙�
+// *
+// * @return
+// */
+// @GetMapping("/getNowAndLastUsableVersion")
+// public Result<?> getNowAndLastUsableVersion(){
+// return Result.OK(warehouseService.getNowAndLastUsableVersion());
+// }
+// /**
+// * 鑾峰彇鎵�鏈夌増鏈彿
+// *
+// *
+// */
+// @GetMapping("/getVersionList")
+// public Result<?> getAllVersion(){
+// return Result.OK(warehouseService.getVersionList());
+// }
+// /**
+// * 鏍规嵁鐗堟湰鑾峰彇鐗堟湰鍙�
+// * @param version
+// * @return
+// *
+// */
+// @GetMapping("/getVersionStatusByVersion")
+// public Result<?> getVersionStatusByVersion(@RequestParam(value = "version",required = false) Integer version){
+// return Result.OK(warehouseService.getVersionStatusByVersion(version));
+// }
+// /**
+// *
+// * 鏌ヨ鐗堟湰鏄惁涓哄巻鍙茬増鏈�
+// *
+// */
+// @GetMapping(value = "/getUpdateVersionPermission")
+// public Result<?> getUpdatePermission(@RequestParam("version") Integer version){
+// List<String> usableEnterpriseIds = enterpriseService.getUsableIdList();
+// return Result.OK(warehouseService.list(new QueryWrapper<Warehouse>()
+// .in("enterprise_id",usableEnterpriseIds)
+// .eq("version",version)
+// .eq("del_flag",0)));
+// }
+// /**
+// *
+// * 鏌ュ綋鍓嶇敓鏁堜紒涓氫笅鏈夋棤浠撳簱鍘嗗彶鐗堟湰
+// *
+// */
+// @GetMapping(value = "/getNewVersionPermission")
+// public Result<?> getNewVersionPermission(){
+// List<String> usableEnterpriseIds = enterpriseService.getUsableIdList();
+// return Result.OK(warehouseService.list(new QueryWrapper<Warehouse>().in("enterprise_id",usableEnterpriseIds).eq("del_flag",0)));
+// }
+// /**
+// * 缁存姢鍗囩増
+// * 闇�瑕佷竴娆″畬鎴�
+// * @param
+// * @return
+// */
+// @PostMapping("/updateVersionForChange")
+// @Transactional
+// public Result<?> updateVersionForChange(){
+// Set<Integer> set = warehouseService.getVersionList();
+// return Result.OK(set.stream().findFirst().get()+1);
+// }
+// /**
+// * 娣诲姞
+// * @param map
+// * @return
+// */
+// @AutoLog(value = "浠撳簱-娣诲姞")
+// @ApiOperation(value="浠撳簱-娣诲姞", notes="浠撳簱-娣诲姞")
+// //@RequiresPermissions("org.jeecg.modules.demo:mom_base_warehouse:add")
+// @PostMapping(value = "/add")
+// public Result<String> add(@RequestBody Map<String,Object> map) {
+// Warehouse warehouse = new Warehouse();
+// warehouse.setCode(String.valueOf(map.get("code")))
+// .setName(String.valueOf(map.get("name")))
+// .setVersion(Integer.parseInt(String.valueOf(map.get("version"))))
+// .setEnterpriseId(String.valueOf(map.get("enterpriseId")))
+// .setRemark(String.valueOf(map.get("remark")))
+// .setStatus(String.valueOf(map.get("status")))
+// .setDelFlag(0);
+// warehouseService.save(warehouse);
+// QueryWrapper<Warehouse> queryWrapper = new QueryWrapper<Warehouse>()
+// .eq("code",warehouse.getCode())
+// .eq("version",warehouse.getVersion())
+// .eq("del_flag",0);
+// Warehouse selectWarehouse = warehouseService.getOne(queryWrapper,true);
+// DataVersion dataVersion = new DataVersion();
+// dataVersion.setBusinessId(selectWarehouse.getId())
+// .setBusinessType("浠撳簱绠＄悊")
+// .setVersion(selectWarehouse.getVersion())
+// .setVersionStatus(String.valueOf(map.get("versionStatus")))
+// .setDelFlag(0)
+// .setEffectiveType("0")
+// .setIsLastUsable("0");
+// dataVersionService.save(dataVersion);
+// QueryWrapper<DataVersion> queryWrapper1 = new QueryWrapper<DataVersion>()
+// .eq("business_id",selectWarehouse.getId()).eq("del_flag",0);
+// DataVersion selectDataVersion = dataVersionService.getOne(queryWrapper1,true);
+// selectWarehouse.setDataVersionId(selectDataVersion.getId());
+// warehouseService.saveOrUpdate(selectWarehouse);
+// return Result.OK("娣诲姞鎴愬姛锛�");
+// }
+// /**
+// * 鍗囩増
+// * 闇�瑕佷竴娆″畬鎴�
+// * @param map
+// * @param
+// * @return
+// */
+// @PostMapping("/updateVersion")
+// @Transactional
+// public Result<?> updateVersion(@RequestBody Map<String,Object> map){
+// Integer version = Integer.parseInt((String)map.get("version"));
+// //鑾峰彇鍗囩増鏁版嵁
+// List<Warehouse> list = warehouseService.list(new QueryWrapper<Warehouse>()
+// .eq("version",version)
+// .eq("del_flag",0));
+// //鑾峰彇鍗囩増鏁版嵁鐨勭増鏈俊鎭�
+// QueryWrapper<DataVersion> queryWrapper = new QueryWrapper<DataVersion>()
+// .in("business_id", list.stream().map(Warehouse::getId).collect(Collectors.toList()))
+// .eq("del_flag",0);
+// List<DataVersion> dataVersionList = dataVersionService.list(queryWrapper);
+// Set<Integer> set = warehouseService.getVersionList();
+// Optional<Integer> maxVersion = set.stream().findFirst();
+// list.stream().forEach(warehouse -> {
+// warehouse.setId("");
+// warehouse.setVersion(maxVersion.get()+1);
+// });
+// warehouseService.saveBatch(list);
+// List<Warehouse> newList = warehouseService
+// .list(new QueryWrapper<Warehouse>()
+// .eq("version",maxVersion.get()+1));
+// List<DataVersion> newDataVersionList = new ArrayList<>();
+// for(int i=0;i<newList.size();i++){
+// DataVersion dataVersion = new DataVersion();
+// for(int j=0;j<list.size();j++){
+// for(int k=0;k<dataVersionList.size();k++){
+// if(list.get(j).getCode().equals(newList.get(i).getCode())
+// &&list.get(j).getDataVersionId().equals(dataVersionList.get(k).getId())) {
+// dataVersion
+// .setVersion(maxVersion.get() + 1)
+// .setVersionStatus("1")
+// .setBusinessId(newList.get(i).getId())
+// .setDelFlag(0)
+// .setSourceVersionId(dataVersionList.get(k).getId())
+// .setBusinessType("浠撳簱绠＄悊")
+// .setIsLastUsable("0");
+// }
+// }
+// }
+// newDataVersionList.add(dataVersion);
+// }
+// dataVersionService.saveBatch(newDataVersionList);
+// List<String> dataVersionBusinessIdList = newDataVersionList.stream().map(DataVersion::getBusinessId).collect(Collectors.toList());
+// QueryWrapper<DataVersion> queryWrapper1 = new QueryWrapper<DataVersion>().in("business_id",dataVersionBusinessIdList).eq("del_flag",0);
+// List<DataVersion> selectDataVersionList = dataVersionService.list(queryWrapper1);
+// for(int i=0;i<newList.size();i++){
+// for(int j=0;j<selectDataVersionList.size();j++){
+// if(newList.get(i).getId().equals(selectDataVersionList.get(j).getBusinessId())){
+// newList.get(i).setDataVersionId(selectDataVersionList.get(j).getId());
+// }
+// }
+// }
+// warehouseService.updateBatchById(newList);
+// return Result.OK(maxVersion.get()+1);
+// }
+// /**
+// * 鐢熸晥
+// * 闇�瑕佷竴娆℃�у畬鎴�
+// * @param
+// * @param map
+// * @return
+// */
+// @PostMapping("/updateVersionStatusToUsable")
+// @Transactional
+// public Result<?> updateVersionStatusToUsable(@RequestBody Map<String,Object> map){
+// Date date = new Date(System.currentTimeMillis());
+// QuartzJob quartzJob = quartzJobService.getOne(new QueryWrapper<QuartzJob>()
+// .eq("job_class_name","org.jeecg.modules.quartz.job.WarehouseSetUsableJob"),true);
+// if(ObjectUtils.isNotNull(quartzJob)){
+// quartzJobService.deleteAndStopJob(quartzJob);
+// }
+// Integer version = Integer.parseInt((String)map.get("version"));
+// //鑾峰彇涓婃鐢熸晥鐗堟湰骞跺皢鍏舵槸鍚︿笂娆＄敓鏁堜綅缃疆涓哄惁
+// List<Warehouse> lastUsableList = warehouseService.getLastUsableList();
+// if(CollectionUtils.isNotEmpty(lastUsableList)){
+// QueryWrapper<DataVersion> queryWrapper2 = new QueryWrapper<DataVersion>()
+// .in("business_id",lastUsableList.stream()
+// .map(Warehouse::getId)
+// .collect(Collectors.toList()));
+// List<DataVersion> lastUsableVersionList = dataVersionService.list(queryWrapper2);
+// lastUsableVersionList.stream().forEach(dataVersion -> {
+// dataVersion
+// .setIsLastUsable("0");
+// });
+// dataVersionService.updateBatchById(lastUsableVersionList);
+// }
+// //鑾峰彇鐢熸晥鐗堟湰鍙婄増鏈俊鎭苟灏嗗叾缃负澶辨晥
+// List<Warehouse> usableList = warehouseService.getUsableList();
+// if(CollectionUtils.isNotEmpty(usableList)){
+// QueryWrapper<DataVersion> queryWrapper = new QueryWrapper<DataVersion>()
+// .in("business_id",usableList.stream()
+// .map(Warehouse::getId)
+// .collect(Collectors.toList()));
+// List<DataVersion> usableDataVersionList = dataVersionService.list(queryWrapper);
+// usableDataVersionList.stream().forEach(dataVersion -> {
+// dataVersion
+// .setVersionStatus("3")
+// .setIsLastUsable("1")
+// .setExpiredTime(date);
+// });
+// dataVersionService.updateBatchById(usableDataVersionList);
+// }
+// //鑾峰彇寰呯敓鏁堢増鏈強鐗堟湰淇℃伅骞跺皢鍏剁疆涓虹敓鏁�
+// QueryWrapper<DataVersion> queryWrapper1 = new QueryWrapper<DataVersion>()
+// .in("business_id",warehouseService.list(new QueryWrapper<Warehouse>()
+// .eq("version",version)
+// .eq("del_flag",0))
+// .stream().map(Warehouse::getId)
+// .collect(Collectors.toList()));
+// List<DataVersion> dataVersionList = dataVersionService.list(queryWrapper1);
+// dataVersionList.stream().forEach(dataVersion -> {
+// dataVersion.setVersionStatus("2")
+// .setEffectiveType("2")
+// .setEffectiveTime(date)
+// .setIsLastUsable("0");
+// });
+// //瀛樺叆鏁版嵁搴�
+// dataVersionService.updateBatchById(dataVersionList);
+// return Result.OK("鐢熸晥鎴愬姛");
+// }
+// /**
+// * 瀹氭椂鐢熸晥
+// * 闇�瑕佷竴娆℃�у畬鎴�
+// * @param quartzJob
+// * @param
+// * @return
+// */
+// @PostMapping("/updateVersionStatusToUsableBySetTime")
+// @Transactional
+// public Result<?> updateVersionStatusToUsableBySetTime(@RequestBody QuartzJob quartzJob) throws ParseException {
+// DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+// DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("ss mm HH dd MM ? yyyy");
+// String jobClassName = quartzJob.getJobClassName();
+// String time = quartzJob.getCronExpression();
+// System.out.println(time);
+// LocalDateTime localDateTime = LocalDateTime.parse(time,dateTimeFormatter);
+// String cronStr=dateTimeFormatter1.format(localDateTime);
+// quartzJob.setCronExpression(cronStr);
+// QueryWrapper<QuartzJob> queryWrapper = new QueryWrapper();
+// queryWrapper.eq("JOB_CLASS_NAME",jobClassName);
+// List<QuartzJob> quartzJobs = quartzJobService.list(queryWrapper);
+// if(CollectionUtils.isEmpty(quartzJobs)){
+// quartzJobService.saveAndScheduleJob(quartzJob);
+// quartzJobs = quartzJobService.list(queryWrapper);
+// quartzJob.setId(quartzJobs.get(0).getId());
+// quartzJobService.resumeJob(quartzJob);
+// return Result.OK(quartzJob);
+// }else{
+// quartzJob.setId(quartzJobs.get(0).getId());
+// quartzJobService.resumeJob(quartzJob);
+// return Result.OK(quartzJob);
+// }
+//
+// }
+//
+// /**
+// * 缂栬緫
+// * @param warehouse
+// * @return
+// */
+// @AutoLog(value = "浠撳簱-缂栬緫")
+// @ApiOperation(value="浠撳簱-缂栬緫", notes="浠撳簱-缂栬緫")
+// //@RequiresPermissions("org.jeecg.modules.demo:mom_base_warehouse:edit")
+// @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+// public Result<String> edit(@RequestBody Warehouse warehouse) {
+// warehouseService.updateById(warehouse);
+// return Result.OK("缂栬緫鎴愬姛!");
+// }
+//
+// /**
+// * 閫氳繃id鍒犻櫎
+// * @param id
+// * @return
+// */
+// @AutoLog(value = "浠撳簱-閫氳繃id鍒犻櫎")
+// @ApiOperation(value="浠撳簱-閫氳繃id鍒犻櫎", notes="浠撳簱-閫氳繃id鍒犻櫎")
+// //@RequiresPermissions("org.jeecg.modules.demo:mom_base_warehouse:delete")
+// @DeleteMapping(value = "/delete")
+// public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+// dataVersionService.update(new UpdateWrapper<DataVersion>()
+// .set("del_flag",1)
+// .eq("business_id",id));
+// UpdateWrapper updateWrapper = new UpdateWrapper();
+// updateWrapper.set("del_flag","1");
+// updateWrapper.eq("id",id);
+// warehouseService.update(updateWrapper);
+// return Result.OK("鍒犻櫎鎴愬姛!");
+// }
+//
+// /**
+// * 鎵归噺鍒犻櫎
+// * @param ids
+// * @return
+// */
+// @AutoLog(value = "浠撳簱-鎵归噺鍒犻櫎")
+// @ApiOperation(value="浠撳簱-鎵归噺鍒犻櫎", notes="浠撳簱-鎵归噺鍒犻櫎")
+// //@RequiresPermissions("org.jeecg.modules.demo:mom_base_warehouse:deleteBatch")
+// @DeleteMapping(value = "/deleteBatch")
+// public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+// dataVersionService.update(new UpdateWrapper<DataVersion>()
+// .set("del_flag",1)
+// .in("business_id",Arrays.asList(ids.split(","))));
+// warehouseService
+// .update(new UpdateWrapper<Warehouse>()
+// .in("id",Arrays.asList(ids.split(","))).set("del_flag",1));
+// return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
+// }
+//
+// /**
+// * 瀵煎嚭
+// * @return
+// */
+// //@RequiresPermissions("org.jeecg.modules.demo:mom_base_warehouse:exportXls")
+// @RequestMapping(value = "/exportXls")
+// public ModelAndView exportXls(HttpServletRequest request, Warehouse warehouse) {
+// return super.exportXls(request, warehouse, Warehouse.class, "浠撳簱");
+// }
+//
+// /**
+// * 瀵煎叆
+// * @return
+// */
+// //@RequiresPermissions("org.jeecg.modules.demo:mom_base_warehouse:importExcel")
+// @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+// public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+// return super.importExcel(request, response, Warehouse.class);
+// }
+// /*---------------------------------涓昏〃澶勭悊-end-------------------------------------*/
+//
+//
+// /*--------------------------------瀛愯〃澶勭悊-浠撳簱鏈嶅姟瀵硅薄-begin----------------------------------------------*/
+// /**
+// * 閫氳繃涓昏〃ID鏌ヨ
+// * @return
+// */
+// @GetMapping("/checkWarehouseClient")
+// public Result<?> checkClient(
+// @RequestParam(name="clientId",required = false) String clientId,
+// @RequestParam(name="warehouseId") String warehouseId){
+// QueryWrapper<WarehouseClient> queryWrapper = new QueryWrapper<>();
+// if(!StringUtils.isBlank(clientId)){
+// queryWrapper.eq("client_id",clientId);
+// }
+// if(!StringUtils.isBlank(warehouseId)){
+// queryWrapper.eq("warehouse_id",warehouseId);
+// }
+// queryWrapper.eq("del_flag","0");
+// return Result.OK(warehouseClientService.list(queryWrapper));
+// }
+// /**
+// * 閫氳繃涓昏〃ID鏌ヨ
+// * @return
+// */
+// //@AutoLog(value = "浠撳簱鏈嶅姟瀵硅薄-閫氳繃涓昏〃ID鏌ヨ")
+// @ApiOperation(value="浠撳簱鏈嶅姟瀵硅薄-閫氳繃涓昏〃ID鏌ヨ", notes="浠撳簱鏈嶅姟瀵硅薄-閫氳繃涓昏〃ID鏌ヨ")
+// @GetMapping(value = "/listWarehouseClientByMainId")
+// public Result<IPage<WarehouseClient>> listWarehouseClientByMainId(WarehouseClient warehouseClient,
+// @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+// @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+// HttpServletRequest req) {
+// QueryWrapper<WarehouseClient> queryWrapper = QueryGenerator.initQueryWrapper(warehouseClient, req.getParameterMap());
+// queryWrapper.eq("del_flag",0);
+// Page<WarehouseClient> page = new Page<WarehouseClient>(pageNo, pageSize);
+// IPage<WarehouseClient> pageList = warehouseClientService.page(page, queryWrapper);
+// return Result.OK(pageList);
+// }
+//
+// /**
+// * 娣诲姞
+// * @param map
+// * @return
+// */
+// @AutoLog(value = "浠撳簱鏈嶅姟瀵硅薄-娣诲姞")
+// @ApiOperation(value="浠撳簱鏈嶅姟瀵硅薄-娣诲姞", notes="浠撳簱鏈嶅姟瀵硅薄-娣诲姞")
+// @PostMapping(value = "/addWarehouseClient")
+// public Result<String> addWarehouseClient(@RequestBody Map<String,Object> map) {
+// List<Map<String,Object>> addDepartIds = (List<Map<String, Object>>) map.get("addDepartIds");
+// List<Map<String,Object>> addFactoryIds = (List<Map<String, Object>>) map.get("addFactoryIds");
+// String warehouseId = (String) map.get("warehouseId");
+// if(CollectionUtils.isNotEmpty(addDepartIds)){
+// List<WarehouseClient> warehouseClients=new ArrayList<>();
+// addDepartIds.forEach(departMap->{
+// WarehouseClient warehouseClient = new WarehouseClient();
+// warehouseClient.setClientId((String) departMap.get("id"))
+// .setWarehouseId(warehouseId)
+// .setCode((String) departMap.get("orgCode"))
+// .setName((String) departMap.get("departName"))
+// .setElementType("缁勭粐閮ㄩ棬")
+// .setDelFlag(0);
+// warehouseClients.add(warehouseClient);
+// });
+// warehouseClientService.saveBatch(warehouseClients);
+// }
+//
+// if(CollectionUtils.isNotEmpty(addFactoryIds)){
+// List<WarehouseClient> warehouseClients=new ArrayList<>();
+// addFactoryIds.forEach(factoryMap->{
+// WarehouseClient warehouseClient = new WarehouseClient();
+// warehouseClient.setClientId((String) factoryMap.get("id"))
+// .setWarehouseId(warehouseId)
+// .setCode((String) factoryMap.get("code"))
+// .setName((String) factoryMap.get("name"))
+// .setElementType("宸ュ巶")
+// .setDelFlag(0);
+// warehouseClients.add(warehouseClient);
+// });
+// warehouseClientService.saveBatch(warehouseClients);
+// }
+// return Result.OK("娣诲姞鎴愬姛锛�");
+// }
+//
+// /**
+// * 缂栬緫
+// * @param map
+// * @return
+// */
+// @AutoLog(value = "浠撳簱鏈嶅姟瀵硅薄-缂栬緫")
+// @ApiOperation(value="浠撳簱鏈嶅姟瀵硅薄-缂栬緫", notes="浠撳簱鏈嶅姟瀵硅薄-缂栬緫")
+// @RequestMapping(value = "/editWarehouseClient", method = {RequestMethod.PUT,RequestMethod.POST})
+// public Result<String> editWarehouseClient(@RequestBody Map<String,Object> map) {
+// List<Map<String,Object>> addDepartIds = (List<Map<String, Object>>) map.get("addDepartIds");
+// List<Map<String,Object>> addFactoryIds = (List<Map<String, Object>>) map.get("addFactoryIds");
+// String id = (String) map.get("id");
+// if(CollectionUtils.isNotEmpty(addDepartIds)){
+// UpdateWrapper<WarehouseClient> updateWrapper = new UpdateWrapper<WarehouseClient>()
+// .eq("id",id)
+// .set("code",(String)addDepartIds.get(0).get("orgCode"))
+// .set("name",(String) addDepartIds.get(0).get("departName"));
+// warehouseClientService.update(updateWrapper);
+// }
+//
+// if(CollectionUtils.isNotEmpty(addFactoryIds)){
+// UpdateWrapper<WarehouseClient> updateWrapper = new UpdateWrapper<WarehouseClient>()
+// .eq("id",id)
+// .set("code",(String)addFactoryIds.get(0).get("code"))
+// .set("name",(String)addFactoryIds.get(0).get("name"));
+// warehouseClientService.update(updateWrapper);
+// }
+// return Result.OK("缂栬緫鎴愬姛!");
+// }
+//
+// /**
+// * 閫氳繃id鍒犻櫎
+// * @param id
+// * @return
+// */
+// @AutoLog(value = "浠撳簱鏈嶅姟瀵硅薄-閫氳繃id鍒犻櫎")
+// @ApiOperation(value="浠撳簱鏈嶅姟瀵硅薄-閫氳繃id鍒犻櫎", notes="浠撳簱鏈嶅姟瀵硅薄-閫氳繃id鍒犻櫎")
+// @DeleteMapping(value = "/deleteWarehouseClient")
+// public Result<String> deleteWarehouseClient(@RequestParam(name="id",required=true) String id) {
+// warehouseClientService.update( new UpdateWrapper<WarehouseClient>()
+// .set("del_flag",1)
+// .eq("id",id));
+// return Result.OK("鍒犻櫎鎴愬姛!");
+// }
+//
+// /**
+// * 鎵归噺鍒犻櫎
+// * @param ids
+// * @return
+// */
+// @AutoLog(value = "浠撳簱鏈嶅姟瀵硅薄-鎵归噺鍒犻櫎")
+// @ApiOperation(value="浠撳簱鏈嶅姟瀵硅薄-鎵归噺鍒犻櫎", notes="浠撳簱鏈嶅姟瀵硅薄-鎵归噺鍒犻櫎")
+// @DeleteMapping(value = "/deleteBatchWarehouseClient")
+// public Result<String> deleteBatchWarehouseClient(@RequestParam(name="ids",required=true) String ids) {
+// warehouseClientService.update(new UpdateWrapper<WarehouseClient>()
+// .in("id",Arrays.asList(ids.split(",")))
+// .set("del_flag",1));
+// return Result.OK("鍒犻櫎鎴愬姛");
+// }
+//
+// /**
+// * 瀵煎嚭
+// * @return
+// */
+// @RequestMapping(value = "/exportWarehouseClient")
+// public ModelAndView exportWarehouseClient(HttpServletRequest request, WarehouseClient warehouseClient) {
+// // Step.1 缁勮鏌ヨ鏉′欢
+// QueryWrapper<WarehouseClient> queryWrapper = QueryGenerator.initQueryWrapper(warehouseClient, request.getParameterMap());
+// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+//
+// // Step.2 鑾峰彇瀵煎嚭鏁版嵁
+// List<WarehouseClient> pageList = warehouseClientService.list(queryWrapper);
+// List<WarehouseClient> exportList = null;
+//
+// // 杩囨护閫変腑鏁版嵁
+// String selections = request.getParameter("selections");
+// if (oConvertUtils.isNotEmpty(selections)) {
+// List<String> selectionList = Arrays.asList(selections.split(","));
+// exportList = pageList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList());
+// } else {
+// exportList = pageList;
+// }
+//
+// // Step.3 AutoPoi 瀵煎嚭Excel
+// ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+// //姝ゅ璁剧疆鐨刦ilename鏃犳晥,鍓嶇浼氶噸鏇存柊璁剧疆涓�涓�
+// mv.addObject(NormalExcelConstants.FILE_NAME, "浠撳簱鏈嶅姟瀵硅薄");
+// mv.addObject(NormalExcelConstants.CLASS, WarehouseClient.class);
+// mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("浠撳簱鏈嶅姟瀵硅薄鎶ヨ〃", "瀵煎嚭浜�:" + sysUser.getRealname(), "浠撳簱鏈嶅姟瀵硅薄"));
+// mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
+// return mv;
+// }
+//
+// /**
+// * 瀵煎叆
+// * @return
+// */
+// @RequestMapping(value = "/importWarehouseClient/{mainId}")
+// public Result<?> importWarehouseClient(HttpServletRequest request, HttpServletResponse response, @PathVariable("mainId") String mainId) {
+// MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+// Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+// for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+// // 鑾峰彇涓婁紶鏂囦欢瀵硅薄
+// MultipartFile file = entity.getValue();
+// ImportParams params = new ImportParams();
+// params.setTitleRows(2);
+// params.setHeadRows(1);
+// params.setNeedSave(true);
+// try {
+// List<WarehouseClient> list = ExcelImportUtil.importExcel(file.getInputStream(), WarehouseClient.class, params);
+// for (WarehouseClient temp : list) {
+// temp.setWarehouseId(mainId);
+// }
+// long start = System.currentTimeMillis();
+// warehouseClientService.saveBatch(list);
+// log.info("娑堣�楁椂闂�" + (System.currentTimeMillis() - start) + "姣");
+// return Result.OK("鏂囦欢瀵煎叆鎴愬姛锛佹暟鎹鏁帮細" + list.size());
+// } catch (Exception e) {
+// log.error(e.getMessage(), e);
+// return Result.error("鏂囦欢瀵煎叆澶辫触:" + e.getMessage());
+// } finally {
+// try {
+// file.getInputStream().close();
+// } catch (IOException e) {
+// e.printStackTrace();
+// }
+// }
+// }
+// return Result.error("鏂囦欢瀵煎叆澶辫触锛�");
+// }
+// @GetMapping("/enterpriseList")
+// public Result<?> getEnterpriseList(){
+// return Result.OK(enterpriseService.getEnterpriseListByPid(new Page<>(),1,"0"));
+// }
+//
+// /*--------------------------------瀛愯〃澶勭悊-浠撳簱鏈嶅姟瀵硅薄-end----------------------------------------------*/
+//
+//
+//
+// /**
+// * 浠撳簱绠＄悊 鏂板
+// * qsw
+// */
+// @PostMapping(value = "/addWarehouse")
+// public Result<String> addWarehouse(@RequestBody Warehouse warehouse) {
+// warehouseService.save(warehouse);
+// return Result.OK("娣诲姞鎴愬姛锛�");
+// }
+//
+//
+// /**
+// * 鍒嗛〉鍒楄〃鏌ヨ
+// * qsw
+// */
+// @GetMapping(value = "/find")
+// public Result<IPage<Warehouse>> queryPageList(Warehouse warehouse,
+// @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+// @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+// HttpServletRequest req) {
+// QueryWrapper<Warehouse> queryWrapper = QueryGenerator.initQueryWrapper(warehouse, req.getParameterMap());
+// Page<Warehouse> page = new Page<Warehouse>(pageNo, pageSize);
+// IPage<Warehouse> pageList = warehouseService.page(page, queryWrapper);
+// return Result.OK(pageList);
+// }
+//
+// /**
+// * 閫氳繃id鍒犻櫎
+// * @param id
+// * @return
+// * qsw
+// */
+// @AutoLog(value = "浠撳簱-閫氳繃id鍒犻櫎")
+// @ApiOperation(value="浠撳簱-閫氳繃id鍒犻櫎", notes="浠撳簱-閫氳繃id鍒犻櫎")
+// //@RequiresPermissions("org.jeecg.modules.demo:mom_base_warehouse:delete")
+// @DeleteMapping(value = "/deleteWarehouseAreaLocation")
+// public Result<String> deleteWarehouseAreaLocation(@RequestParam(name="id",required=true) String id) {
+//
+// List<WarehouseLocation> warehouseLocations = warehouseLocationService.lambdaQuery()
+// .eq(WarehouseLocation::getWarehouseId, id).eq(WarehouseLocation::getDelFlag, 0)
+// .list();
+// for (WarehouseLocation warehouseLocation : warehouseLocations) {
+// warehouseLocationService.removeById(warehouseLocation);
+// }
+//
+// List<WarehouseArea> warehouseAreas = warehouseAreaService.lambdaQuery()
+// .eq(WarehouseArea::getWarehouseId, id)
+// .eq(WarehouseArea::getDelFlag, 0).list();
+// for (WarehouseArea warehouseArea : warehouseAreas) {
+// warehouseAreaService.removeById(warehouseArea);
+// }
+// warehouseService.removeById(id);
+// return Result.OK("鍒犻櫎鎴愬姛!");
+// }
+//
+// /**
+// * 閫氳繃id鏌ヨ
+// *qsw
+// */
+// @GetMapping(value = "/queryById")
+// public Result<Warehouse> queryById(@RequestParam(name="id",required=true) String id) {
+// Warehouse warehouse = warehouseService.getById(id);
+// if(warehouse ==null) {
+// return Result.error("鏈壘鍒板搴旀暟鎹�");
+// }
+// return Result.OK(warehouse);
+// }
+//
+//}
--
Gitblit v1.9.3