suojin
/
jonhon-mes-svr
23
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

仓库管理更新

Browse Source
liweidong
wusiyu 4 months ago
parent 183502d39f
commit b00c1b3c43
69 changed files with 406 additions and 574 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/feign/StGlassCakeOutClient.java
  2. 2
      blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/feign/StRealtimeStockClient.java
  3. 1
      blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/feign/StRealtimeStockClientFallback.java
  4. 3
      blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/dto/StLendDTO.java
  5. 1
      blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/dto/StPdmPartDTO.java
  6. 1
      blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StBuyOrder.java
  7. 1
      blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StClassRequest.java
  8. 3
      blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StErpWarehouseTransfer.java
  9. 1
      blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StExpireSubmission.java
  10. 1
      blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StGoodsExt.java
  11. 1
      blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StMoldApplyFor.java
  12. 1
      blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StWmsRequest.java
  13. 1
      blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/vo/StBuyOrderVO.java
  14. 1
      blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/vo/StClassRequestVO.java
  15. 1
      blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/vo/StExpireRecordVO.java
  16. 1
      blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/vo/StWarehouseTransferRecordVO.java
  17. 4
      blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StAllotRecordController.java
  18. 1
      blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StBuyOrderController.java
  19. 2
      blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StClassRequestController.java
  20. 6
      blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StComboxController.java
  21. 35
      blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StErpWarehouseTransferController.java
  22. 38
      blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StExpireRecordController.java
  23. 42
      blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StExpireSubmissionController.java
  24. 2
      blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGlassCakeOutController.java
  25. 35
      blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGoodsClassController.java
  26. 35
      blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGoodsExtController.java
  27. 4
      blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StLendController.java
  28. 34
      blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StMoldApplyForController.java
  29. 34
      blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StMoldBaseController.java
  30. 8
      blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StOtherOutRecordController.java
  31. 35
      blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StOtherReceiptRecordController.java
  32. 40
      blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StRealtimeStockController.java
  33. 11
      blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StRequisitionController.java
  34. 34
      blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StReturnRecordController.java
  35. 39
      blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StStorageLocationController.java
  36. 8
      blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StStorehouseController.java
  37. 36
      blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StWmsRequestController.java
  38. 3
      blade-service/blade-wms/src/main/java/org/springblade/wms/feign/StGlassCakeOutClientImpl.java
  39. 1
      blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/PvBomRequestMapper.java
  40. 2
      blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StBuyOrderMapper.java
  41. 2
      blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StExpireSubmissionMapper.java
  42. 2
      blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StStorehouseMapper.java
  43. 1
      blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StUserRightMapper.java
  44. 1
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/IPvBomRequestService.java
  45. 1
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStBuyOrderService.java
  46. 2
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStExpireRecordService.java
  47. 1
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStLendService.java
  48. 1
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStOtherOutRecordService.java
  49. 1
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStOtherReceiptRecordService.java
  50. 1
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStStorehouseService.java
  51. 2
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStUserRightService.java
  52. 1
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/ISyDockingLogService.java
  53. 3
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/PvBomRequestServiceImpl.java
  54. 12
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StAllotRecordServiceImpl.java
  55. 9
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StBuyOrderServiceImpl.java
  56. 1
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StErpWarehouseTransferServiceImpl.java
  57. 2
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StExpireRecordServiceImpl.java
  58. 5
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StExpireSubmissionServiceImpl.java
  59. 10
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StGlassCakeOutServiceImpl.java
  60. 1
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StGoodsExtServiceImpl.java
  61. 1
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StGoodsServiceImpl.java
  62. 19
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StHttpRequestService.java
  63. 13
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StLendServiceImpl.java
  64. 5
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StMoldApplyForServiceImpl.java
  65. 1
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StMoldBaseServiceImpl.java
  66. 7
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StRealtimeStockServiceImpl.java
  67. 11
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StStorehouseServiceImpl.java
  68. 11
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StUserRightServiceImpl.java
  69. 2
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/SyDockingLogServiceImpl.java

2
blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/feign/StGlassCakeOutClient.java
Unescape View File

@ -1,12 +1,10 @@
package org.springblade.wms.feign;
import io.swagger.v3.oas.annotations.Parameter;
import org.springblade.core.tool.api.R;
import org.springblade.wms.pojo.dto.StGlassCakeOutDTO;
import org.springblade.wms.pojo.entity.StGlassCakeOut;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import java.util.List;

2
blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/feign/StRealtimeStockClient.java
Unescape View File

