From c8c0905f1b8ada00ff0eedf6de68ab22e609c28c Mon Sep 17 00:00:00 2001 From: wusiyu <2015098864@qq.com> Date: Mon, 2 Mar 2026 17:32:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../springblade/system/feign/ISysClient.java | 10 +++ .../system/feign/ISysClientFallback.java | 5 ++ .../wms/pojo/dto/ClassOutboundDTO.java | 30 +++++++ .../wms/pojo/dto/ErpStPurOtherDTO.java | 80 +++++++++++++++++++ .../wms/pojo/dto/InitStockDTO.java | 32 ++++++++ .../wms/pojo/entity/MesConstant.java | 72 +++++++++++++++++ .../wms/pojo/vo/DeptUserTreeVO.java | 30 +++++++ .../springblade/system/mapper/DeptMapper.java | 1 + .../springblade/system/mapper/DeptMapper.xml | 9 +++ .../system/service/IDeptService.java | 1 + .../system/service/impl/DeptServiceImpl.java | 5 ++ .../wms/service/IPvBomRequestService.java | 18 +++++ .../wms/service/IStAllotRecordService.java | 47 +++++++++++ .../wms/service/IStBuyOrderService.java | 63 +++++++++++++++ .../wms/service/IStClassRequestService.java | 58 ++++++++++++++ .../IStErpWarehouseTransferService.java | 45 +++++++++++ .../wms/service/IStExpireRecordService.java | 52 ++++++++++++ .../service/IStExpireSubmissionService.java | 43 ++++++++++ .../wms/service/IStGlassCakeOutService.java | 52 ++++++++++++ .../wms/service/IStGoodsClassService.java | 46 +++++++++++ .../wms/service/IStGoodsExtService.java | 45 +++++++++++ .../wms/service/IStLendService.java | 49 ++++++++++++ .../wms/service/IStLockGoodsService.java | 44 ++++++++++ .../service/IStMeasuringMaintenService.java | 45 +++++++++++ .../wms/service/IStMoldApplyForService.java | 44 ++++++++++ .../wms/service/IStMoldBaseService.java | 45 +++++++++++ .../wms/service/IStOtherOutRecordService.java | 53 ++++++++++++ .../service/IStOtherReceiptRecordService.java | 49 ++++++++++++ .../springblade/wms/service/IStPdmApi.java | 19 +++++ .../wms/service/IStRealtimeStockService.java | 47 +++++++---- .../wms/service/IStRequisitionService.java | 56 +++++++++++++ .../wms/service/IStReturnRecordService.java | 43 ++++++++++ .../service/IStStockInoutRecordService.java | 51 ++++++++++++ .../service/IStStorageLocationService.java | 55 +++++++++++++ .../wms/service/IStStorehouseService.java | 53 ++++++++++++ .../wms/service/IStUserRightService.java | 44 ++++++++++ .../IStWarehouseTransferRecordService.java | 37 +++++++++ .../wms/service/IStWmsRequestService.java | 49 ++++++++++++ .../wms/service/ISyDockingLogService.java | 21 +++++ .../wms/service/impl/InitStockListener.java | 68 ++++++++++++++++ .../src/main/resources/application-dev.yml | 5 ++ 41 files changed, 1605 insertions(+), 16 deletions(-) create mode 100644 blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/dto/ClassOutboundDTO.java create mode 100644 blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/dto/ErpStPurOtherDTO.java create mode 100644 blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/dto/InitStockDTO.java create mode 100644 blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/MesConstant.java create mode 100644 blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/vo/DeptUserTreeVO.java create mode 100644 blade-service/blade-wms/src/main/java/org/springblade/wms/service/IPvBomRequestService.java create mode 100644 blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStAllotRecordService.java create mode 100644 blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStBuyOrderService.java create mode 100644 blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStClassRequestService.java create mode 100644 blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStErpWarehouseTransferService.java create mode 100644 blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStExpireRecordService.java create mode 100644 blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStExpireSubmissionService.java create mode 100644 blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStGlassCakeOutService.java create mode 100644 blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStGoodsClassService.java create mode 100644 blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStGoodsExtService.java create mode 100644 blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStLendService.java create mode 100644 blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStLockGoodsService.java create mode 100644 blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStMeasuringMaintenService.java create mode 100644 blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStMoldApplyForService.java create mode 100644 blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStMoldBaseService.java create mode 100644 blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStOtherOutRecordService.java create mode 100644 blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStOtherReceiptRecordService.java create mode 100644 blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStPdmApi.java create mode 100644 blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStRequisitionService.java create mode 100644 blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStReturnRecordService.java create mode 100644 blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStStockInoutRecordService.java create mode 100644 blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStStorageLocationService.java create mode 100644 blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStStorehouseService.java create mode 100644 blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStUserRightService.java create mode 100644 blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStWarehouseTransferRecordService.java create mode 100644 blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStWmsRequestService.java create mode 100644 blade-service/blade-wms/src/main/java/org/springblade/wms/service/ISyDockingLogService.java create mode 100644 blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/InitStockListener.java diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClient.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClient.java index 97020dd0..ecb0f046 100644 --- a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClient.java +++ b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClient.java @@ -48,6 +48,7 @@ public interface ISysClient { String API_PREFIX = "/feign/client/system"; String MENU = API_PREFIX + "/menu"; String DEPT = API_PREFIX + "/dept"; + String DEPT_CODE = API_PREFIX + "/dept-code"; String DEPT_IDS = API_PREFIX + "/dept-ids"; String DEPT_IDS_FUZZY = API_PREFIX + "/dept-ids-fuzzy"; String DEPT_NAME = API_PREFIX + "/dept-name"; @@ -89,6 +90,15 @@ public interface ISysClient { @GetMapping(DEPT) R getDept(@RequestParam("id") Long id); + /** + * 获取部门 + * + * @param deptCode 主键 + * @return Dept + */ + @GetMapping(DEPT_CODE) + R getDeptByCode(@RequestParam("deptCode") String deptCode); + /** * 获取部门id * diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClientFallback.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClientFallback.java index 47e40d79..a5c45169 100644 --- a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClientFallback.java +++ b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClientFallback.java @@ -49,6 +49,11 @@ public class ISysClientFallback implements ISysClient { return R.fail("获取数据失败"); } + @Override + public R getDeptByCode(String deptCode) { + return R.fail("获取数据失败"); + } + @Override public R getDeptIds(String tenantId, String deptNames) { return R.fail("获取数据失败"); diff --git a/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/dto/ClassOutboundDTO.java b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/dto/ClassOutboundDTO.java new file mode 100644 index 00000000..a69913fb --- /dev/null +++ b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/dto/ClassOutboundDTO.java @@ -0,0 +1,30 @@ +package org.springblade.wms.pojo.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +/** + * @version 1.0 + * @program: jonhon-mes-svr + * @ClassName ClassOutboundDTO + * @description: + * @autor: WuSiYu + * @create 2026-01-09 13:40 + **/ +@Data +public class ClassOutboundDTO { + + @Schema(description = "提请主键", required = true) + private Long crId; + + + @Schema(description = "出库数量", required = true) + private Double outQuantity; + + + @Schema(description = "库存主键", required = true) + private Long rlsId; + + @Schema(description = "当前出库数量") + private Double currentOutQty; +} diff --git a/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/dto/ErpStPurOtherDTO.java b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/dto/ErpStPurOtherDTO.java new file mode 100644 index 00000000..1c2b8d80 --- /dev/null +++ b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/dto/ErpStPurOtherDTO.java @@ -0,0 +1,80 @@ +package org.springblade.wms.pojo.dto; + +import com.alibaba.fastjson.annotation.JSONField; +import lombok.Data; + +import java.io.Serial; +import java.math.BigDecimal; + +/** + * @version 1.0 + * @program: jonhon-mes-svr + * @ClassName ErpStPurOtherDTO + * @description: + * @autor: WuSiYu + * @create 2026-01-16 14:49 + **/ +@Data +public class ErpStPurOtherDTO { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * id + */ + @JSONField(serialize = false) + private Long boId; + /** + * 采购单号 + */ + @JSONField(serialize = false) + private String boCode; + /** + * 物料号 + */ + private String prtno = ""; + /** + * 等级 + */ + private String prtlotno = ""; + /** + * 需求部门 + */ + private String reqdept = ""; + /** + * 需求日期 + */ + private String reqdat = ""; + /** + * 需求数量 + */ + private BigDecimal reqqty = new BigDecimal(0); + /** + * 申报日期 + */ + private String reqdate = ""; + /** + * 计划区域 + */ + private String plnarea = ""; + /** + * 需求状态 + */ + private String reqstat = "9"; + /** + * 申报人 + */ + private String reqctlr = ""; + /** + * 审批人 + */ + private String checkman = ""; + /** + * 审批日期 + */ + private String checkdate = ""; + + private String note = "热表mes额外需求"; + +} diff --git a/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/dto/InitStockDTO.java b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/dto/InitStockDTO.java new file mode 100644 index 00000000..7d48c426 --- /dev/null +++ b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/dto/InitStockDTO.java @@ -0,0 +1,32 @@ +package org.springblade.wms.pojo.dto; + +import com.alibaba.excel.annotation.ExcelProperty; +import lombok.Data; + +/** + * @version 1.0 + * @program: jonhon-mes-svr + * @ClassName InitStockDTO + * @description: + * @autor: WuSiYu + * @create 2026-01-04 17:47 + **/ +@Data +public class InitStockDTO { + @ExcelProperty("库房编号") + private String shCode; + @ExcelProperty("库位号") + private String location; + @ExcelProperty("物料编号") + private String goodsCode; + @ExcelProperty("批次号") + private String piNo; + @ExcelProperty("检验编号") + private String checkCode; + @ExcelProperty("厚度") + private String thickness; + @ExcelProperty("库存量") + private Double quantity; + @ExcelProperty("单价") + private Double price; +} diff --git a/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/MesConstant.java b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/MesConstant.java new file mode 100644 index 00000000..2e9670c5 --- /dev/null +++ b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/MesConstant.java @@ -0,0 +1,72 @@ +package org.springblade.wms.pojo.entity; + +import lombok.Data; + +/** + * @version 1.0 + * @program: jonhon-mes-svr + * @ClassName MesConstant + * @description: + * @autor: WuSiYu + * @create 2026-01-21 10:44 + **/ +@Data +public class MesConstant { + // 穿梭框组件使用Key常量 + /** + * @Fields NO_CHOOSE : 未选中 + */ + public final static String TREE_NO_CHOOSE = "NoChoose"; + /** + * @Fields CHOOSE : 选中 + */ + public final static String TREE_CHOOSE = "Choose"; + /** + * @Fields TREE_FOLDER : 节点Id + */ + public final static String TREE_ID = "id"; + /** + * @Fields TREE_PID : 父级节点Id + */ + public final static String TREE_PID = "pid"; + /** + * @Fields TREE_LABEL : 节点显示内容 + */ + public final static String TREE_LABEL = "label"; + /** + * @Fields TREE_TYPE : 节点类型 + */ + public final static String TREE_TYPE = "type"; + /** + * @Fields TREE_FOLDER : 父节点 + */ + public final static String TREE_FOLDER = "folder"; + /** + * @Fields TREE_ITEM : 叶子节点 + */ + public final static String TREE_ITEM = "item"; + /** + * @Fields TREE_CHILDERN : 父节点下属子级 + */ + public final static String TREE_CHILDERN = "children"; + /** + * @Fields TREE_RANK : 节点层级标记 + */ + public final static String TREE_RANK = "rank"; + /** + * @Fields TREE_CHILDERN : 系统Short类型默认值 + */ + public final static Short DEFAULT_VALUE = -1; + /** + * @Fields ep : 列表查询参数 + */ + public final static String EP = "ep"; + + /** + * 软件使用客户的logo文件名，不包含扩展名 + */ + static public final String CUSTOMER_LOGO_FILE_NAME="customer_logo"; + + + +} diff --git a/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/vo/DeptUserTreeVO.java b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/vo/DeptUserTreeVO.java new file mode 100644 index 00000000..4317d035 --- /dev/null +++ b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/vo/DeptUserTreeVO.java @@ -0,0 +1,30 @@ +package org.springblade.wms.pojo.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import org.springblade.wms.pojo.entity.UserNode; + +import java.io.Serial; +import java.util.List; + +/** + * @version 1.0 + * @program: jonhon-mes-svr + * @ClassName DeptUserTreeVO + * @description: + * @autor: WuSiYu + * @create 2026-01-20 15:58 + **/ +@Data +public class DeptUserTreeVO { + @Serial + private static final long serialVersionUID = 1L; + @Schema(description = "部门ID") + private Long id; + @Schema(description = "部门名称") + private String label; + @Schema(description = "子部门") + private List children; + @Schema(description = "部门下用户") + private List users; +} diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.java b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.java index 55661a6a..e8b78e20 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.java @@ -74,4 +74,5 @@ public interface DeptMapper extends BaseMapper { */ List getDeptNames(Long[] ids); + Dept getDeptByCode(String deptCode); } diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.xml b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.xml index 85693fd3..c9c6a4cb 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.xml +++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.xml @@ -113,4 +113,13 @@ and is_deleted = 0 + diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/IDeptService.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/IDeptService.java index 28f29915..8b95420f 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/service/IDeptService.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/IDeptService.java @@ -138,4 +138,5 @@ public interface IDeptService extends IService { */ List deptLeaderInfo(Long deptId); + Dept getDeptByCode(String deptCode); } diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java index 56870d99..c9707d11 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java @@ -408,4 +408,9 @@ public class DeptServiceImpl extends ServiceImpl implements ID return UserWrapper.build().listVO(userList); } + @Override + public Dept getDeptByCode(String deptCode) { + return baseMapper.getDeptByCode(deptCode); + } + } diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IPvBomRequestService.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IPvBomRequestService.java new file mode 100644 index 00000000..309fda3f --- /dev/null +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IPvBomRequestService.java @@ -0,0 +1,18 @@ +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 + * @program: jonhon-mes-svr + * @ClassName IPvBomRequestService + * @description: + * @autor: WuSiYu + * @create 2026-01-25 18:20 + **/ + +public interface IPvBomRequestService extends BaseService { + +} diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStAllotRecordService.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStAllotRecordService.java new file mode 100644 index 00000000..f299a9c1 --- /dev/null +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStAllotRecordService.java @@ -0,0 +1,47 @@ +package org.springblade.wms.service; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import org.springblade.wms.excel.StAllotRecordExcel; +import org.springblade.wms.pojo.entity.StAllotRecord; +import org.springblade.wms.pojo.vo.StAllotRecordVO; + +import java.util.List; + +/** + * @version 1.0 + * @program: jonhon-mes-svr + * @ClassName IStAllotRecordService + * @description: 库位调拨记录表 服务类 + * @autor: WuSiYu + * @create 2025-12-25 17:13 + **/ + +public interface IStAllotRecordService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param stAllotRecord 查询参数 + * @return IPage + */ + IPage selectStAllotRecordPage(IPage page, StAllotRecordVO stAllotRecord); + + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportStAllotRecord(Wrapper queryWrapper); + + boolean add(StAllotRecord stAllotRecord); + + boolean batchAdd(List stAllotRecordList); + + IPage selectAllotWithGoods(IPage page, QueryWrapper wrapper); +} + diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStBuyOrderService.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStBuyOrderService.java new file mode 100644 index 00000000..89648c13 --- /dev/null +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStBuyOrderService.java @@ -0,0 +1,63 @@ +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; +import org.springblade.core.secure.BladeUser; +import org.springblade.wms.excel.StBuyOrderExcel; +import org.springblade.wms.pojo.dto.StBuyOrderDTO; +import org.springblade.wms.pojo.entity.StBuyOrder; +import org.springblade.wms.pojo.vo.StBuyOrderVO; + +import java.util.List; + +/** + * @version 1.0 + * @program: jonhon-mes-svr + * @ClassName IStBuyOrderService + * @description: 采购申请单 服务类 + * @autor: WuSiYu + * @create 2026-01-16 10:21 + **/ + +public interface IStBuyOrderService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param stBuyOrder 查询参数 + * @return IPage + */ + IPage selectStBuyOrderPage(IPage page, StBuyOrderVO stBuyOrder); + + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportStBuyOrder(Wrapper queryWrapper); + + String nextCode(); + + StBuyOrder queryForAdd(Long boId, BladeUser user); + + void saveOrEdit(StBuyOrderDTO stBuyOrderDTO, BladeUser user); + + void purOtherRest(List list, Long userId); + + IPage selectStBuyTrackPage(IPage page, StBuyOrderVO stBuyOrder); + + void httpUpdateBo(Long id, String extraBill); + + IPage selectStoreRequestPage(IPage page, StBuyOrderVO stBuyOrder); + + StBuyOrder getByExtraBill(String str); + + void approvalOrder(Long id, Short approvalResult, BladeUser approver); + +// JSONObject otherPlanDetail(Long id, String prtno); +} + diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStClassRequestService.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStClassRequestService.java new file mode 100644 index 00000000..150a0f1d --- /dev/null +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStClassRequestService.java @@ -0,0 +1,58 @@ +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.StClassRequestExcel; +import org.springblade.wms.pojo.dto.ClassOutboundDTO; +import org.springblade.wms.pojo.entity.StClassRequest; +import org.springblade.wms.pojo.vo.StClassRequestVO; + +import java.util.List; + +/** + * @version 1.0 + * @program: jonhon-mes-svr + * @ClassName IStClassRequestService + * @description: 班组提请表 服务类 + * @autor: WuSiYu + * @create 2026-01-08 14:54 + **/ + +public interface IStClassRequestService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param stClassRequest 查询参数 + * @return IPage + */ + IPage selectStClassRequestPage(IPage page, StClassRequestVO stClassRequest); + + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportStClassRequest(Wrapper queryWrapper); + + String nextCode(Object o); + + boolean addOrEditBatch(List list, List deleteIds, BladeUser user); + + void classRequestOutbound(Long crId, Double outQuantity, Long rlsId, Long userId); + + void batchOut(List list, BladeUser user); + + Double getTeamNoOutStoreQtyByGoodsId(Long goodsId); + + void approvalRequest(Long id, Short approvalResult, BladeUser user); + + StClassRequest getByCrCode(String crCode); + + IPage selectStTeamRequestPage(IPage page, StClassRequestVO stClassRequest); +} + diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStErpWarehouseTransferService.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStErpWarehouseTransferService.java new file mode 100644 index 00000000..1a6204dc --- /dev/null +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStErpWarehouseTransferService.java @@ -0,0 +1,45 @@ +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.StErpWarehouseTransferExcel; +import org.springblade.wms.pojo.entity.StErpWarehouseTransfer; +import org.springblade.wms.pojo.vo.StErpWarehouseTransferVO; + +import java.util.List; + +/** + * @version 1.0 + * @program: jonhon-mes-svr + * @ClassName IStErpWarehouseTransferService + * @description: ERP库转移记录表 服务类 + * @autor: WuSiYu + * @create 2026-01-06 11:50 + **/ + +public interface IStErpWarehouseTransferService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param stErpWarehouseTransfer 查询参数 + * @return IPage + */ + IPage selectStErpWarehouseTransferPage(IPage page, StErpWarehouseTransferVO stErpWarehouseTransfer); + + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportStErpWarehouseTransfer(Wrapper queryWrapper); + + void transferReceipt(Long shId, Long slId, Long ewtId, Double putQuantity, BladeUser user); + + void transferReceiptBatch(BladeUser user); +} + diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStExpireRecordService.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStExpireRecordService.java new file mode 100644 index 00000000..91acb4d3 --- /dev/null +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStExpireRecordService.java @@ -0,0 +1,52 @@ +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.StExpireRecordExcel; +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; + +/** + * @version 1.0 + * @program: jonhon-mes-svr + * @ClassName IStExpireRecordService + * @description: 到期维护记录表 服务类 + * @autor: WuSiYu + * @create 2025-12-29 18:06 + **/ + +public interface IStExpireRecordService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param stExpireRecord 查询参数 + * @return IPage + */ + IPage selectStExpireRecordPage(IPage page, StExpireRecordVO stExpireRecord); + + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportStExpireRecord(Wrapper queryWrapper); + + void editStopUse(Long rlsId, Boolean stopUse, String memo); + + void expireHandle(List rlsIdArr, String dueDate, BladeUser user); + + void invalidatedOut(Long rlsId, Double outQty, String memo, String bfCode, Long rrId, String woCode, Short bfType, BladeUser user); + + void batchInvalidatedOut(StExpireRecordDTO dto, BladeUser user); +} + diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStExpireSubmissionService.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStExpireSubmissionService.java new file mode 100644 index 00000000..63e52011 --- /dev/null +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStExpireSubmissionService.java @@ -0,0 +1,43 @@ +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.StExpireSubmissionExcel; +import org.springblade.wms.pojo.entity.StExpireSubmission; +import org.springblade.wms.pojo.vo.StExpireSubmissionVO; + +import java.util.List; + +/** + * @version 1.0 + * @program: jonhon-mes-svr + * @ClassName IStExpireSubmissionService + * @description: 到期送检表 服务类 + * @autor: WuSiYu + * @create 2025-12-31 15:55 + **/ + +public interface IStExpireSubmissionService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param stExpireSubmission 查询参数 + * @return IPage + */ + IPage selectStExpireSubmissionPage(IPage page, StExpireSubmissionVO stExpireSubmission); + + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportStExpireSubmission(Wrapper queryWrapper); + + void saveOrEdit(List list, BladeUser user); +} + diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStGlassCakeOutService.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStGlassCakeOutService.java new file mode 100644 index 00000000..4622f9a7 --- /dev/null +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStGlassCakeOutService.java @@ -0,0 +1,52 @@ +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.StGlassCakeOutExcel; +import org.springblade.wms.pojo.dto.StGlassCakeOutDTO; +import org.springblade.wms.pojo.entity.StGlassCakeOut; +import org.springblade.wms.pojo.vo.StGlassCakeOutVO; + +import java.util.List; +import java.util.Map; + +/** + * @version 1.0 + * @program: jonhon-mes-svr + * @ClassName IStAllotRecordService + * @description: 玻璃饼出库 服务类 + * @autor: WuSiYu + * @create 2026-01-16 18:00 + **/ +public interface IStGlassCakeOutService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param stGlassCakeOut 查询参数 + * @return IPage + */ + IPage selectStGlassCakeOutPage(IPage page, StGlassCakeOutVO stGlassCakeOut); + + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportStGlassCakeOut(Wrapper queryWrapper); + + List scanCardProcess(String cardNo, BladeUser user); + + StGlassCakeOut submitOutStock(StGlassCakeOut stGlassCakeOut, BladeUser user); + + List generatePreOutOrder(StGlassCakeOutDTO dto); + + Map batchGeneratePreOutOrder(List dtoList); + + List batchSubmitOutStock(List paramList, BladeUser user); +} + diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStGoodsClassService.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStGoodsClassService.java new file mode 100644 index 00000000..125b73d4 --- /dev/null +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStGoodsClassService.java @@ -0,0 +1,46 @@ +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.wms.excel.StGoodsClassExcel; +import org.springblade.wms.pojo.entity.StGoodsClass; +import org.springblade.wms.pojo.vo.StGoodsClassVO; + +import java.util.List; + +/** + * @version 1.0 + * @program: jonhon-mes-svr + * @ClassName IStGoodsClassService + * @description: + * @autor: WuSiYu + * @create 2025-12-12 16:28 + **/ + +public interface IStGoodsClassService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param stGoodsClass 查询参数 + * @return IPage + */ + IPage selectStGoodsClassPage(IPage page, StGoodsClassVO stGoodsClass); + + Boolean checkName(Long id, String gcName); + + Boolean checkCode(Long id, String gcCode); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportStGoodsClass(Wrapper queryWrapper); + + List findGoodsClass(String filterValue); + +} + diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStGoodsExtService.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStGoodsExtService.java new file mode 100644 index 00000000..b3734138 --- /dev/null +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStGoodsExtService.java @@ -0,0 +1,45 @@ +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.wms.excel.StGoodsExtExcel; +import org.springblade.wms.pojo.entity.StGoodsExt; +import org.springblade.wms.pojo.vo.StGoodsExtVO; + +import java.util.List; +import java.util.Map; + +/** + * @version 1.0 + * @program: jonhon-mes-svr + * @ClassName IStGoodsExtService + * @description: 物料状态表 服务类 + * @autor: WuSiYu + * @create 2025-12-15 14:30 + **/ + +public interface IStGoodsExtService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param stGoodsExt 查询参数 + * @return IPage + */ + IPage selectStGoodsExtPage(IPage page, StGoodsExtVO stGoodsExt); + + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportStGoodsExt(Wrapper queryWrapper); + + IPage selectGoodsExtPage(IPage page, Map stGoodsExt); + + Boolean getSpecial(Long goodsId); +} + diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStLendService.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStLendService.java new file mode 100644 index 00000000..d754f35e --- /dev/null +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStLendService.java @@ -0,0 +1,49 @@ +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.StLendExcel; +import org.springblade.wms.pojo.dto.StLendDTO; +import org.springblade.wms.pojo.entity.StLend; +import org.springblade.wms.pojo.vo.StLendVO; + +import java.util.List; + +/** + * @version 1.0 + * @program: jonhon-mes-svr + * @ClassName IStLendService + * @description: 物料借用 服务类 + * @autor: WuSiYu + * @create 2026-01-09 17:23 + **/ + +public interface IStLendService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param stLend 查询参数 + * @return IPage + */ + IPage selectStLendPage(IPage page, StLendVO stLend); + + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportStLend(Wrapper queryWrapper); + + String nextCode(); + + boolean saveOrEditBatch(List stLendList, BladeUser user) throws Exception; + + List generateRtnDataByBarCode(String barCode); + +} + diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStLockGoodsService.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStLockGoodsService.java new file mode 100644 index 00000000..4512c0ec --- /dev/null +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStLockGoodsService.java @@ -0,0 +1,44 @@ +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.wms.excel.StLockGoodsExcel; +import org.springblade.wms.pojo.entity.StLockGoods; +import org.springblade.wms.pojo.vo.StLockGoodsVO; + +import java.util.List; + +/** + * @version 1.0 + * @program: jonhon-mes-svr + * @ClassName IStLockGoodsService + * @description: 锁料记录表 服务类 + * @autor: WuSiYu + * @create 2026-01-05 15:09 + **/ + +public interface IStLockGoodsService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param stLockGoods 查询参数 + * @return IPage + */ + IPage selectStLockGoodsPage(IPage page, StLockGoodsVO stLockGoods); + + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportStLockGoods(Wrapper queryWrapper); + + StLockGoods getByBrId(Long id); + + void addOutQuantity(Double quantity, Long id); +} + diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStMeasuringMaintenService.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStMeasuringMaintenService.java new file mode 100644 index 00000000..e1214f14 --- /dev/null +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStMeasuringMaintenService.java @@ -0,0 +1,45 @@ +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.StMeasuringMaintenExcel; +import org.springblade.wms.pojo.entity.StMeasuringMainten; +import org.springblade.wms.pojo.vo.StMeasuringMaintenVO; + +import java.util.List; + +/** + * @version 1.0 + * @program: jonhon-mes-svr + * @ClassName IStMeasuringMaintenService + * @description: 量具保养表 服务类 + * @autor: WuSiYu + * @create 2025-12-26 13:17 + **/ + +public interface IStMeasuringMaintenService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param stMeasuringMainten 查询参数 + * @return IPage + */ + IPage selectStMeasuringMaintenPage(IPage page, StMeasuringMaintenVO stMeasuringMainten); + + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportStMeasuringMainten(Wrapper queryWrapper); + + boolean saveData(List rlsIds, BladeUser user); + + boolean maintenanceAppFun(List mmIdLst, BladeUser user); +} + diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStMoldApplyForService.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStMoldApplyForService.java new file mode 100644 index 00000000..750beae4 --- /dev/null +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStMoldApplyForService.java @@ -0,0 +1,44 @@ +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.StMoldApplyForExcel; +import org.springblade.wms.pojo.entity.StMoldApplyFor; +import org.springblade.wms.pojo.vo.StMoldApplyForVO; + +import java.util.List; + +/** + * @version 1.0 + * @program: jonhon-mes-svr + * @ClassName IStMoldApplyForService + * @description: 工装计划申请表 服务类 + * @autor: WuSiYu + * @create 2025-12-30 17:50 + **/ + +public interface IStMoldApplyForService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param stMoldApplyFor 查询参数 + * @return IPage + */ + IPage selectStMoldApplyForPage(IPage page, StMoldApplyForVO stMoldApplyFor); + + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportStMoldApplyFor(Wrapper queryWrapper); + + void addOrEditProcess(List list, List deleteIds, BladeUser user); + +} + diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStMoldBaseService.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStMoldBaseService.java new file mode 100644 index 00000000..2b7a4dc4 --- /dev/null +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStMoldBaseService.java @@ -0,0 +1,45 @@ +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.wms.excel.StMoldBaseExcel; +import org.springblade.wms.pojo.entity.StMoldBase; +import org.springblade.wms.pojo.vo.StMoldBaseVO; + +import java.util.List; + +/** + * @version 1.0 + * @program: jonhon-mes-svr + * @ClassName IStMoldBaseService + * @description: 模具关系表 服务类 + * @autor: WuSiYu + * @create 2025-12-25 14:56 + **/ + +public interface IStMoldBaseService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param stMoldBase 查询参数 + * @return IPage + */ + IPage selectStMoldBasePage(IPage page, StMoldBaseVO stMoldBase); + + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportStMoldBase(Wrapper queryWrapper); + + List getByGoodsId(Long goodsId); + + boolean addOrEdit(List list, List deleteIds); + +} + diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStOtherOutRecordService.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStOtherOutRecordService.java new file mode 100644 index 00000000..0ae8cfd0 --- /dev/null +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStOtherOutRecordService.java @@ -0,0 +1,53 @@ +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.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; + +import java.util.List; + +/** + * @version 1.0 + * @program: jonhon-mes-svr + * @ClassName IStOtherOutRecordService + * @description: 其他出库表 服务类 + * @autor: WuSiYu + * @create 2026-01-07 14:05 + **/ + +public interface IStOtherOutRecordService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param stOtherOutRecord 查询参数 + * @return IPage + */ + IPage selectStOtherOutRecordPage(IPage page, StOtherOutRecordVO stOtherOutRecord); + + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportStOtherOutRecord(Wrapper queryWrapper); + + void addOtherOutRecord(StOtherOutRecord stOtherOutRecord, List outList, BladeUser user); + + StOtherOutRecord getBySirId(Long id); + + void approvalRequest(Long id, Short approvalResult, BladeUser user); + + void createPendingOutRecord(StOtherOutRecord record, List stockList, BladeUser user); + + StOtherOutRecordVO getDetail(Long id); +} + diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStOtherReceiptRecordService.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStOtherReceiptRecordService.java new file mode 100644 index 00000000..3d873b9f --- /dev/null +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStOtherReceiptRecordService.java @@ -0,0 +1,49 @@ +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.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; + +import java.util.List; + +/** + * @version 1.0 + * @program: jonhon-mes-svr + * @ClassName IStOtherReceiptRecordService + * @description: 其他入库表 服务类 + * @autor: WuSiYu + * @create 2026-01-04 15:55 + **/ + +public interface IStOtherReceiptRecordService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param stOtherReceiptRecord 查询参数 + * @return IPage + */ + IPage selectStOtherReceiptRecordPage(IPage page, StOtherReceiptRecordVO stOtherReceiptRecord); + + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportStOtherReceiptRecord(Wrapper queryWrapper); + + void saveImportData(List list, BladeUser user) throws Exception; + + void otherWarehousing(StOtherReceiptRecord stOtherReceiptRecord, BladeUser user); + + List getGlassCakeByWoCode(String woCode); +} + diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStPdmApi.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStPdmApi.java new file mode 100644 index 00000000..4baf8cec --- /dev/null +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStPdmApi.java @@ -0,0 +1,19 @@ +package org.springblade.wms.service; + +import org.springblade.core.mp.base.BaseService; +import org.springblade.wms.pojo.entity.StGoods; + +import java.util.List; + +/** + * @version 1.0 + * @program: jonhon-mes-svr + * @ClassName IStErpApi + * @description: + * @autor: WuSiYu + * @create 2025-12-16 10:38 + **/ + +public interface IStPdmApi extends BaseService { + void saveGoodsInfo(List prtnoList) throws Exception; +} diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStRealtimeStockService.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStRealtimeStockService.java index e5d41b0f..5403c78e 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStRealtimeStockService.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStRealtimeStockService.java @@ -5,16 +5,11 @@ 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.StRealtimeStockExcel; -import org.springblade.wms.pojo.entity.StRealtimeStock; -import org.springblade.wms.pojo.entity.StStockInoutRecord; -import org.springblade.wms.pojo.entity.StStorageLocation; -import org.springblade.wms.pojo.entity.StStoreBill; -import org.springblade.wms.pojo.vo.PrintParentWoLabel; -import org.springblade.wms.pojo.vo.PrintStoresList; -import org.springblade.wms.pojo.vo.StGoodStatisVO; -import org.springblade.wms.pojo.vo.StRealtimeStockVO; +import org.springblade.wms.pojo.entity.*; +import org.springblade.wms.pojo.vo.*; import java.util.List; +import java.util.Map; /** * @version 1.0 @@ -62,7 +57,7 @@ public interface IStRealtimeStockService extends BaseService { Double findPriceByParams(Long goodsId, String checkNo); - IPage selectByGoodsIdShId(Long goodsId, Long shId, String deptId); + IPage selectByGoodsIdShId(IPage page, Long goodsId, Long shId,Long slId,String piNo); // IPage selectGoodsOut(String filterValue, Long shId, Long goodsId, String deptId, Integer current, Integer size); @@ -79,17 +74,37 @@ public interface IStRealtimeStockService extends BaseService { IPage selectStockGoodsPage(IPage page, StRealtimeStockVO stRealtimeStock); IPage selectToolsStockPage(IPage page, StRealtimeStockVO stRealtimeStock); + + IPage selectNearExpiry30DaysPage(IPage page, StRealtimeStockVO stRealtimeStock); + + StRealtimeStock getBySlIdAndGoodsCode(Long slId, String goodsCode); + + List findBySlIdAndGoodsCode(Long slId, String goodsCode); + + List findByPiNoAndGoodsCode(String piNo, String goodsCode); + + Double selectGoodsStockTotal(String goodsCode); + + List findStorehouseByGoodsCode(String goodsCode); + + StRealtimeStock getByGoodsCodeAndShIdAndSlId(String goodsCode, Long shId, Long slId); + + Map getBarCode(Long rlsId); + + +// void updateById(StRealtimeStockLock stockLock); + /** * 根据物料编码查询库存信息 * @param partCode * @return */ - List getGoodsByPartCode(String partCode); - /** - * 根据物料编码统计信息 - * @param partCode - * @return - */ - StGoodStatisVO getGoodsByCode(String partCode); +// List getGoodsByPartCode(String partCode); +// /** +// * 根据物料编码统计信息 +// * @param partCode +// * @return +// */ +// StGoodStatisVO getGoodsByCode(String partCode); } diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStRequisitionService.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStRequisitionService.java new file mode 100644 index 00000000..657ae1e1 --- /dev/null +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStRequisitionService.java @@ -0,0 +1,56 @@ +package org.springblade.wms.service; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import jakarta.servlet.http.HttpServletResponse; +import org.springblade.core.mp.base.BaseService; +import org.springblade.core.secure.BladeUser; +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.vo.StRequisitionVO; + +import java.util.List; +import java.util.Map; + +/** + * @version 1.0 + * @program: jonhon-mes-svr + * @ClassName IStRequisitionService + * @description: 领料单打印 服务类 + * @autor: WuSiYu + * @create 2026-01-21 16:01 + **/ + +public interface IStRequisitionService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param stRequisition 查询参数 + * @return IPage + */ + IPage selectStRequisitionPage(IPage page, StRequisitionVO stRequisition); + + void updateStatus(Long srId, Short curStatus); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportStRequisition(Wrapper queryWrapper); + + List assembleExportData(QueryWrapper queryWrapper, String printType); + + void detailPrint(String idList, Short exportType, String print, HttpServletResponse response); + + IPage selectWaitPushPage(IPage page, StRequisitionVO stRequisition); + + void pushWarehose(List list, BladeUser user); + + Map getBarCode(Long srId); +} + diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStReturnRecordService.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStReturnRecordService.java new file mode 100644 index 00000000..8caf5045 --- /dev/null +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStReturnRecordService.java @@ -0,0 +1,43 @@ +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.StReturnRecordExcel; +import org.springblade.wms.pojo.entity.StReturnRecord; +import org.springblade.wms.pojo.vo.StReturnRecordVO; + +import java.util.List; + +/** + * @version 1.0 + * @program: jonhon-mes-svr + * @ClassName IStReturnRecordService + * @description: 归还记录 服务类 + * @autor: WuSiYu + * @create 2026-01-15 16:17 + **/ + +public interface IStReturnRecordService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param stReturnRecord 查询参数 + * @return IPage + */ + IPage selectStReturnRecordPage(IPage page, StReturnRecordVO stReturnRecord); + + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportStReturnRecord(Wrapper queryWrapper); + + boolean sendBackBatch(List stReturnRecordList, BladeUser user) throws Exception; +} + diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStStockInoutRecordService.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStStockInoutRecordService.java new file mode 100644 index 00000000..f1e04d5e --- /dev/null +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStStockInoutRecordService.java @@ -0,0 +1,51 @@ +package org.springblade.wms.service; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +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.StStockInoutRecordExcel; +import org.springblade.wms.pojo.entity.StGoods; +import org.springblade.wms.pojo.entity.StStockInoutRecord; +import org.springblade.wms.pojo.vo.StStockInoutRecordVO; + +import java.util.List; + +/** + * @version 1.0 + * @program: jonhon-mes-svr + * @ClassName IStStockInoutRecordService + * @description: 出入库记录表 服务类 + * @autor: WuSiYu + * @create 2026-01-04 11:26 + **/ + +public interface IStStockInoutRecordService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param stStockInoutRecord 查询参数 + * @return IPage + */ + IPage selectStStockInoutRecordPage(IPage page, StStockInoutRecordVO stStockInoutRecord); + + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportStStockInoutRecord(Wrapper queryWrapper); + + IPage getWarehousing(IPage page, QueryWrapper wrapper); + + String generateCode(); + + String getMaxPiNo(String typeCode); + + StStockInoutRecord createInoutRecord(Short inOutSource, Long shId, BladeUser createUser, BladeUser userId, Double arriveQuantity, Double unitPrice, String piNo, StGoods stGoods, Long brId, Long slId, String checkNo, String quantityLevel, String buyCode, boolean moldBaseMaterial); +} + diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStStorageLocationService.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStStorageLocationService.java new file mode 100644 index 00000000..5b82f32e --- /dev/null +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStStorageLocationService.java @@ -0,0 +1,55 @@ +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.wms.excel.StStorageLocationExcel; +import org.springblade.wms.pojo.entity.StStorageLocation; +import org.springblade.wms.pojo.vo.StStorageLocationVO; + +import java.util.List; + +/** + * @version 1.0 + * @program: jonhon-mes-svr + * @ClassName IStStorageLocationService + * @description: 库位维护表 服务类 + * @autor: WuSiYu + * @create 2025-12-18 14:41 + **/ + +public interface IStStorageLocationService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param stStorageLocation 查询参数 + * @return IPage + */ + IPage selectStStorageLocationPage(IPage page, StStorageLocationVO stStorageLocation); + + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportStStorageLocation(Wrapper queryWrapper); + + List findByShId(Long keyId); + + Boolean checkLocation(Long id, String location, Long shId); + + StStorageLocation findByGoodsCode(String goodsCode); + + List findByShIdAndGoodsId(Long shId, String goodsCode); + + boolean batchAddOrEdit(List stStorageLocations); + + StStorageLocation findByLocation(String location); + + IPage selectStStorageLocationAllPage(IPage page, StStorageLocationVO stStorageLocation); + +} + diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStStorehouseService.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStStorehouseService.java new file mode 100644 index 00000000..5b5571e3 --- /dev/null +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStStorehouseService.java @@ -0,0 +1,53 @@ +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; + +import java.util.List; + +/** + * @version 1.0 + * @program: jonhon-mes-svr + * @ClassName IStStorehouseService + * @description: 库房维护表 服务类 + * @autor: WuSiYu + * @create 2025-12-18 14:22 + **/ + +public interface IStStorehouseService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param stStorehouse 查询参数 + * @return IPage + */ + IPage selectStStorehousePage(IPage page, StStorehouseVO stStorehouse); + + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportStStorehouse(Wrapper queryWrapper); + + Boolean checkName(Long id, String shName); + + Boolean checkCode(Long id, String shCode); + + StStorehouse getByCode(String shCode); + +// IPage selectStorehousePage(IPage page, StStorehouseVO stStorehouse); + + Object assembleaStorehouse(Long userId, String urTypeStorehouse); + + IPage selectStorehousePage(IPage page, StStorehouseVO stStorehouse, Long userId, String urTypeStorehouse); +} + diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStUserRightService.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStUserRightService.java new file mode 100644 index 00000000..fe4b4e13 --- /dev/null +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStUserRightService.java @@ -0,0 +1,44 @@ +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 + * @program: jonhon-mes-svr + * @ClassName IStUserRightService + * @description: 人员权限表 服务类 + * @autor: WuSiYu + * @create 2026-01-20 15:04 + **/ + +public interface IStUserRightService extends BaseService { + void saveUserRight(Long shId, Long userId, List userIdList); + + void saveStorehouseRight(List shIdList, Long userId); + + Object assembleaUserRight(Long shId, String urTypeStorehouse); +// /** +// * 自定义分页 +// * +// * @param page 分页参数 +// * @param stUserRight 查询参数 +// * @return IPage +// */ +// IPage selectStUserRightPage(IPage page, StUserRightVO stUserRight); +// +// +// /** +// * 导出数据 +// * +// * @param queryWrapper 查询条件 +// * @return List +// */ +// List exportStUserRight(Wrapper queryWrapper); + +} + diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStWarehouseTransferRecordService.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStWarehouseTransferRecordService.java new file mode 100644 index 00000000..1a253e82 --- /dev/null +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStWarehouseTransferRecordService.java @@ -0,0 +1,37 @@ +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.StWarehouseTransferRecord; +import org.springblade.wms.pojo.vo.StWarehouseTransferRecordVO; + +/** + * @version 1.0 + * @program: jonhon-mes-svr + * @ClassName IStWarehouseTransferRecordService + * @description: 转移入库记录表 服务类 + * @autor: WuSiYu + * @create 2026-01-06 15:52 + **/ + +public interface IStWarehouseTransferRecordService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param stWarehouseTransferRecord 查询参数 + * @return IPage + */ + IPage selectStWarehouseTransferRecordPage(IPage page, StWarehouseTransferRecordVO stWarehouseTransferRecord); + + +// /** +// * 导出数据 +// * +// * @param queryWrapper 查询条件 +// * @return List +// */ +// List exportStWarehouseTransferRecord(Wrapper queryWrapper); + +} + diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStWmsRequestService.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStWmsRequestService.java new file mode 100644 index 00000000..ef93000d --- /dev/null +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStWmsRequestService.java @@ -0,0 +1,49 @@ +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.StWmsRequestExcel; +import org.springblade.wms.pojo.entity.StWmsRequest; +import org.springblade.wms.pojo.vo.StWmsRequestVO; + +import java.util.List; + +/** + * @version 1.0 + * @program: jonhon-mes-svr + * @ClassName IStWmsRequestService + * @description: 仓库提请记录 服务类 + * @autor: WuSiYu + * @create 2026-01-20 11:01 + **/ + +public interface IStWmsRequestService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param stWmsRequest 查询参数 + * @return IPage + */ + IPage selectStWmsRequestPage(IPage page, StWmsRequestVO stWmsRequest); + + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportStWmsRequest(Wrapper queryWrapper); + + void saveOrEdit(StWmsRequest stWmsRequest, BladeUser user); + + void updateStatusByKeyId(Long keyId, Short status); + + void approvalRequest(Long id, Short approvalResult, BladeUser user); + + void batchSaveOrEdit(List stWmsRequestList, BladeUser user); +} + diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/ISyDockingLogService.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/ISyDockingLogService.java new file mode 100644 index 00000000..cd767963 --- /dev/null +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/ISyDockingLogService.java @@ -0,0 +1,21 @@ +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; + +/** + * @version 1.0 + * @program: jonhon-mes-svr + * @ClassName ISyDockingLogService + * @description: 接口对接日志 服务类 + * @autor: WuSiYu + * @create 2026-01-16 17:03 + **/ + +public interface ISyDockingLogService extends BaseService { + + void sendDockingLog(String readType, String code, String readResult); + +} + diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/InitStockListener.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/InitStockListener.java new file mode 100644 index 00000000..df3bb6a2 --- /dev/null +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/InitStockListener.java @@ -0,0 +1,68 @@ +package org.springblade.wms.service.impl; + +import com.alibaba.excel.context.AnalysisContext; +import com.alibaba.excel.event.AnalysisEventListener; +import lombok.SneakyThrows; +import org.springblade.core.secure.BladeUser; +import org.springblade.core.secure.utils.AuthUtil; +import org.springblade.wms.pojo.dto.InitStockDTO; +import org.springblade.wms.service.IStOtherReceiptRecordService; + +import java.util.ArrayList; +import java.util.List; + +/** + * @version 1.0 + * @program: jonhon-mes-svr + * @ClassName InitStockListener + * @description: + * @autor: WuSiYu + * @create 2026-01-04 17:44 + **/ + +public class InitStockListener extends AnalysisEventListener { + protected static int count = 0; + private Long userId; + + private IStOtherReceiptRecordService stOtherReceiptRecordService; + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + + public InitStockListener(IStOtherReceiptRecordService stOtherReceiptRecordService, BladeUser user) { + this.stOtherReceiptRecordService = stOtherReceiptRecordService; + this.userId = user.getUserId(); + } + + protected List list = new ArrayList<>(); + + @SneakyThrows + @Override + public void invoke(InitStockDTO data, AnalysisContext context) { + if (data.getShCode() == null || data.getGoodsCode() == null + || data.getQuantity() == null || data.getLocation() == null) { + return; + } + + list.add(data); + if (list.size() >= 500) { + saveData(); + list = new ArrayList<>(500); + } + } + + @SneakyThrows + @Override + public void doAfterAllAnalysed(AnalysisContext analysisContext) { + saveData(); + } + private void saveData() throws Exception { + stOtherReceiptRecordService.saveImportData(list, AuthUtil.getUser()); + } + +} diff --git a/blade-service/blade-wms/src/main/resources/application-dev.yml b/blade-service/blade-wms/src/main/resources/application-dev.yml index 8a2d423b..6b14f03c 100644 --- a/blade-service/blade-wms/src/main/resources/application-dev.yml +++ b/blade-service/blade-wms/src/main/resources/application-dev.yml @@ -9,3 +9,8 @@ spring: username: ${blade.datasource.dev.username} password: ${blade.datasource.dev.password} +request: + pdm: + url: "http://192:168:119:235:8181" + extraPlan: + url: "http://192:168:18:121:10002"