add：新增表 库区、仓库、仓位

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/subpackage/service/dao/PdmBiSubpackagerelation.java

@@ -25,7 +25,7 @@ public class PdmBiSubpackagerelation implements Serializable {
     /**
      * 子卷包装标识
      */
-    private String workorder_id;
+    private Long workorder_id;
 
     /**
      * 木箱唯一码
@@ -115,7 +115,7 @@ public class PdmBiSubpackagerelation implements Serializable {
     /**
      * 计划外分切的子卷
      */
-    private Boolean is_un_plan_production;
+    private String is_un_plan_production;
 
     /**
      * 子卷的物性值1
@@ -140,7 +140,7 @@ public class PdmBiSubpackagerelation implements Serializable {
     /**
      * 创建人
      */
-    private String create_id;
+    private Long create_id;
 
     /**
      * 创建人姓名
@@ -160,12 +160,12 @@ public class PdmBiSubpackagerelation implements Serializable {
     /**
      * 是否需要重打外包装标签
      */
-    private Boolean isRePrintPackageBoxLabel;
+    private String isRePrintPackageBoxLabel;
 
     /**
      * 是否需要拆包重打子卷标签
      */
-    private Boolean isUnPackBox;
+    private String isUnPackBox;
 
     /**
      * 木箱料号
@@ -245,7 +245,7 @@ public class PdmBiSubpackagerelation implements Serializable {
     /**
      * 解绑删除标识
      */
-    private Boolean need_delete;
+    private String need_delete;
 
     /**
      * 储存地点

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/controller/StIvtBsrealstorattrController.java

@@ -0,0 +1,19 @@
+package org.nl.wms.storage_manage.database.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 实物库属性表 前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2024-01-16
+ */
+@RestController
+@RequestMapping("/api/stIvtBsrealstorattr")
+public class StIvtBsrealstorattrController {
+
+}

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/controller/StIvtSectattrController.java

@@ -0,0 +1,19 @@
+package org.nl.wms.storage_manage.database.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 库区属性表 前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2024-01-16
+ */
+@RestController
+@RequestMapping("/api/stIvtSectattr")
+public class StIvtSectattrController {
+
+}

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/controller/StIvtStructattrController.java

@@ -0,0 +1,19 @@
+package org.nl.wms.storage_manage.database.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 仓位属性表 前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2024-01-16
+ */
+@RestController
+@RequestMapping("/api/stIvtStructattr")
+public class StIvtStructattrController {
+
+}

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/dao/StIvtBsrealstorattr.java

@@ -0,0 +1,220 @@
+package org.nl.wms.storage_manage.database.dao;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * 实物库属性表
+ * </p>
+ *
+ * @author author
+ * @since 2024-01-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("st_ivt_bsrealstorattr")
+public class StIvtBsrealstorattr implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 仓库标识
+     */
+    @TableId
+    private Long storId;
+
+    /**
+     * 仓库编码
+     */
+    private String storCode;
+
+    /**
+     * 仓库名称
+     */
+    private String storName;
+
+    /**
+     * 仓库简称
+     */
+    private String simpleName;
+
+    /**
+     * 仓库容量
+     */
+    private BigDecimal storCapacity;
+
+    /**
+     * 总面积
+     */
+    private BigDecimal totalArea;
+
+    /**
+     * 仓库性质
+     */
+    private String storTypeScode;
+
+    /**
+     * 是否虚拟库
+     */
+    private String isVirtualstore;
+
+    /**
+     * 是否半成品库
+     */
+    private String isSemiFinished;
+
+    /**
+     * 是否原料库
+     */
+    private String isMaterialstore;
+
+    /**
+     * 是否成品库
+     */
+    private String isProductstore;
+
+    /**
+     * 是否备件库
+     */
+    private String isAttachment;
+
+    /**
+     * 是否允许红冲
+     */
+    private String isReversed;
+
+    /**
+     * 是否移出业务自动确认
+     */
+    private String isMvoutAutoCfm;
+
+    /**
+     * 是否移入业务自动确认
+     */
+    private String isMvinAutoCfm;
+
+    /**
+     * 地区
+     */
+    private String area;
+
+    /**
+     * 仓库地址
+     */
+    private String storeaDdress;
+
+    /**
+     * 负责人
+     */
+    private String principal;
+
+    /**
+     * 办公电话
+     */
+    private String officePhone;
+
+    /**
+     * 负责人手机
+     */
+    private String mobileNo;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 显示顺序
+     */
+    private BigDecimal orderIndex;
+
+    /**
+     * 状态
+     */
+    private String whstateScode;
+
+    /**
+     * 是否启用
+     */
+    private String isUsed;
+
+    /**
+     * 物料基本分类
+     */
+    private String baseClassId;
+
+    /**
+     * 创建人
+     */
+    private Long createId;
+
+    /**
+     * 创建人姓名
+     */
+    private String createName;
+
+    /**
+     * 创建时间
+     */
+    private String createTime;
+
+    /**
+     * 修改人
+     */
+    private Long updateOptid;
+
+    /**
+     * 修改人姓名
+     */
+    private String updateOptname;
+
+    /**
+     * 修改时间
+     */
+    private String updateTime;
+
+    /**
+     * 拥有者ID
+     */
+    private Long sysownerid;
+
+    /**
+     * 部门ID
+     */
+    private Long sysdeptid;
+
+    /**
+     * 公司ID
+     */
+    private Long syscompanyid;
+
+    /**
+     * 是否删除
+     */
+    private String isDelete;
+
+    /**
+     * 外部标识
+     */
+    private String extId;
+
+    /**
+     * 部门名称
+     */
+    private String departName;
+
+    /**
+     * 公司名称
+     */
+    private String companyName;
+
+}

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/dao/StIvtSectattr.java