@ -1,6 +1,5 @@
package org.springblade.wms.feign;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
@ -11,7 +10,6 @@ import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
/**
* 仓库实时结余远程调用

1
blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/feign/StRealtimeStockClientFallback.java
Unescape View File

@ -1,6 +1,5 @@
package org.springblade.wms.feign;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;

3
blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/dto/StLendDTO.java
Unescape View File

@ -1,14 +1,11 @@
package org.springblade.wms.pojo.dto;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.Valid;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.wms.pojo.entity.StLend;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serial;
import java.util.Date;
import java.util.List;
/**

1
blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/dto/StPdmPartDTO.java
Unescape View File

@ -2,7 +2,6 @@ package org.springblade.wms.pojo.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serial;
import java.io.Serializable;

1
blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StBuyOrder.java
Unescape View File

@ -6,7 +6,6 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.tenant.mp.TenantEntity;
import org.springframework.format.annotation.DateTimeFormat;

1
blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StClassRequest.java
Unescape View File

@ -1,6 +1,5 @@
package org.springblade.wms.pojo.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

3
blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StErpWarehouseTransfer.java
Unescape View File

@ -6,12 +6,9 @@ import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.core.tenant.mp.TenantEntity;
import org.springframework.data.annotation.Transient;
import java.io.Serial;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
* @version 1.0

1
blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StExpireSubmission.java
Unescape View File

@ -1,6 +1,5 @@
package org.springblade.wms.pojo.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

1
blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StGoodsExt.java
Unescape View File

@ -5,7 +5,6 @@ import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.core.mp.base.BaseEntity;
import org.springblade.core.tenant.mp.TenantEntity;
import java.io.Serial;

1
blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StMoldApplyFor.java
Unescape View File

@ -5,7 +5,6 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.core.mp.base.BaseEntity;
import org.springblade.core.tenant.mp.TenantEntity;
import org.springframework.format.annotation.DateTimeFormat;

1
blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StWmsRequest.java
Unescape View File

@ -1,6 +1,5 @@
package org.springblade.wms.pojo.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

1
blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/vo/StBuyOrderVO.java
Unescape View File

@ -9,7 +9,6 @@ import org.springblade.wms.pojo.entity.StBuyOrder;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serial;
import java.util.Date;
/**
* @version 1.0

1
blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/vo/StClassRequestVO.java
Unescape View File

@ -7,7 +7,6 @@ import lombok.EqualsAndHashCode;
import org.springblade.wms.pojo.entity.StClassRequest;
import java.io.Serial;
import java.util.Date;
/**
* @version 1.0

1
blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/vo/StExpireRecordVO.java
Unescape View File

@ -9,7 +9,6 @@ import org.springblade.wms.pojo.entity.StExpireRecord;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serial;
import java.math.BigDecimal;
import java.util.Date;
/**

1
blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/vo/StWarehouseTransferRecordVO.java
Unescape View File

@ -1,6 +1,5 @@
package org.springblade.wms.pojo.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.wms.pojo.entity.StWarehouseTransferRecord;

4
blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StAllotRecordController.java
Unescape View File

@ -15,10 +15,7 @@ import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.system.cache.DictCache;
import org.springblade.wms.excel.StOtherReceiptRecordExcel;
import org.springblade.wms.pojo.entity.StAllotRecord;
import org.springblade.wms.pojo.entity.StOtherReceiptRecord;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@ -29,7 +26,6 @@ import org.springblade.wms.service.IStAllotRecordService;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.tool.constant.BladeConstant;
import java.util.ArrayList;
import java.util.Map;

1
blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StBuyOrderController.java
Unescape View File

@ -10,7 +10,6 @@ import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
import lombok.AllArgsConstructor;
import org.checkerframework.checker.units.qual.A;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;

2
blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StClassRequestController.java
Unescape View File

@ -15,7 +15,6 @@ import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.wms.pojo.entity.StBuyOrder;
import org.springblade.wms.pojo.entity.StClassRequest;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@ -27,7 +26,6 @@ import org.springblade.wms.service.IStClassRequestService;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.tool.constant.BladeConstant;
import java.util.HashMap;
import java.util.Map;

6
blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StComboxController.java
Unescape View File

@ -4,22 +4,16 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletRequest;
import lombok.AllArgsConstructor;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
/*import org.springblade.system.feign.ISysClient;
import org.springblade.system.pojo.entity.Dept;
import org.springblade.system.pojo.vo.DeptVO;*/
import org.springblade.wms.pojo.entity.StGoods;
import org.springblade.wms.pojo.entity.StRealtimeStock;
import org.springblade.wms.pojo.entity.StUserRight;

35
blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StErpWarehouseTransferController.java
Unescape View File

@ -1,41 +1,38 @@
package org.springblade.wms.controller;
import cn.hutool.core.collection.CollUtil;
import io.swagger.v3.oas.annotations.tags.Tag;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.IsAdmin;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.IsAdmin;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.wms.excel.StErpWarehouseTransferExcel;
import org.springblade.wms.pojo.entity.StErpWarehouseTransfer;
import org.springblade.wms.pojo.entity.StMoldBase;
import org.springblade.wms.pojo.vo.StMoldBaseVO;
import org.springblade.wms.service.IStMoldBaseService;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.wms.pojo.vo.StErpWarehouseTransferVO;
import org.springblade.wms.excel.StErpWarehouseTransferExcel;
import org.springblade.wms.wrapper.StErpWarehouseTransferWrapper;
import org.springblade.wms.service.IStErpWarehouseTransferService;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.tool.constant.BladeConstant;
import org.springblade.wms.service.IStMoldBaseService;
import org.springblade.wms.wrapper.StErpWarehouseTransferWrapper;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
import java.util.List;
import jakarta.servlet.http.HttpServletResponse;
import java.util.Map;
/**
* @version 1.0

38
blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StExpireRecordController.java
Unescape View File

@ -1,41 +1,36 @@
package org.springblade.wms.controller;
import io.swagger.v3.oas.annotations.tags.Tag;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.IsAdmin;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.IsAdmin;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.wms.excel.StExpireRecordExcel;
import org.springblade.wms.pojo.dto.StExpireRecordDTO;
import org.springblade.wms.pojo.entity.StExpireRecord;
import org.springblade.wms.pojo.vo.StExpireRecordVO;
import org.springblade.wms.service.IStExpireRecordService;
import org.springblade.wms.service.IStOtherOutRecordService;
import org.springblade.wms.wrapper.StExpireRecordWrapper;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.wms.pojo.vo.StExpireRecordVO;
import org.springblade.wms.excel.StExpireRecordExcel;
import org.springblade.wms.wrapper.StExpireRecordWrapper;
import org.springblade.wms.service.IStExpireRecordService;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.tool.constant.BladeConstant;
import java.time.LocalDate;
import java.util.Date;
import java.util.Map;
import java.util.List;
import jakarta.servlet.http.HttpServletResponse;
import java.util.Map;
/**
* @version 1.0
@ -65,6 +60,7 @@ public class StExpireRecordController extends BladeController {
StExpireRecord detail = stExpireRecordService.getOne(Condition.getQueryWrapper(stExpireRecord));
return R.data(StExpireRecordWrapper.build().entityVO(detail));
}
/**
* 到期维护记录表 分页
*/

42
blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StExpireSubmissionController.java
Unescape View File

