diff --git a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/stockingivt/vo/PaperVehicleInventoryRespVO.java b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/stockingivt/vo/PaperVehicleInventoryRespVO.java new file mode 100644 index 00000000..94cf695d --- /dev/null +++ b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/stockingivt/vo/PaperVehicleInventoryRespVO.java @@ -0,0 +1,25 @@ +package cn.code.nl.module.lms.controller.admin.stockingivt.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * 纸管托盘格位库存响应。 + */ +@Schema(description = "管理后台 - 纸管托盘格位库存 Response VO") +@Data +public class PaperVehicleInventoryRespVO { + + @Schema(description = "行号") + private Integer rowNum; + @Schema(description = "列号") + private Integer colNum; + @Schema(description = "物料编码") + private String materialCode; + @Schema(description = "物料名称") + private String materialName; + @Schema(description = "数量") + private BigDecimal qty; +} diff --git a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/stockingivt/vo/StockingIvtPageReqVO.java b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/stockingivt/vo/StockingIvtPageReqVO.java new file mode 100644 index 00000000..3cdecae9 --- /dev/null +++ b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/stockingivt/vo/StockingIvtPageReqVO.java @@ -0,0 +1,26 @@ +package cn.code.nl.module.lms.controller.admin.stockingivt.vo; + +import cn.code.nl.framework.common.pojo.PageParam; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +/** + * 备货区域分页请求。 + */ +@Schema(description = "管理后台 - 备货区域分页 Request VO") +@Data +public class StockingIvtPageReqVO extends PageParam { + + @Schema(description = "点位编码") + private String pointCode; + @Schema(description = "点位名称") + private String pointName; + @Schema(description = "托盘号") + private String vehicleCode; + @Schema(description = "点位类型") + private String pointType; + @Schema(description = "点位状态") + private String ivtStatus; + @Schema(description = "是否启用") + private String isUsed; +} diff --git a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/stockingivt/vo/StockingIvtRespVO.java b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/stockingivt/vo/StockingIvtRespVO.java new file mode 100644 index 00000000..761c27f6 --- /dev/null +++ b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/stockingivt/vo/StockingIvtRespVO.java @@ -0,0 +1,39 @@ +package cn.code.nl.module.lms.controller.admin.stockingivt.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.time.LocalDateTime; + +/** + * 备货区域响应。 + */ +@Schema(description = "管理后台 - 备货区域 Response VO") +@Data +public class StockingIvtRespVO { + + @Schema(description = "库存记录标识") + private Long ivtId; + @Schema(description = "点位编码") + private String pointCode; + @Schema(description = "点位名称") + private String pointName; + @Schema(description = "托盘号") + private String vehicleCode; + @Schema(description = "点位类型") + private String pointType; + @Schema(description = "点位状态") + private String ivtStatus; + @Schema(description = "位置") + private String pointLocation; + @Schema(description = "顺序号") + private Integer sortSeq; + @Schema(description = "是否启用") + private String isUsed; + @Schema(description = "备注") + private String remark; + @Schema(description = "修改人") + private String updater; + @Schema(description = "修改时间") + private LocalDateTime updateTime; +} diff --git a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/stockingivt/vo/StockingIvtUpdateReqVO.java b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/stockingivt/vo/StockingIvtUpdateReqVO.java new file mode 100644 index 00000000..626e4ff1 --- /dev/null +++ b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/stockingivt/vo/StockingIvtUpdateReqVO.java @@ -0,0 +1,36 @@ +package cn.code.nl.module.lms.controller.admin.stockingivt.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +/** + * 备货区域修改请求。 + */ +@Schema(description = "管理后台 - 备货区域修改 Request VO") +@Data +public class StockingIvtUpdateReqVO { + + @Schema(description = "库存记录标识", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "库存记录标识不能为空") + private Long ivtId; + @Schema(description = "托盘号") + private String vehicleCode; + @Schema(description = "点位类型", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "点位类型不能为空") + private String pointType; + @Schema(description = "点位状态", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "点位状态不能为空") + private String ivtStatus; + @Schema(description = "位置") + private String pointLocation; + @Schema(description = "顺序号", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "顺序号不能为空") + private Integer sortSeq; + @Schema(description = "是否启用", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "是否启用不能为空") + private String isUsed; + @Schema(description = "备注") + private String remark; +} diff --git a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/dal/dataobject/stockingivt/PaperVehicleDO.java b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/dal/dataobject/stockingivt/PaperVehicleDO.java new file mode 100644 index 00000000..52be0233 --- /dev/null +++ b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/dal/dataobject/stockingivt/PaperVehicleDO.java @@ -0,0 +1,31 @@ +package cn.code.nl.module.lms.dal.dataobject.stockingivt; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * 纸管托盘库存数据对象。 + */ +@TableName("lms_base_papervehicle") +@Data +public class PaperVehicleDO { + + /** 库存记录标识。 */ + @TableId + private String ivtId; + /** 托盘号。 */ + private String vehicleCode; + /** 行号。 */ + private Integer rowNum; + /** 列号。 */ + private Integer colNum; + /** 物料编码。 */ + private String materialCode; + /** 物料名称。 */ + private String materialName; + /** 数量。 */ + private BigDecimal qty; +} diff --git a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/dal/dataobject/stockingivt/StockingIvtDO.java b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/dal/dataobject/stockingivt/StockingIvtDO.java new file mode 100644 index 00000000..fc33af51 --- /dev/null +++ b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/dal/dataobject/stockingivt/StockingIvtDO.java @@ -0,0 +1,40 @@ +package cn.code.nl.module.lms.dal.dataobject.stockingivt; + +import cn.code.nl.framework.mybatis.core.dataobject.BaseDO; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 备货区域点位数据对象。 + */ +@TableName("lms_ivt_stockingivt") +@Data +@EqualsAndHashCode(callSuper = true) +public class StockingIvtDO extends BaseDO { + + /** 库存记录标识。 */ + @TableId + private Long ivtId; + /** 点位编码。 */ + private String pointCode; + /** 点位名称。 */ + private String pointName; + /** 托盘号。 */ + private String vehicleCode; + /** 生产区域。 */ + private String productArea; + /** 点位类型。 */ + private String pointType; + /** 点位状态。 */ + private String ivtStatus; + /** 位置。 */ + private String pointLocation; + /** 顺序号。 */ + private Integer sortSeq; + /** 是否启用。 */ + private String isUsed; + /** 备注。 */ + private String remark; +} diff --git a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/dal/mysql/stockingivt/StockingIvtMapper.java b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/dal/mysql/stockingivt/StockingIvtMapper.java new file mode 100644 index 00000000..3a3793f8 --- /dev/null +++ b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/dal/mysql/stockingivt/StockingIvtMapper.java @@ -0,0 +1,49 @@ +package cn.code.nl.module.lms.dal.mysql.stockingivt; + +import cn.code.nl.framework.common.pojo.PageResult; +import cn.code.nl.framework.mybatis.core.mapper.BaseMapperX; +import cn.code.nl.framework.mybatis.core.util.MyBatisUtils; +import cn.code.nl.module.lms.controller.admin.stockingivt.vo.StockingIvtPageReqVO; +import cn.code.nl.module.lms.dal.dataobject.stockingivt.PaperVehicleDO; +import cn.code.nl.module.lms.dal.dataobject.stockingivt.StockingIvtDO; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 备货区域 Mapper。 + */ +@Mapper +public interface StockingIvtMapper extends BaseMapperX { + + /** + * 分页查询备货区域。 + */ + default PageResult selectStockingIvtPage(StockingIvtPageReqVO reqVO) { + Page page = selectStockingIvtPage(MyBatisUtils.buildPage(reqVO), reqVO); + return new PageResult<>(page.getRecords(), page.getTotal()); + } + + /** + * 执行备货区域分页 SQL。 + */ + Page selectStockingIvtPage(Page page, + @Param("reqVO") StockingIvtPageReqVO reqVO); + + /** + * 根据标识查询备货区域点位。 + */ + StockingIvtDO selectStockingIvtById(@Param("ivtId") Long ivtId); + + /** + * 更新备货区域点位的可编辑字段。 + */ + int updateStockingIvt(StockingIvtDO updateObj); + + /** + * 根据托盘号查询纸管库存。 + */ + List selectPaperVehicleList(@Param("vehicleCode") String vehicleCode); +} diff --git a/nl-module-lms/nl-module-lms-server/src/main/resources/mapper/stockingivt/StockingIvtMapper.xml b/nl-module-lms/nl-module-lms-server/src/main/resources/mapper/stockingivt/StockingIvtMapper.xml new file mode 100644 index 00000000..adee8db4 --- /dev/null +++ b/nl-module-lms/nl-module-lms-server/src/main/resources/mapper/stockingivt/StockingIvtMapper.xml @@ -0,0 +1,69 @@ + + + + + + ivt_id, point_code, point_name, vehicle_code, product_area, point_type, + ivt_status, point_location, sort_seq, is_used, remark, + creator, create_time, updater, update_time + + + + + + + + UPDATE lms_ivt_stockingivt + SET vehicle_code = #{vehicleCode}, + point_type = #{pointType}, + ivt_status = #{ivtStatus}, + point_location = #{pointLocation}, + sort_seq = #{sortSeq}, + is_used = #{isUsed}, + remark = #{remark}, + updater = #{updater} + WHERE ivt_id = #{ivtId} + + + + +