@@ -0,0 +1,185 @@
+package org.nl.wms.storage_manage.database.dao;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 库区属性表
+ * </p>
+ *
+ * @author author
+ * @since 2024-01-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("st_ivt_sectattr")
+public class StIvtSectattr implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 库区标识
+     */
+    @TableId(value = "sect_id", type = IdType.AUTO)
+    private Long sectId;
+
+    /**
+     * 库区编码
+     */
+    private String sectCode;
+
+    /**
+     * 库区名称
+     */
+    private String sectName;
+
+    /**
+     * 库区简称
+     */
+    private String simpleName;
+
+    /**
+     * 库区类型
+     */
+    private String sectTypeAttr;
+
+    /**
+     * 仓库标识
+     */
+    private Long storId;
+
+    /**
+     * 仓库类型
+     */
+    private String storType;
+
+    /**
+     * 容量
+     */
+    private BigDecimal capacity;
+
+    /**
+     * 宽度
+     */
+    private BigDecimal width;
+
+    /**
+     * 高度
+     */
+    private BigDecimal height;
+
+    /**
+     * 深度
+     */
+    private BigDecimal zdepth;
+
+    /**
+     * 起始X坐标
+     */
+    private BigDecimal xqty;
+
+    /**
+     * 起始Y坐标
+     */
+    private BigDecimal yqty;
+
+    /**
+     * 起始Z坐标
+     */
+    private BigDecimal zqty;
+
+    /**
+     * 负责人
+     */
+    private String sectManagerName;
+
+    /**
+     * 负责人电话
+     */
+    private String mobileNo;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 创建人
+     */
+    private Long createId;
+
+    /**
+     * 创建人姓名
+     */
+    private String createName;
+
+    /**
+     * 创建时间
+     */
+    private String createTime;
+
+    /**
+     * 修改人
+     */
+    private Long updateOptid;
+
+    /**
+     * 修改人姓名
+     */
+    private String updateOptname;
+
+    /**
+     * 修改时间
+     */
+    private String updateTime;
+
+    /**
+     * 是否删除
+     */
+    private String isDelete;
+
+    /**
+     * 背景色
+     */
+    private String backGroundColor;
+
+    /**
+     * 前景色
+     */
+    private String frontGroundColor;
+
+    /**
+     * 背景图片
+     */
+    private String backGroundPic;
+
+    /**
+     * 字体显示方向
+     */
+    private String fontDirectionScode;
+
+    /**
+     * 所在楼层
+     */
+    private BigDecimal floorNo;
+
+    /**
+     * 是否启用
+     */
+    private String isUsed;
+
+    /**
+     * 外部标识
+     */
+    private String extId;
+
+
+}

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/dao/StIvtStructattr.java