@ -1,44 +1,37 @@
package org.springblade.wms.controller;
import cn.hutool.core.collection.CollUtil;
import io.swagger.v3.oas.annotations.tags.Tag;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
import org.apache.commons.lang3.StringUtils;
import org.apache.ibatis.mapping.ParameterMode;
import org.springblade.common.exception.BusinessException;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.IsAdmin;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.IsAdmin;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.wms.pojo.entity.PfUserInfo;
import org.springblade.wms.excel.StExpireSubmissionExcel;
import org.springblade.wms.pojo.entity.StExpireSubmission;
import org.springblade.wms.pojo.entity.StGoods;
import org.springblade.wms.pojo.entity.StRealtimeStock;
import org.springblade.wms.pojo.vo.StExpireSubmissionVO;
import org.springblade.wms.pojo.vo.StRealtimeStockVO;
import org.springblade.wms.service.IStExpireSubmissionService;
import org.springblade.wms.service.IStRealtimeStockService;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.wms.pojo.vo.StExpireSubmissionVO;
import org.springblade.wms.excel.StExpireSubmissionExcel;
import org.springblade.wms.wrapper.StExpireSubmissionWrapper;
import org.springblade.wms.service.IStExpireSubmissionService;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.tool.constant.BladeConstant;
import java.util.Map;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import jakarta.servlet.http.HttpServletResponse;
import java.util.Map;
/**
* @version 1.0
@ -68,6 +61,7 @@ public class StExpireSubmissionController extends BladeController {
StExpireSubmission detail = stExpireSubmissionService.getOne(Condition.getQueryWrapper(stExpireSubmission));
return R.data(StExpireSubmissionWrapper.build().entityVO(detail));
}
/**
* 到期送检表 分页
*/

2
blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGlassCakeOutController.java
Unescape View File

@ -19,7 +19,6 @@ import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.desk.dashboard.pojo.entity.DsPartEntity;
import org.springblade.wms.excel.StGlassCakeOutExcel;
import org.springblade.wms.pojo.dto.StGlassCakeOutDTO;
import org.springblade.wms.pojo.entity.StGlassCakeOut;
@ -61,6 +60,7 @@ public class StGlassCakeOutController extends BladeController {
StGlassCakeOut detail = stGlassCakeOutService.getOne(Condition.getQueryWrapper(stGlassCakeOut));
return R.data(StGlassCakeOutWrapper.build().entityVO(detail));
}
/**
* 玻璃饼出库 分页
*/

35
blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGoodsClassController.java
Unescape View File

@ -1,34 +1,32 @@
package org.springblade.wms.controller;
import io.swagger.v3.oas.annotations.tags.Tag;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.IsAdmin;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.IsAdmin;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.wms.pojo.entity.StGoods;
import org.springblade.wms.excel.StGoodsClassExcel;
import org.springblade.wms.pojo.entity.StGoodsClass;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.wms.pojo.vo.StGoodsClassVO;
import org.springblade.wms.excel.StGoodsClassExcel;
import org.springblade.wms.wrapper.StGoodsClassWrapper;
import org.springblade.wms.service.IStGoodsClassService;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.tool.constant.BladeConstant;
import java.util.Map;
import org.springblade.wms.wrapper.StGoodsClassWrapper;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import jakarta.servlet.http.HttpServletResponse;
import java.util.Map;
/**
@ -58,6 +56,7 @@ public class StGoodsClassController extends BladeController {
StGoodsClass detail = stGoodsClassService.getOne(Condition.getQueryWrapper(stGoodsClass));
return R.data(StGoodsClassWrapper.build().entityVO(detail));
}
/**
* 物料类别表 分页
*/

35
blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGoodsExtController.java
Unescape View File

@ -1,34 +1,33 @@
package org.springblade.wms.controller;
import io.swagger.v3.oas.annotations.tags.Tag;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.IsAdmin;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.IsAdmin;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.wms.pojo.entity.StGoodsClass;
import org.springblade.wms.excel.StGoodsExtExcel;
import org.springblade.wms.pojo.entity.StGoodsExt;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.wms.pojo.vo.StGoodsExtVO;
import org.springblade.wms.excel.StGoodsExtExcel;
import org.springblade.wms.wrapper.StGoodsExtWrapper;
import org.springblade.wms.service.IStGoodsExtService;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.tool.constant.BladeConstant;
import java.util.Map;
import org.springblade.wms.wrapper.StGoodsExtWrapper;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import jakarta.servlet.http.HttpServletResponse;
import java.util.Map;
/**
* @version 1.0
* @program: jonhon-mes-svr

4
blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StLendController.java
Unescape View File

@ -21,7 +21,6 @@ import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.wms.excel.StLendExcel;
import org.springblade.wms.pojo.dto.StLendDTO;
import org.springblade.wms.pojo.entity.StGoods;
import org.springblade.wms.pojo.entity.StLend;
import org.springblade.wms.pojo.entity.StRealtimeStock;
@ -33,8 +32,6 @@ import org.springblade.wms.wrapper.StLendWrapper;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
@ -69,6 +66,7 @@ public class StLendController extends BladeController {
StLend detail = stLendService.getOne(Condition.getQueryWrapper(stLend));
return R.data(StLendWrapper.build().entityVO(detail));
}
/**
* 物料借用 分页
*/

34
blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StMoldApplyForController.java
Unescape View File

@ -1,35 +1,34 @@
package org.springblade.wms.controller;
import io.swagger.v3.oas.annotations.tags.Tag;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.IsAdmin;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.IsAdmin;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.wms.excel.StMoldApplyForExcel;
import org.springblade.wms.pojo.dto.StMoldApplyForDTO;
import org.springblade.wms.pojo.entity.StMoldApplyFor;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.wms.pojo.vo.StMoldApplyForVO;
import org.springblade.wms.excel.StMoldApplyForExcel;
import org.springblade.wms.wrapper.StMoldApplyForWrapper;
import org.springblade.wms.service.IStMoldApplyForService;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.tool.constant.BladeConstant;
import java.util.Map;
import org.springblade.wms.wrapper.StMoldApplyForWrapper;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import jakarta.servlet.http.HttpServletResponse;
import java.util.Map;
/**
* @version 1.0
@ -58,6 +57,7 @@ public class StMoldApplyForController extends BladeController {
StMoldApplyFor detail = stMoldApplyForService.getOne(Condition.getQueryWrapper(stMoldApplyFor));
return R.data(StMoldApplyForWrapper.build().entityVO(detail));
}
/**
* 工装计划申请表 分页
*/

34
blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StMoldBaseController.java
Unescape View File

