From b98a0f06bade67a466aa205ab074ffb5e4ccc479 Mon Sep 17 00:00:00 2001 From: zc Date: Tue, 3 Mar 2026 17:58:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=A7=B0=E9=87=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../weighManage/mapper/WorkOrderMapper.java | 24 ++++++ .../weighManage/model/entity/WorkOrderDO.java | 44 ++++++++++ .../model/query/WorkOrderQuery.java | 57 +++++++++++++ .../weighManage/model/req/WorkOrderReq.java | 49 +++++++++++ .../weighManage/model/resp/MaterialResp.java | 14 --- .../weighManage/model/resp/WorkOrderResp.java | 85 +++++++++++++++++++ .../weighManage/service/WorkOrderService.java | 16 ++++ .../service/impl/WorkOrderServiceImpl.java | 43 ++++++++++ .../main/resources/mapper/WorkOrderMapper.xml | 14 +++ .../WeighManage/WeighController.java | 37 -------- .../weighManage/WorkOrderController.java | 29 +++++++ 11 files changed, 361 insertions(+), 51 deletions(-) create mode 100644 wms-module-system/src/main/java/top/wms/admin/weighManage/mapper/WorkOrderMapper.java create mode 100644 wms-module-system/src/main/java/top/wms/admin/weighManage/model/entity/WorkOrderDO.java create mode 100644 wms-module-system/src/main/java/top/wms/admin/weighManage/model/query/WorkOrderQuery.java create mode 100644 wms-module-system/src/main/java/top/wms/admin/weighManage/model/req/WorkOrderReq.java delete mode 100644 wms-module-system/src/main/java/top/wms/admin/weighManage/model/resp/MaterialResp.java create mode 100644 wms-module-system/src/main/java/top/wms/admin/weighManage/model/resp/WorkOrderResp.java create mode 100644 wms-module-system/src/main/java/top/wms/admin/weighManage/service/WorkOrderService.java create mode 100644 wms-module-system/src/main/java/top/wms/admin/weighManage/service/impl/WorkOrderServiceImpl.java create mode 100644 wms-module-system/src/main/resources/mapper/WorkOrderMapper.xml delete mode 100644 wms-webapi/src/main/java/top/wms/admin/controller/WeighManage/WeighController.java create mode 100644 wms-webapi/src/main/java/top/wms/admin/controller/weighManage/WorkOrderController.java diff --git a/wms-module-system/src/main/java/top/wms/admin/weighManage/mapper/WorkOrderMapper.java b/wms-module-system/src/main/java/top/wms/admin/weighManage/mapper/WorkOrderMapper.java new file mode 100644 index 0000000..2e91972 --- /dev/null +++ b/wms-module-system/src/main/java/top/wms/admin/weighManage/mapper/WorkOrderMapper.java @@ -0,0 +1,24 @@ +package top.wms.admin.weighManage.mapper; + +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 org.apache.ibatis.annotations.Param; +import top.continew.starter.data.mp.base.BaseMapper; +import top.wms.admin.weighManage.model.entity.WorkOrderDO; +import org.springframework.stereotype.Repository; +import top.wms.admin.weighManage.model.resp.WorkOrderResp; + +/** +* 任务工单信息 Mapper +* +* @author zc +* @since 2026/03/03 17:09 +*/ +@Repository +public interface WorkOrderMapper extends BaseMapper { + + IPage selectWorkOrderPage(@Param("page") Page objectPage, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + +} \ No newline at end of file diff --git a/wms-module-system/src/main/java/top/wms/admin/weighManage/model/entity/WorkOrderDO.java b/wms-module-system/src/main/java/top/wms/admin/weighManage/model/entity/WorkOrderDO.java new file mode 100644 index 0000000..d0c18f3 --- /dev/null +++ b/wms-module-system/src/main/java/top/wms/admin/weighManage/model/entity/WorkOrderDO.java @@ -0,0 +1,44 @@ +package top.wms.admin.weighManage.model.entity; + +import lombok.Data; + +import com.baomidou.mybatisplus.annotation.TableName; + +import top.wms.admin.common.model.entity.BaseDO; + +import java.io.Serial; +import java.math.BigDecimal; + +/** + * 任务工单信息实体 + * + * @author zc + * @since 2026/03/03 17:09 + */ +@Data +@TableName("sys_work_order") +public class WorkOrderDO extends BaseDO { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 标题 + */ + private String title; + + /** + * 任务工单号 + */ + private String orderNo; + + /** + * 物料主键id + */ + private Long materialId; + + /** + * 总重量 + */ + private BigDecimal totalWeight; +} \ No newline at end of file diff --git a/wms-module-system/src/main/java/top/wms/admin/weighManage/model/query/WorkOrderQuery.java b/wms-module-system/src/main/java/top/wms/admin/weighManage/model/query/WorkOrderQuery.java new file mode 100644 index 0000000..0b50da2 --- /dev/null +++ b/wms-module-system/src/main/java/top/wms/admin/weighManage/model/query/WorkOrderQuery.java @@ -0,0 +1,57 @@ +package top.wms.admin.weighManage.model.query; + +import lombok.Data; + +import io.swagger.v3.oas.annotations.media.Schema; + +import top.continew.starter.data.core.annotation.Query; +import top.continew.starter.data.core.enums.QueryType; + +import java.io.Serial; +import java.io.Serializable; +import java.time.*; +import java.math.BigDecimal; + +/** + * 任务工单信息查询条件 + * + * @author zc + * @since 2026/03/03 17:09 + */ +@Data +@Schema(description = "任务工单信息查询条件") +public class WorkOrderQuery implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 总重量 + */ + @Schema(description = "总重量") + private BigDecimal totalWeight; + + /** + * 任务工单号 + */ + @Schema(description = "任务工单号") + private String orderNo; + + /** + * 物料名称 + */ + @Schema(description = "物料名称") + private String materialName; + + /** + * 创建人 + */ + @Schema(description = "创建人") + private Long createUser; + + /** + * 创建时间 + */ + @Schema(description = "创建时间") + private LocalDateTime createTime; +} \ No newline at end of file diff --git a/wms-module-system/src/main/java/top/wms/admin/weighManage/model/req/WorkOrderReq.java b/wms-module-system/src/main/java/top/wms/admin/weighManage/model/req/WorkOrderReq.java new file mode 100644 index 0000000..32c200a --- /dev/null +++ b/wms-module-system/src/main/java/top/wms/admin/weighManage/model/req/WorkOrderReq.java @@ -0,0 +1,49 @@ +package top.wms.admin.weighManage.model.req; + +import jakarta.validation.constraints.*; + +import lombok.Data; + +import io.swagger.v3.oas.annotations.media.Schema; + +import org.hibernate.validator.constraints.Length; + +import java.io.Serial; +import java.io.Serializable; +import java.time.*; +import java.math.BigDecimal; + +/** + * 创建或修改任务工单信息参数 + * + * @author zc + * @since 2026/03/03 17:09 + */ +@Data +@Schema(description = "创建或修改任务工单信息参数") +public class WorkOrderReq implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 总重量 + */ + @Schema(description = "总重量") + @NotNull(message = "总重量不能为空") + private BigDecimal totalWeight; + + /** + * 创建人 + */ + @Schema(description = "创建人") + @NotNull(message = "创建人不能为空") + private Long createUser; + + /** + * 创建时间 + */ + @Schema(description = "创建时间") + @NotNull(message = "创建时间不能为空") + private LocalDateTime createTime; +} \ No newline at end of file diff --git a/wms-module-system/src/main/java/top/wms/admin/weighManage/model/resp/MaterialResp.java b/wms-module-system/src/main/java/top/wms/admin/weighManage/model/resp/MaterialResp.java deleted file mode 100644 index 723f024..0000000 --- a/wms-module-system/src/main/java/top/wms/admin/weighManage/model/resp/MaterialResp.java +++ /dev/null @@ -1,14 +0,0 @@ -package top.wms.admin.weighManage.model.resp; - -import lombok.Data; - -@Data -public class MaterialResp { - private Long id; - private String materialCode; - private String materialName; - private String materialSpec; - private String weight; - private String imageUrl; - -} diff --git a/wms-module-system/src/main/java/top/wms/admin/weighManage/model/resp/WorkOrderResp.java b/wms-module-system/src/main/java/top/wms/admin/weighManage/model/resp/WorkOrderResp.java new file mode 100644 index 0000000..c1c8d0b --- /dev/null +++ b/wms-module-system/src/main/java/top/wms/admin/weighManage/model/resp/WorkOrderResp.java @@ -0,0 +1,85 @@ +package top.wms.admin.weighManage.model.resp; + +import lombok.Data; + +import io.swagger.v3.oas.annotations.media.Schema; + +import top.wms.admin.common.model.resp.BaseDetailResp; + +import java.io.Serial; +import java.time.*; +import java.math.BigDecimal; + +/** + * 任务工单信息信息 + * + * @author zc + * @since 2026/03/03 17:09 + */ +@Data +@Schema(description = "任务工单信息信息") +public class WorkOrderResp extends BaseDetailResp { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 标题 + */ + @Schema(description = "标题") + private String title; + + /** + * 物料主键id + */ + @Schema(description = "物料主键id") + private Long materialId; + + /** + * 物料名称 + */ + @Schema(description = "物料名称") + private String materialName; + + /** + * 物料编码 + */ + @Schema(description = "物料编码") + private String encoding; + + /** + * 物料单位重量 + */ + @Schema(description = "物料单位重量") + private BigDecimal unitWeight; + + /** + * 物料规格 + */ + @Schema(description = "物料规格") + private String materialSpec; + + /** + * 物料图片 + */ + @Schema(description = "物料图片") + private String photoUrl; + + /** + * 总重量 + */ + @Schema(description = "总重量") + private BigDecimal totalWeight; + + /** + * 修改人 + */ + @Schema(description = "修改人") + private Long updateUser; + + /** + * 修改时间 + */ + @Schema(description = "修改时间") + private LocalDateTime updateTime; +} \ No newline at end of file diff --git a/wms-module-system/src/main/java/top/wms/admin/weighManage/service/WorkOrderService.java b/wms-module-system/src/main/java/top/wms/admin/weighManage/service/WorkOrderService.java new file mode 100644 index 0000000..9b87758 --- /dev/null +++ b/wms-module-system/src/main/java/top/wms/admin/weighManage/service/WorkOrderService.java @@ -0,0 +1,16 @@ +package top.wms.admin.weighManage.service; + +import top.continew.starter.extension.crud.service.BaseService; +import top.wms.admin.weighManage.model.query.WorkOrderQuery; +import top.wms.admin.weighManage.model.req.WorkOrderReq; +import top.wms.admin.weighManage.model.resp.WorkOrderResp; + +/** + * 任务工单信息业务接口 + * + * @author zc + * @since 2026/03/03 17:09 + */ +public interface WorkOrderService extends BaseService { + +} \ No newline at end of file diff --git a/wms-module-system/src/main/java/top/wms/admin/weighManage/service/impl/WorkOrderServiceImpl.java b/wms-module-system/src/main/java/top/wms/admin/weighManage/service/impl/WorkOrderServiceImpl.java new file mode 100644 index 0000000..c6d83fb --- /dev/null +++ b/wms-module-system/src/main/java/top/wms/admin/weighManage/service/impl/WorkOrderServiceImpl.java @@ -0,0 +1,43 @@ +package top.wms.admin.weighManage.service.impl; + +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.extension.plugins.pagination.Page; +import lombok.RequiredArgsConstructor; + +import org.springframework.stereotype.Service; + +import top.continew.starter.extension.crud.model.query.PageQuery; +import top.continew.starter.extension.crud.model.resp.PageResp; +import top.continew.starter.extension.crud.service.BaseServiceImpl; +import top.wms.admin.weighManage.mapper.WorkOrderMapper; +import top.wms.admin.weighManage.model.entity.WorkOrderDO; +import top.wms.admin.weighManage.model.query.WorkOrderQuery; +import top.wms.admin.weighManage.model.req.WorkOrderReq; +import top.wms.admin.weighManage.model.resp.WorkOrderResp; +import top.wms.admin.weighManage.service.WorkOrderService; + +/** + * 任务工单信息业务实现 + * + * @author zc + * @since 2026/03/03 17:09 + */ +@Service +@RequiredArgsConstructor +public class WorkOrderServiceImpl extends BaseServiceImpl implements WorkOrderService { + + @Override + public PageResp page(WorkOrderQuery query, PageQuery pageQuery) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.like(StrUtil.isNotBlank(query.getMaterialName()), "m.material_name", query.getMaterialName()); + queryWrapper.eq(null != query.getOrderNo(), "w.order_no", query.getOrderNo()); + this.sort(queryWrapper, pageQuery); + + IPage page = baseMapper.selectWorkOrderPage(new Page<>(pageQuery.getPage(), pageQuery + .getSize()), queryWrapper); + + return PageResp.build(page); + } +} \ No newline at end of file diff --git a/wms-module-system/src/main/resources/mapper/WorkOrderMapper.xml b/wms-module-system/src/main/resources/mapper/WorkOrderMapper.xml new file mode 100644 index 0000000..a87b910 --- /dev/null +++ b/wms-module-system/src/main/resources/mapper/WorkOrderMapper.xml @@ -0,0 +1,14 @@ + + + + + + + \ No newline at end of file diff --git a/wms-webapi/src/main/java/top/wms/admin/controller/WeighManage/WeighController.java b/wms-webapi/src/main/java/top/wms/admin/controller/WeighManage/WeighController.java deleted file mode 100644 index e61ebce..0000000 --- a/wms-webapi/src/main/java/top/wms/admin/controller/WeighManage/WeighController.java +++ /dev/null @@ -1,37 +0,0 @@ -package top.wms.admin.controller.WeighManage; - -import cn.dev33.satoken.annotation.SaCheckPermission; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.*; -import top.wms.admin.weighManage.model.resp.MaterialResp; - -/** - * 部门管理管理 API - * - * @author zc - * @since 2025/03/19 17:46 - */ -@Tag(name = "部门管理管理 API") -@RestController -@RequiredArgsConstructor -@RequestMapping("/weighManage/material") -public class WeighController { - - /** - * 获取材料详细信息 - */ - @SaCheckPermission("Weigh:material:detail") - @GetMapping(value = "/detail") - public MaterialResp getInfo() { - MaterialResp materialResp = new MaterialResp(); - materialResp.setId(1L); - materialResp.setMaterialCode("123"); - materialResp.setMaterialName("测试材料"); - materialResp.setMaterialSpec("测试规格"); - materialResp.setWeight("100"); - materialResp.setImageUrl("http://example.com/image.jpg"); - return materialResp; - } - -} \ No newline at end of file diff --git a/wms-webapi/src/main/java/top/wms/admin/controller/weighManage/WorkOrderController.java b/wms-webapi/src/main/java/top/wms/admin/controller/weighManage/WorkOrderController.java new file mode 100644 index 0000000..ae1cc0d --- /dev/null +++ b/wms-webapi/src/main/java/top/wms/admin/controller/weighManage/WorkOrderController.java @@ -0,0 +1,29 @@ +package top.wms.admin.controller.weighManage; + +import top.continew.starter.extension.crud.enums.Api; + +import io.swagger.v3.oas.annotations.tags.Tag; + +import org.springframework.web.bind.annotation.*; + +import lombok.RequiredArgsConstructor; +import top.continew.starter.extension.crud.annotation.CrudRequestMapping; +import top.wms.admin.common.controller.BaseController; +import top.wms.admin.weighManage.model.query.WorkOrderQuery; +import top.wms.admin.weighManage.model.req.WorkOrderReq; +import top.wms.admin.weighManage.model.resp.WorkOrderResp; +import top.wms.admin.weighManage.service.WorkOrderService; + +/** + * 任务工单信息管理 API + * + * @author zc + * @since 2026/03/03 17:09 + */ +@Tag(name = "任务工单信息管理 API") +@RestController +@RequiredArgsConstructor +@CrudRequestMapping(value = "/weighManage/workOrder", api = {Api.PAGE, Api.DETAIL, Api.ADD, Api.DELETE, Api.EXPORT}) +public class WorkOrderController extends BaseController { + +} \ No newline at end of file