@@ -0,0 +1,310 @@
+package org.nl.wms.storage_manage.database.dao;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 仓位属性表
+ * </p>
+ *
+ * @author author
+ * @since 2024-01-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("st_ivt_structattr")
+public class StIvtStructattr implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 仓位标识
+     */
+    @TableId(value = "struct_id", type = IdType.AUTO)
+    private Long structId;
+
+    /**
+     * 仓位编码
+     */
+    private String structCode;
+
+    /**
+     * 仓位名称
+     */
+    private String structName;
+
+    /**
+     * 仓位简称
+     */
+    private String simpleName;
+
+    /**
+     * 区域标识
+     */
+    private Long sectId;
+
+    /**
+     * 区域编码
+     */
+    private String sectCode;
+
+    /**
+     * 区域名称
+     */
+    private String sectName;
+
+    /**
+     * 仓库标识
+     */
+    private Long storId;
+
+    /**
+     * 仓库编码
+     */
+    private String storCode;
+
+    /**
+     * 仓库名称
+     */
+    private String storName;
+
+    /**
+     * 仓库类型
+     */
+    private String storType;
+
+    /**
+     * 容量
+     */
+    private BigDecimal capacity;
+
+    /**
+     * 宽度
+     */
+    private BigDecimal width;
+
+    /**
+     * 高度
+     */
+    private BigDecimal height;
+
+    /**
+     * 深度
+     */
+    private BigDecimal zdepth;
+
+    /**
+     * 承受重量
+     */
+    private BigDecimal weight;
+
+    /**
+     * 起始X坐标
+     */
+    private BigDecimal xqty;
+
+    /**
+     * 起始Y坐标
+     */
+    private BigDecimal yqty;
+
+    /**
+     * 起始Z坐标
+     */
+    private BigDecimal zqty;
+
+    /**
+     * 是否临时仓位
+     */
+    private String isTempstruct;
+
+    /**
+     * 排
+     */
+    private BigDecimal rowNum;
+
+    /**
+     * 列
+     */
+    private BigDecimal colNum;
+
+    /**
+     * 层
+     */
+    private BigDecimal layerNum;
+
+    /**
+     * 块
+     */
+    private BigDecimal blockNum;
+
+    /**
+     * 入库顺序
+     */
+    private BigDecimal inOrderSeq;
+
+    /**
+     * 出库顺序
+     */
+    private BigDecimal outOrderSeq;
+
+    /**
+     * 入空载具顺序
+     */
+    private BigDecimal inEmptySeq;
+
+    /**
+     * 出空载具顺序
+     */
+    private BigDecimal outEmptySeq;
+
+    /**
+     * 放置类型
+     */
+    private String placementType;
+
+    /**
+     * 创建人
+     */
+    private Long createId;
+
+    /**
+     * 创建人姓名
+     */
+    private String createName;
+
+    /**
+     * 创建时间
+     */
+    private String createTime;
+
+    /**
+     * 修改人
+     */
+    private Long updateOptid;
+
+    /**
+     * 修改人姓名
+     */
+    private String updateOptname;
+
+    /**
+     * 修改时间
+     */
+    private String updateTime;
+
+    /**
+     * 是否删除
+     */
+    private String isDelete;
+
+    /**
+     * 背景色
+     */
+    private String backGroundColor;
+
+    /**
+     * 前景色
+     */
+    private String frontGroundColor;
+
+    /**
+     * 背景图片
+     */
+    private String backGroundPic;
+
+    /**
+     * 字体显示方向
+     */
+    private String fontDirectionScode;
+
+    /**
+     * 是否启用
+     */
+    private String isUsed;
+
+    /**
+     * 是否判断高度
+     */
+    private String isZdepth;
+
+    /**
+     * 存储载具标识
+     */
+    private Long storagevehicleId;
+
+    /**
+     * 存储载具号
+     */
+    private String storagevehicleCode;
+
+    /**
+     * 是否空载具
+     */
+    private String isEmptyvehicle;
+
+    /**
+     * 载具数量
+     */
+    private BigDecimal storagevehicleQty;
+
+    /**
+     * 锁定类型
+     */
+    private String lockType;
+
+    /**
+     * 锁定任务类型
+     */
+    private String taskdtlType;
+
+    /**
+     * 锁定任务明细标识
+     */
+    private Long taskdtlId;
+
+    /**
+     * 锁定任务编码
+     */
+    private String taskCode;
+
+    /**
+     * 锁定单据类型
+     */
+    private String invType;
+
+    /**
+     * 锁定单据标识
+     */
+    private Long invId;
+
+    /**
+     * 锁定单据编码
+     */
+    private String invCode;
+
+    /**
+     * 物料高度类型
+     */
+    private String materialHeightType;
+
+    /**
+     * 外部标识
+     */
+    private String extId;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/mapper/StIvtBsrealstorattrMapper.java