@ -1,34 +1,33 @@
package org.springblade.wms.controller;
import io.swagger.v3.oas.annotations.tags.Tag;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.IsAdmin;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.IsAdmin;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.wms.excel.StMoldBaseExcel;
import org.springblade.wms.pojo.dto.StMoldBaseDTO;
import org.springblade.wms.pojo.entity.StMoldBase;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.wms.pojo.vo.StMoldBaseVO;
import org.springblade.wms.excel.StMoldBaseExcel;
import org.springblade.wms.wrapper.StMoldBaseWrapper;
import org.springblade.wms.service.IStMoldBaseService;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.tool.constant.BladeConstant;
import java.util.Map;
import org.springblade.wms.wrapper.StMoldBaseWrapper;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import jakarta.servlet.http.HttpServletResponse;
import java.util.Map;
/**
* @version 1.0
@ -57,6 +56,7 @@ public class StMoldBaseController extends BladeController {
StMoldBase detail = stMoldBaseService.getOne(Condition.getQueryWrapper(stMoldBase));
return R.data(StMoldBaseWrapper.build().entityVO(detail));
}
/**
* 模具关系表 分页
*/

8
blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StOtherOutRecordController.java
Unescape View File

@ -16,14 +16,16 @@ import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.IsAdmin;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.wms.excel.StOtherOutRecordExcel;
import org.springblade.wms.pojo.dto.StOtherOutRecordDTO;
import org.springblade.wms.pojo.entity.*;
import org.springblade.wms.pojo.entity.PvBomRequest;
import org.springblade.wms.pojo.entity.StGoods;
import org.springblade.wms.pojo.entity.StOtherOutRecord;
import org.springblade.wms.pojo.entity.StRealtimeStock;
import org.springblade.wms.pojo.vo.StOtherOutRecordVO;
import org.springblade.wms.pojo.vo.StRealtimeStockVO;
import org.springblade.wms.pojo.vo.StStockInoutRecordVO;
@ -34,7 +36,6 @@ import org.springblade.wms.service.IStStockInoutRecordService;
import org.springblade.wms.wrapper.StOtherOutRecordWrapper;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -74,6 +75,7 @@ public class StOtherOutRecordController extends BladeController {
}
return R.data(detail);
}
/**
* 其他出库表 分页
*/

35
blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StOtherReceiptRecordController.java
Unescape View File

@ -2,49 +2,44 @@ package org.springblade.wms.controller;
import cn.hutool.core.util.StrUtil;
import com.alibaba.excel.EasyExcel;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.v3.oas.annotations.tags.Tag;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.IsAdmin;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.IsAdmin;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.wms.excel.StOtherReceiptRecordExcel;
import org.springblade.wms.pojo.dto.InitStockDTO;
import org.springblade.wms.pojo.entity.*;
import org.springblade.wms.pojo.vo.StOtherReceiptRecordVO;
import org.springblade.wms.pojo.vo.StStockInoutRecordVO;
import org.springblade.wms.service.*;
//import org.springblade.wms.service.impl.InitStockListener;
import org.springblade.wms.service.impl.InitStockListener;
import org.springblade.wms.wrapper.StOtherReceiptRecordWrapper;
import org.springblade.wms.wrapper.StStockInoutRecordWrapper;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.wms.pojo.vo.StOtherReceiptRecordVO;
import org.springblade.wms.excel.StOtherReceiptRecordExcel;
import org.springblade.wms.wrapper.StOtherReceiptRecordWrapper;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.tool.constant.BladeConstant;
import org.springframework.web.multipart.MultipartFile;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.web.multipart.MultipartFile;
/**
* @version 1.0
* @program: jonhon-mes-svr

40
blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StRealtimeStockController.java
Unescape View File

@ -4,41 +4,38 @@ package org.springblade.wms.controller;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import io.swagger.v3.oas.annotations.tags.Tag;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletRequest;
import lombok.AllArgsConstructor;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.IsAdmin;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.IsAdmin;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.TemplateUtil;
import org.springblade.wms.pojo.entity.StRealtimeStock;
import org.springblade.wms.pojo.entity.StStorehouse;
import org.springblade.wms.pojo.vo.*;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.wms.excel.StRealtimeStockExcel;
import org.springblade.wms.wrapper.StRealtimeStockWrapper;
import org.springblade.wms.pojo.entity.StRealtimeStock;
import org.springblade.wms.pojo.vo.PrintParentWoLabel;
import org.springblade.wms.pojo.vo.PrintStoresList;
import org.springblade.wms.pojo.vo.StRealtimeStockVO;
import org.springblade.wms.pojo.vo.StStorehouseVO;
import org.springblade.wms.service.IStRealtimeStockService;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.tool.constant.BladeConstant;
import org.springblade.wms.wrapper.StRealtimeStockWrapper;
import org.springframework.web.bind.annotation.*;
import java.util.HashMap;
import java.util.Map;
import java.util.List;
import jakarta.servlet.http.HttpServletResponse;
import java.util.Map;
import static org.springblade.core.excel.util.ExcelUtil.export;
@ -77,6 +74,7 @@ public class StRealtimeStockController extends BladeController {
StRealtimeStock detail = stRealtimeStockService.getOne(Condition.getQueryWrapper(stRealtimeStock));
return R.data(StRealtimeStockWrapper.build().entityVO(detail));
}
/**
* 仓库实时结余表 分页
*/

11
blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StRequisitionController.java
Unescape View File

@ -2,10 +2,6 @@ package org.springblade.wms.controller;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.StringUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.v3.oas.annotations.Operation;
@ -15,15 +11,14 @@ import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.IsAdmin;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.wms.excel.StRequisitionExcel;
import org.springblade.wms.pojo.dto.StRequisitionDTO;
import org.springblade.wms.pojo.entity.StRequisition;
import org.springblade.wms.pojo.entity.StStorageLocation;
@ -33,7 +28,6 @@ import org.springblade.wms.service.IStStorageLocationService;
import org.springblade.wms.wrapper.StRequisitionWrapper;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@ -65,6 +59,7 @@ public class StRequisitionController extends BladeController {
StRequisition detail = stRequisitionService.getOne(Condition.getQueryWrapper(stRequisition));
return R.data(StRequisitionWrapper.build().entityVO(detail));
}
/**
* 领料单打印 分页
*/

34
blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StReturnRecordController.java
Unescape View File

@ -1,34 +1,33 @@
package org.springblade.wms.controller;
import io.swagger.v3.oas.annotations.tags.Tag;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.IsAdmin;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.IsAdmin;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.wms.excel.StReturnRecordExcel;
import org.springblade.wms.pojo.entity.StReturnRecord;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.wms.pojo.vo.StReturnRecordVO;
import org.springblade.wms.excel.StReturnRecordExcel;
import org.springblade.wms.wrapper.StReturnRecordWrapper;
import org.springblade.wms.service.IStReturnRecordService;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.tool.constant.BladeConstant;
import java.util.Map;
import org.springblade.wms.wrapper.StReturnRecordWrapper;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import jakarta.servlet.http.HttpServletResponse;
import java.util.Map;
/**
* @version 1.0
@ -57,6 +56,7 @@ public class StReturnRecordController extends BladeController {
StReturnRecord detail = stReturnRecordService.getOne(Condition.getQueryWrapper(stReturnRecord));
return R.data(StReturnRecordWrapper.build().entityVO(detail));
}
/**
* 归还记录 分页
*/

39
blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StStorageLocationController.java
Unescape View File

@ -1,40 +1,36 @@
package org.springblade.wms.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.v3.oas.annotations.tags.Tag;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.IsAdmin;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.IsAdmin;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.wms.excel.StStorageLocationExcel;
import org.springblade.wms.pojo.entity.StStorageLocation;
import org.springblade.wms.pojo.entity.StStorehouse;
import org.springblade.wms.service.IStRealtimeStockService;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.wms.pojo.vo.StStorageLocationVO;
import org.springblade.wms.excel.StStorageLocationExcel;
import org.springblade.wms.wrapper.StStorageLocationWrapper;
import org.springblade.wms.service.IStRealtimeStockService;
import org.springblade.wms.service.IStStorageLocationService;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.tool.constant.BladeConstant;
import java.util.Map;
import org.springblade.wms.wrapper.StStorageLocationWrapper;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.stream.Collectors;
import java.util.Map;
import jakarta.servlet.http.HttpServletResponse;
/**
* @version 1.0
* @program: jonhon-mes-svr
@ -64,6 +60,7 @@ public class StStorageLocationController extends BladeController {
StStorageLocation detail = stStorageLocationService.getOne(Condition.getQueryWrapper(stStorageLocation));
return R.data(StStorageLocationWrapper.build().entityVO(detail));
}
/**
* 库位维护表 分页
*/

8
blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StStorehouseController.java
Unescape View File

@ -2,13 +2,10 @@ package org.springblade.wms.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
import lombok.AllArgsConstructor;
@ -25,11 +22,9 @@ import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.wms.excel.StStorehouseExcel;
import org.springblade.wms.pojo.entity.PfUserInfo;
import org.springblade.wms.pojo.entity.StStorageLocation;
import org.springblade.wms.pojo.entity.StStorehouse;
import org.springblade.wms.pojo.entity.StUserRight;
import org.springblade.wms.pojo.vo.DeptUserTreeVO;
import org.springblade.wms.pojo.vo.StStorehouseVO;
import org.springblade.wms.service.IStRealtimeStockService;
import org.springblade.wms.service.IStStorageLocationService;
@ -37,8 +32,6 @@ import org.springblade.wms.service.IStStorehouseService;
import org.springblade.wms.service.IStUserRightService;
import org.springblade.wms.wrapper.StStorehouseWrapper;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import java.util.List;
import java.util.Map;
@ -76,6 +69,7 @@ public class StStorehouseController extends BladeController {
StStorehouse detail = stStorehouseService.getOne(Condition.getQueryWrapper(stStorehouse));
return R.data(StStorehouseWrapper.build().entityVO(detail));
}
/**
* 库房维护表 分页
*/

36
blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StWmsRequestController.java
Unescape View File

@ -1,37 +1,34 @@
package org.springblade.wms.controller;
import cn.hutool.core.util.StrUtil;
import io.swagger.v3.oas.annotations.tags.Tag;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.IsAdmin;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.IsAdmin;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.system.pojo.entity.Dept;
import org.springblade.wms.pojo.entity.StClassRequest;
import org.springblade.wms.excel.StWmsRequestExcel;
import org.springblade.wms.pojo.entity.StWmsRequest;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.wms.pojo.vo.StWmsRequestVO;
import org.springblade.wms.excel.StWmsRequestExcel;
import org.springblade.wms.wrapper.StWmsRequestWrapper;
import org.springblade.wms.service.IStWmsRequestService;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.tool.constant.BladeConstant;
import java.util.Map;
import org.springblade.wms.wrapper.StWmsRequestWrapper;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import jakarta.servlet.http.HttpServletResponse;
import java.util.Map;
/**
* @version 1.0
@ -60,6 +57,7 @@ public class StWmsRequestController extends BladeController {
StWmsRequest detail = stWmsRequestService.getOne(Condition.getQueryWrapper(stWmsRequest));
return R.data(StWmsRequestWrapper.build().entityVO(detail));
}
/**
* 仓库提请记录 分页
*/

3
blade-service/blade-wms/src/main/java/org/springblade/wms/feign/StGlassCakeOutClientImpl.java
Unescape View File