@@ -0,0 +1,16 @@
+package org.nl.wms.storage_manage.database.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.nl.wms.storage_manage.database.dao.StIvtBsrealstorattr;
+
+/**
+ * <p>
+ * 实物库属性表 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2024-01-16
+ */
+public interface StIvtBsrealstorattrMapper extends BaseMapper<StIvtBsrealstorattr> {
+
+}

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/mapper/StIvtSectattrMapper.java

@@ -0,0 +1,16 @@
+package org.nl.wms.storage_manage.database.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.nl.wms.storage_manage.database.dao.StIvtSectattr;
+
+/**
+ * <p>
+ * 库区属性表 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2024-01-16
+ */
+public interface StIvtSectattrMapper extends BaseMapper<StIvtSectattr> {
+
+}

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/mapper/StIvtStructattrMapper.java

@@ -0,0 +1,16 @@
+package org.nl.wms.storage_manage.database.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.nl.wms.storage_manage.database.dao.StIvtStructattr;
+
+/**
+ * <p>
+ * 仓位属性表 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2024-01-16
+ */
+public interface StIvtStructattrMapper extends BaseMapper<StIvtStructattr> {
+
+}

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/mapper/xml/StIvtBsrealstorattrMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.nl.wms.storage_manage.database.mapper.StIvtBsrealstorattrMapper">
+
+</mapper>

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/mapper/xml/StIvtSectattrMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.nl.wms.storage_manage.database.mapper.StIvtSectattrMapper">
+
+</mapper>

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/mapper/xml/StIvtStructattrMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.nl.wms.storage_manage.database.mapper.StIvtStructattrMapper">
+
+</mapper>

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/service/IStIvtBsrealstorattrService.java

@@ -0,0 +1,23 @@
+package org.nl.wms.storage_manage.database.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.nl.wms.storage_manage.database.dao.StIvtBsrealstorattr;
+
+/**
+ * <p>
+ * 实物库属性表 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2024-01-16
+ */
+public interface IStIvtBsrealstorattrService extends IService<StIvtBsrealstorattr> {
+
+    /**
+     * 根据仓库id搜索
+     * @param storId /
+     * @return StIvtBsrealstorattr 实体类对象
+     */
+    StIvtBsrealstorattr getById(Long storId);
+
+}

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/service/IStIvtSectattrService.java

@@ -0,0 +1,16 @@
+package org.nl.wms.storage_manage.database.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.nl.wms.storage_manage.database.dao.StIvtSectattr;
+
+/**
+ * <p>
+ * 库区属性表 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2024-01-16
+ */
+public interface IStIvtSectattrService extends IService<StIvtSectattr> {
+
+}

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/service/IStIvtStructattrService.java

@@ -0,0 +1,16 @@
+package org.nl.wms.storage_manage.database.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.nl.wms.storage_manage.database.dao.StIvtStructattr;
+
+/**
+ * <p>
+ * 仓位属性表 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2024-01-16
+ */
+public interface IStIvtStructattrService extends IService<StIvtStructattr> {
+
+}

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/service/impl/StIvtBsrealstorattrServiceImpl.java

@@ -0,0 +1,30 @@
+package org.nl.wms.storage_manage.database.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.nl.common.exception.BadRequestException;
+import org.nl.wms.storage_manage.database.dao.StIvtBsrealstorattr;
+import org.nl.wms.storage_manage.database.mapper.StIvtBsrealstorattrMapper;
+import org.nl.wms.storage_manage.database.service.IStIvtBsrealstorattrService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 实物库属性表 服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2024-01-16
+ */
+@Service
+public class StIvtBsrealstorattrServiceImpl extends ServiceImpl<StIvtBsrealstorattrMapper, StIvtBsrealstorattr> implements IStIvtBsrealstorattrService {
+
+    @Override
+    public StIvtBsrealstorattr getById(Long storId) {
+        if (ObjectUtil.isEmpty(this.baseMapper.selectById(storId))) {
+            throw new BadRequestException("仓库不存在,请检查!");
+        }
+
+        return this.baseMapper.selectById(storId);
+    }
+}

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/service/impl/StIvtSectattrServiceImpl.java

@@ -0,0 +1,20 @@
+package org.nl.wms.storage_manage.database.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.nl.wms.storage_manage.database.dao.StIvtSectattr;
+import org.nl.wms.storage_manage.database.mapper.StIvtSectattrMapper;
+import org.nl.wms.storage_manage.database.service.IStIvtSectattrService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 库区属性表 服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2024-01-16
+ */
+@Service
+public class StIvtSectattrServiceImpl extends ServiceImpl<StIvtSectattrMapper, StIvtSectattr> implements IStIvtSectattrService {
+
+}

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/service/impl/StIvtStructattrServiceImpl.java