@ -3,13 +3,11 @@ package org.springblade.wms.feign;
import io.swagger.v3.oas.annotations.Hidden;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.redisson.api.RMap;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
import org.springblade.wms.pojo.dto.StGlassCakeOutDTO;
import org.springblade.wms.pojo.entity.StGlassCakeOut;
import org.springblade.wms.service.IStGlassCakeOutService;
import org.springblade.wms.service.IStRealtimeStockService;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
@ -34,6 +32,7 @@ public class StGlassCakeOutClientImpl implements StGlassCakeOutClient{
/**
* 业务层调用远程接口生成玻璃饼预出库单
*
* @param dto 预出库DTO参数
* @return 预出库单结果
*/

1
blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/PvBomRequestMapper.java
Unescape View File

@ -2,7 +2,6 @@ package org.springblade.wms.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springblade.wms.pojo.entity.PvBomRequest;
import org.springblade.wms.pojo.entity.StAllotRecord;
/**
* @version 1.0

2
blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StBuyOrderMapper.java
Unescape View File

@ -1,6 +1,5 @@
package org.springblade.wms.mapper;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@ -10,7 +9,6 @@ import org.springblade.wms.pojo.entity.StBuyOrder;
import org.springblade.wms.pojo.vo.StBuyOrderVO;
import java.util.List;
import java.util.Map;
/**
* @version 1.0

2
blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StExpireSubmissionMapper.java
Unescape View File

@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
import org.springblade.wms.excel.StExpireSubmissionExcel;
import org.springblade.wms.pojo.entity.StExpireSubmission;
import org.springblade.wms.pojo.entity.StGoods;
import org.springblade.wms.pojo.entity.StRealtimeStock;
import org.springblade.wms.pojo.vo.StExpireSubmissionVO;
@ -44,6 +43,7 @@ public interface StExpireSubmissionMapper extends BaseMapper<StExpireSubmission>
/**
* 发送到期送检信息至ERP（调用存储过程）
*
* @param stock 实时库存实体
* @param userName 当前用户ID（适配Service层调用参数）
* @return ERP返回的送检编码（wsCode/esCode）

2
blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StStorehouseMapper.java
Unescape View File

@ -4,9 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
import org.springblade.system.pojo.entity.User;
import org.springblade.wms.excel.StStorehouseExcel;
import org.springblade.wms.pojo.entity.StGoodsClass;
import org.springblade.wms.pojo.entity.StStorehouse;
import org.springblade.wms.pojo.vo.StStorehouseVO;

1
blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StUserRightMapper.java
Unescape View File

@ -1,7 +1,6 @@
package org.springblade.wms.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springblade.core.secure.BladeUser;
import org.springblade.system.pojo.entity.User;
import org.springblade.wms.pojo.entity.StUserRight;

1
blade-service/blade-wms/src/main/java/org/springblade/wms/service/IPvBomRequestService.java
Unescape View File

@ -2,7 +2,6 @@ package org.springblade.wms.service;
import org.springblade.core.mp.base.BaseService;
import org.springblade.wms.pojo.entity.PvBomRequest;
import org.springblade.wms.pojo.entity.StAllotRecord;
/**
* @version 1.0

1
blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStBuyOrderService.java
Unescape View File

@ -1,6 +1,5 @@
package org.springblade.wms.service;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseService;

2
blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStExpireRecordService.java
Unescape View File

@ -9,8 +9,6 @@ import org.springblade.wms.pojo.dto.StExpireRecordDTO;
import org.springblade.wms.pojo.entity.StExpireRecord;
import org.springblade.wms.pojo.vo.StExpireRecordVO;
import java.time.LocalDate;
import java.util.Date;
import java.util.List;
/**

1
blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStLendService.java
Unescape View File

@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseService;
import org.springblade.core.secure.BladeUser;
import org.springblade.wms.excel.StLendExcel;
import org.springblade.wms.pojo.dto.StLendDTO;
import org.springblade.wms.pojo.entity.StLend;
import org.springblade.wms.pojo.vo.StLendVO;

1
blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStOtherOutRecordService.java
Unescape View File

@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseService;
import org.springblade.core.secure.BladeUser;
import org.springblade.wms.excel.StOtherOutRecordExcel;
import org.springblade.wms.pojo.dto.StOtherOutRecordDTO;
import org.springblade.wms.pojo.entity.StOtherOutRecord;
import org.springblade.wms.pojo.entity.StRealtimeStock;
import org.springblade.wms.pojo.vo.StOtherOutRecordVO;

1
blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStOtherReceiptRecordService.java
Unescape View File

@ -6,7 +6,6 @@ import org.springblade.core.mp.base.BaseService;
import org.springblade.core.secure.BladeUser;
import org.springblade.wms.excel.StOtherReceiptRecordExcel;
import org.springblade.wms.pojo.dto.InitStockDTO;
import org.springblade.wms.pojo.entity.PfUserInfo;
import org.springblade.wms.pojo.entity.StOtherReceiptRecord;
import org.springblade.wms.pojo.vo.StOtherReceiptRecordVO;

1
blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStStorehouseService.java
Unescape View File

@ -3,7 +3,6 @@ package org.springblade.wms.service;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseService;
import org.springblade.core.secure.BladeUser;
import org.springblade.wms.excel.StStorehouseExcel;
import org.springblade.wms.pojo.entity.StStorehouse;
import org.springblade.wms.pojo.vo.StStorehouseVO;

2
blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStUserRightService.java
Unescape View File

@ -2,10 +2,8 @@ package org.springblade.wms.service;
import org.springblade.core.mp.base.BaseService;
import org.springblade.wms.pojo.entity.StUserRight;
import org.springblade.wms.pojo.vo.DeptUserTreeVO;
import java.util.List;
import java.util.Map;
/**
* @version 1.0

1
blade-service/blade-wms/src/main/java/org/springblade/wms/service/ISyDockingLogService.java
Unescape View File

@ -1,6 +1,5 @@
package org.springblade.wms.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseService;
import org.springblade.wms.pojo.entity.SyDockingLog;

3
blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/PvBomRequestServiceImpl.java
Unescape View File

@ -2,11 +2,8 @@ package org.springblade.wms.service.impl;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.wms.mapper.PvBomRequestMapper;
import org.springblade.wms.mapper.StAllotRecordMapper;
import org.springblade.wms.pojo.entity.PvBomRequest;
import org.springblade.wms.pojo.entity.StAllotRecord;
import org.springblade.wms.service.IPvBomRequestService;
import org.springblade.wms.service.IStAllotRecordService;
import org.springframework.stereotype.Service;
/**

12
blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StAllotRecordServiceImpl.java
Unescape View File

@ -3,20 +3,15 @@ package org.springblade.wms.service.impl;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import jakarta.annotation.Resource;
import org.apache.commons.lang3.StringUtils;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.mapping.ParameterMode;
import org.springblade.common.exception.BusinessException;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.wms.excel.StAllotRecordExcel;
import org.springblade.wms.mapper.StAllotRecordMapper;
import org.springblade.wms.mapper.StGoodsClassMapper;
import org.springblade.wms.mapper.StRealtimeStockMapper;
import org.springblade.wms.mapper.StStorageLocationMapper;
import org.springblade.wms.pojo.entity.*;
import org.springblade.wms.pojo.entity.StAllotRecord;
import org.springblade.wms.pojo.entity.StRealtimeStock;
import org.springblade.wms.pojo.entity.StStorageLocation;
import org.springblade.wms.pojo.vo.StAllotRecordVO;
import org.springblade.wms.service.IStAllotRecordService;
import org.springblade.wms.service.IStRealtimeStockService;
@ -50,6 +45,7 @@ public class StAllotRecordServiceImpl extends BaseServiceImpl<StAllotRecordMappe
public IPage<StAllotRecordVO> selectAllotWithGoods(IPage<StAllotRecord> page, QueryWrapper<StAllotRecord> wrapper) {
return baseMapper.selectAllotWithGoods(page, wrapper);
}
@Override
public IPage<StAllotRecordVO> selectStAllotRecordPage(IPage<StAllotRecordVO> page, StAllotRecordVO stAllotRecord) {
return page.setRecords(baseMapper.selectStAllotRecordPage(page, stAllotRecord));

9
blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StBuyOrderServiceImpl.java
Unescape View File

@ -3,27 +3,20 @@ package org.springblade.wms.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springblade.common.exception.BusinessException;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.system.cache.SysCache;
import org.springblade.system.cache.UserCache;
import org.springblade.system.feign.ISysClient;
import org.springblade.system.pojo.entity.Dept;
import org.springblade.system.pojo.entity.User;
import org.springblade.wms.excel.StBuyOrderExcel;
import org.springblade.wms.mapper.StBuyOrderMapper;
import org.springblade.wms.pojo.dto.ErpStPurOtherDTO;
import org.springblade.wms.pojo.dto.StBuyOrderDTO;
import org.springblade.wms.pojo.entity.PfUserInfo;
import org.springblade.wms.pojo.entity.StBuyOrder;
import org.springblade.wms.pojo.entity.StGoods;
import org.springblade.wms.pojo.vo.StBuyOrderVO;
@ -33,7 +26,6 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.*;
/**
@ -206,7 +198,6 @@ public class StBuyOrderServiceImpl extends BaseServiceImpl<StBuyOrderMapper, StB
}
public void sendRbfirtChk(String partCode, String partName) {
String[] excnote = new String[1];
String[] excflag = new String[1];

1
blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StErpWarehouseTransferServiceImpl.java
Unescape View File

@ -21,7 +21,6 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Collections;
import java.util.Date;
import java.util.List;

2
blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StExpireRecordServiceImpl.java
Unescape View File

@ -21,8 +21,6 @@ import org.springframework.util.CollectionUtils;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.Collections;
import java.util.Date;
import java.util.List;

5
blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StExpireSubmissionServiceImpl.java
Unescape View File

@ -4,14 +4,10 @@ import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import jakarta.annotation.Resource;
import org.apache.commons.lang3.StringUtils;
import org.apache.ibatis.mapping.ParameterMode;
import org.springblade.common.exception.BusinessException;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.secure.BladeUser;
import org.springblade.wms.excel.StExpireSubmissionExcel;
import org.springblade.wms.mapper.StExpireSubmissionMapper;
import org.springblade.wms.pojo.entity.PfUserInfo;
import org.springblade.wms.pojo.entity.StExpireSubmission;
import org.springblade.wms.pojo.entity.StGoods;
import org.springblade.wms.pojo.entity.StRealtimeStock;
@ -22,7 +18,6 @@ import org.springblade.wms.service.IStRealtimeStockService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
import java.util.Date;
import java.util.List;

10
blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StGlassCakeOutServiceImpl.java
Unescape View File

@ -5,22 +5,14 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import jakarta.annotation.Resource;
import org.apache.commons.lang3.StringUtils;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.desk.dashboard.pojo.entity.DsPartEntity;
import org.springblade.desk.dashboard.pojo.entity.DsPartRelationEntity;
//import org.springblade.desk.dashboard.service.IDsPartRelationService;
//import org.springblade.desk.dashboard.service.IDsPartService;
//import org.springblade.desk.produce.mapper.WorkOrderMapper;
import org.springblade.desk.produce.pojo.entity.WorkOrder;
//import org.springblade.desk.produce.service.IWorkOrderService;
import org.springblade.wms.excel.StGlassCakeOutExcel;
import org.springblade.wms.mapper.StGlassCakeOutMapper;
import org.springblade.wms.mapper.StRealtimeStockMapper;
import org.springblade.wms.mapper.StStockInoutRecordMapper;
import org.springblade.wms.pojo.dto.StGlassCakeOutDTO;
import org.springblade.wms.pojo.entity.*;
import org.springblade.wms.pojo.vo.StGlassCakeOutVO;
@ -30,9 +22,7 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;
/**
* @version 1.0

1
blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StGoodsExtServiceImpl.java
Unescape View File

@ -1,7 +1,6 @@
package org.springblade.wms.service.impl;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseServiceImpl;

1
blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StGoodsServiceImpl.java
Unescape View File

@ -8,7 +8,6 @@ import lombok.extern.slf4j.Slf4j;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.wms.excel.StGoodsExcel;
import org.springblade.wms.mapper.StGoodsClassMapper;
import org.springblade.wms.mapper.StGoodsMapper;
import org.springblade.wms.pojo.dto.StPdmPartDTO;
import org.springblade.wms.pojo.entity.StGoods;

19
blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StHttpRequestService.java
Unescape View File

@ -1,36 +1,19 @@
package org.springblade.wms.service.impl;
import cn.hutool.core.exceptions.ExceptionUtil;
import com.alibaba.fastjson.JSONObject;
import cn.hutool.json.JSONUtil;
import com.fasterxml.jackson.databind.ObjectMapper;
import jakarta.annotation.Resource;
import lombok.extern.java.Log;
import lombok.extern.slf4j.Slf4j;
import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.RequestBody;
import okhttp3.Response;
import org.springblade.core.log.exception.ServiceException;
import okhttp3.*;
import org.springblade.wms.pojo.dto.ErpStPurOtherDTO;
import org.springblade.wms.pojo.dto.StPdmPartDTO;
import org.springblade.wms.pojo.dto.StPdmPartResponseDTO;
import org.springblade.wms.service.IStBuyOrderService;
import org.springblade.wms.service.ISyDockingLogService;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import okhttp3.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.client.RestTemplate;
import java.io.IOException;
import java.net.URI;
import java.net.http.HttpClient;
import java.net.http.HttpRequest;
import java.net.http.HttpResponse;
import java.nio.charset.StandardCharsets;
import java.time.Duration;
import java.util.ArrayList;

13
blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StLendServiceImpl.java
Unescape View File

@ -1,6 +1,5 @@
package org.springblade.wms.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@ -11,8 +10,9 @@ import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.wms.excel.StLendExcel;
import org.springblade.wms.mapper.StLendMapper;
import org.springblade.wms.pojo.dto.StLendDTO;
import org.springblade.wms.pojo.entity.*;
import org.springblade.wms.pojo.entity.StLend;
import org.springblade.wms.pojo.entity.StRealtimeStock;
import org.springblade.wms.pojo.entity.StStoreBill;
import org.springblade.wms.pojo.vo.StLendVO;
import org.springblade.wms.service.IStLendService;
import org.springblade.wms.service.IStRealtimeStockService;
@ -20,9 +20,10 @@ import org.springblade.wms.service.IStStoreBillService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Optional;
/**
* @version 1.0

5
blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StMoldApplyForServiceImpl.java
Unescape View File

@ -4,8 +4,6 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.commons.lang3.StringUtils;
import org.springblade.common.exception.BusinessException;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.secure.BladeUser;
import org.springblade.wms.excel.StMoldApplyForExcel;
@ -16,11 +14,8 @@ import org.springblade.wms.service.IStMoldApplyForService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* @version 1.0

1
blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StMoldBaseServiceImpl.java
Unescape View File

@ -10,7 +10,6 @@ import org.springblade.wms.mapper.StMoldBaseMapper;
import org.springblade.wms.pojo.entity.StMoldBase;
import org.springblade.wms.pojo.vo.StMoldBaseVO;
import org.springblade.wms.service.IStMoldBaseService;
import org.springblade.wms.service.IStStorehouseService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

7
blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StRealtimeStockServiceImpl.java
Unescape View File

@ -1,13 +1,9 @@
package org.springblade.wms.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import net.sourceforge.barbecue.Barcode;
@ -17,7 +13,6 @@ import org.apache.commons.lang3.StringUtils;
import org.springblade.common.exception.BusinessException;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.secure.BladeUser;
import org.springblade.wms.excel.StRealtimeStockExcel;
import org.springblade.wms.mapper.*;
@ -32,7 +27,6 @@ import java.awt.image.BufferedImage;
import java.io.ByteArrayOutputStream;
import java.math.BigDecimal;
import java.text.DecimalFormat;
import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;
@ -511,6 +505,7 @@ public class StRealtimeStockServiceImpl extends BaseServiceImpl<StRealtimeStockM
/**
* 校验物料最低库存预警，并给出提示
*
* @param stGoods 物料基础信息（可为null，null则重新查询）
* @param goodsId 物料ID
* @param outQuantity 本次出库数量

11
blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StStorehouseServiceImpl.java
Unescape View File

@ -1,22 +1,18 @@
package org.springblade.wms.service.impl;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import org.apache.commons.lang3.StringUtils;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import jakarta.annotation.Resource;
import org.apache.commons.lang3.StringUtils;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.tool.api.R;
import org.springblade.system.feign.IUserClient;
import org.springblade.system.pojo.entity.User;
import org.springblade.wms.excel.StStorehouseExcel;
import org.springblade.wms.mapper.StGoodsClassMapper;
import org.springblade.wms.mapper.StStorehouseMapper;
import org.springblade.wms.pojo.entity.MesConstant;
import org.springblade.wms.pojo.entity.PfUserInfo;
import org.springblade.wms.pojo.entity.StGoodsClass;
import org.springblade.wms.pojo.entity.StStorehouse;
import org.springblade.wms.pojo.vo.StStorehouseVO;
import org.springblade.wms.service.IStStorehouseService;
@ -37,6 +33,7 @@ import java.util.List;
public class StStorehouseServiceImpl extends BaseServiceImpl<StStorehouseMapper, StStorehouse> implements IStStorehouseService {
@Resource
IUserClient userClient;
@Override
public IPage<StStorehouseVO> selectStStorehousePage(IPage<StStorehouseVO> page, StStorehouseVO stStorehouse) {
return page.setRecords(baseMapper.selectStStorehousePage(page, stStorehouse));

11
blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StUserRightServiceImpl.java
Unescape View File

@ -1,28 +1,18 @@
package org.springblade.wms.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.map.MapUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import jakarta.annotation.Resource;
import org.apache.commons.lang3.StringUtils;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.system.feign.ISysClient;
import org.springblade.system.feign.IUserClient;
import org.springblade.system.pojo.entity.Dept;
import org.springblade.system.pojo.entity.User;
import org.springblade.system.feign.ISysClient;
import org.springblade.system.feign.IUserClient;
import org.springblade.system.pojo.entity.Dept;
import org.springblade.wms.mapper.StUserRightMapper;
import org.springblade.wms.pojo.entity.MesConstant;
import org.springblade.wms.pojo.entity.PfUserInfo;
import org.springblade.wms.pojo.entity.StStorehouse;
import org.springblade.wms.pojo.entity.StUserRight;
import org.springblade.wms.pojo.vo.DeptUserTreeVO;
import org.springblade.wms.service.IStUserRightService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -178,6 +168,7 @@ public class StUserRightServiceImpl extends BaseServiceImpl<StUserRightMapper, S
return o1.getDeptCode().compareTo(o2.getDeptCode());
}
}
private JSONArray assembleDeptUserTreeJSON(List<Dept> deptList, Map<Long, List<Dept>> deptMap, Map<Long, List<User>> userMap) {
JSONArray array = new JSONArray();
if (deptList == null || deptList.isEmpty() || userMap == null || userMap.isEmpty()) {

2
blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/SyDockingLogServiceImpl.java
Unescape View File

@ -1,7 +1,5 @@
package org.springblade.wms.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseService;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.wms.mapper.SyDockingLogMapper;
import org.springblade.wms.pojo.entity.SyDockingLog;

Write Preview
Loading…
Cancel
Save