@@ -0,0 +1,20 @@
+package org.nl.wms.storage_manage.database.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.nl.wms.storage_manage.database.dao.StIvtStructattr;
+import org.nl.wms.storage_manage.database.mapper.StIvtStructattrMapper;
+import org.nl.wms.storage_manage.database.service.IStIvtStructattrService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 仓位属性表 服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2024-01-16
+ */
+@Service
+public class StIvtStructattrServiceImpl extends ServiceImpl<StIvtStructattrMapper, StIvtStructattr> implements IStIvtStructattrService {
+
+}

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/dao/mapper/xml/StIvtIostorinvMapper.xml

@@ -3,33 +3,53 @@
 <mapper namespace="org.nl.wms.storage_manage.ios.service.iostorInv.dao.mapper.StIvtIostorinvMapper">
 
     <select id="getPageQuery" resultType="java.util.Map">
-        SELECT
-            mst.*
+        SELECT DISTINCT
+            ios.*
         FROM
-            st_ivt_iostorinv mst
+            ST_IVT_IOStorInv ios
+            LEFT JOIN st_ivt_iostorinvdis dis ON dis.iostorinv_id = ios.iostorinv_id
+            LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = dis.pcsn
         <where>
-            mst.is_delete = '0'
+            ios.is_delete = '0'
             AND
-            io_type = '0'
+            ios.io_type = '0'
+
+            <if test="query.bill_code != null and query.bill_code != ''">
+                and ios.bill_code LIKE '%${query.bill_code}%'
+            </if>
+
+            <if test="query.stor_id != null and query.stor_id != ''">
+                and ios.stor_id = #{query.stor_id}
+            </if>
 
             <if test="query.start_time  != null">
-                and mst.create_time >= #{query.start_time}
+                and ios.create_time >= #{query.start_time}
             </if>
+
             <if test="query.end_time  != null">
-                and #{query.end_time} >= mst.create_time
+                and #{query.end_time} >= ios.create_time
             </if>
-            <if test="query.stor_id != null and query.stor_id != ''">
-                and mst.stor_id = #{query.stor_id}
+
+            <if test="query.create_mode != null and query.create_mode != ''">
+                and ios.create_mode = #{query.create_mode}
             </if>
+
             <if test="query.bill_status != null and query.bill_status != ''">
-                and mst.bill_status = #{query.bill_status}
+                and ios.bill_status = #{query.bill_status}
             </if>
+
             <if test="query.bill_type != null and query.bill_type != ''">
-                and mst.bill_type = #{query.bill_type}
+                and ios.bill_type = #{query.bill_type}
             </if>
-            <if test="query.bill_code != null and query.bill_code != ''">
-                and mst.bill_code = #{query.bill_code}
+
+            <if test="query.pcsn != null and query.pcsn != ''">
+                and dis.pcsn LIKE '%${query.pcsn}%'
             </if>
+
+            <if test="query.sap_pcsn != null and query.sap_pcsn != ''">
+                and sub.sap_pcsn LIKE '%${query.sap_pcsn}%'
+            </if>
+
         </where>
 
     </select>

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/dto/IostorInvQuery.java

@@ -14,24 +14,53 @@ import org.nl.wms.storage_manage.ios.service.iostorInv.dao.StIvtIostorinv;
 @Data
 public class IostorInvQuery extends BaseQuery<StIvtIostorinv> {
 
-
+    /**
+     * 仓库
+     */
     private String stor_id;
 
+    /**
+     * 单据状态
+     */
     private String bill_status;
 
+    /**
+     * 单据类型
+     */
     private String bill_type;
 
+    /**
+     * 模糊查询：单据编码
+     */
     private String bill_code;
 
+    /**
+     * 出入库类型
+     */
     private String io_type;
 
-    private Boolean is_delete = false;
+    /**
+     * 是否删除
+     */
+    private String is_delete = "0";
 
+    /**
+     * 生成方式
+     */
+    private String create_mode;
+
+    /**
+     * 子卷号
+     */
+    private String pcsn;
+
+    /**
+     * sap批次
+     */
+    private String sap_pcsn;
 
     @Override
     public void paramMapping() {
         super.doP.put("bill_code", QParam.builder().k(new String[]{"bill_code"}).type(QueryTEnum.LK).build());
     }
-
-
 }