add：人员对应仓库

lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/LogMessageConstant.java

@@ -86,6 +86,6 @@ public class LogMessageConstant {
     /**
      * 索引路径
      */
-    public final static String INDEX_DIR = "D:\\lucene\\index";
+    public final static String INDEX_DIR = "D:\\software\\lucene\\index";
 
 }

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/enums/SUBEnum.java

@@ -0,0 +1,42 @@
+package org.nl.wms.pdm.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import org.apache.commons.lang3.StringUtils;
+import org.nl.common.exception.BadRequestException;
+import org.nl.config.MapOf;
+
+import java.util.Map;
+
+/**
+ * 子卷包装枚举
+ *
+ * @author lxy
+ * @Date 2023/11/14 20:11
+ */
+@AllArgsConstructor
+@Getter
+public enum SUBEnum {
+    // 子卷包装状态
+    STATUS(MapOf.of("生成", "0", "包装", "1", "入库", "2", "出库", "3")),
+    ;
+
+    private Map<String, String> code;
+
+    public String code(String desc) {
+        String code = this.getCode().get(desc);
+        if (StringUtils.isNotEmpty(code)) {
+            return code;
+        }
+        throw new BadRequestException(this.name() + "对应类型" + desc + "未定义");
+    }
+
+    public String check(String code) {
+        for (Map.Entry<String, String> entry : this.getCode().entrySet()) {
+            if (entry.getValue().equals("code")) {
+                return entry.getValue();
+            }
+        }
+        throw new BadRequestException(this.name() + "对应类型" + code + "未定义");
+    }
+}

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

@@ -1,5 +1,6 @@
 package org.nl.wms.pdm.subpackage.service.dao;
 
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -25,6 +26,7 @@ public class PdmBiSubpackagerelation implements Serializable {
     /**
      * 子卷包装标识
      */
+    @TableId
     private Long workorder_id;
 
     /**

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

@@ -17,16 +17,34 @@ import java.util.List;
 public class SubPackageQuery extends BaseQuery<PdmBiSubpackagerelation> {
 
 
+    /**
+     * 箱号
+     */
     private String package_box_sn;
 
+    /**
+     * 订单号
+     */
     private String sale_order_name;
 
+    /**
+     * 客户
+     */
     private String customer_name;
 
+    /**
+     * 子卷号
+     */
     private String container_name;
 
+    /**
+     * 状态
+     */
     private String status;
 
+    /**
+     * sap批次
+     */
     private String sap_pcsn;
 
     private List<String> list;

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

@@ -1,9 +1,21 @@
 package org.nl.wms.storage_manage.database.controller;
 
 
+import com.alibaba.fastjson.JSONObject;
+import org.nl.common.domain.query.PageQuery;
+import org.nl.common.logging.annotation.Log;
+import org.nl.wms.storage_manage.database.dto.StorQuery;
+import org.nl.wms.storage_manage.database.service.IStIvtBsrealstorattrService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Map;
+
 /**
  * <p>
  * 实物库属性表 前端控制器
@@ -16,4 +28,22 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/api/stIvtBsrealstorattr")
 public class StIvtBsrealstorattrController {
 
+    /**
+     * 仓库服务
+     */
+    @Autowired
+    private IStIvtBsrealstorattrService iStIvtBsrealstorattrService;
+
+    @GetMapping
+    @Log("查询仓库")
+    public ResponseEntity<Object> query(StorQuery query, PageQuery page){
+        return new ResponseEntity<>(iStIvtBsrealstorattrService.pageQuery(query,page), HttpStatus.OK);
+    }
+
+    @GetMapping("/getStor")
+    @Log("查询仓库下拉框")
+    public ResponseEntity<Object> queryStor(@RequestParam Map whereJson) {
+        return new ResponseEntity<>(iStIvtBsrealstorattrService.getStor(whereJson), HttpStatus.OK);
+    }
+
 }

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

@@ -0,0 +1,40 @@
+package org.nl.wms.storage_manage.database.controller;
+
+
+import org.nl.common.domain.query.PageQuery;
+import org.nl.common.logging.annotation.Log;
+import org.nl.wms.storage_manage.database.dto.UserStorQuery;
+import org.nl.wms.storage_manage.database.service.IStIvtUserstorService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 仓库与人员关联表 前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2024-01-16
+ */
+@RestController
+@RequestMapping("/api/stIvtUserstor")
+public class StIvtUserstorController {
+
+    /**
+     * 仓库与人员关联服务
+     */
+    @Autowired
+    private IStIvtUserstorService iStIvtUserstorService;
+
+    @GetMapping
+    @Log("查询用户信息")
+    public ResponseEntity<Object> query(@RequestParam UserStorQuery query, PageQuery page) {
+        return new ResponseEntity<>(iStIvtUserstorService.pageQuery(query, page), HttpStatus.OK);
+    }
+
+}

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

@@ -1,11 +1,10 @@
 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 com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.apache.ibatis.annotations.Result;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -30,77 +29,77 @@ public class StIvtBsrealstorattr implements Serializable {
      * 仓库标识
      */
     @TableId
-    private Long storId;
+    private Long stor_id;
 
     /**
      * 仓库编码
      */
-    private String storCode;
+    private String stor_code;
 
     /**
      * 仓库名称
      */
-    private String storName;
+    private String stor_name;
 
     /**
      * 仓库简称
      */
-    private String simpleName;
+    private String simple_name;
 
     /**
      * 仓库容量
      */
-    private BigDecimal storCapacity;
+    private BigDecimal stor_capacity;
 
     /**
      * 总面积
      */
-    private BigDecimal totalArea;
+    private BigDecimal total_area;
 
     /**
      * 仓库性质
      */
-    private String storTypeScode;
+    private String stor_type_scode;
 
     /**
      * 是否虚拟库
      */
-    private String isVirtualstore;
+    private String is_virtualstore;
 
     /**
      * 是否半成品库
      */
-    private String isSemiFinished;
+    private String is_semi_finished;
 
     /**
      * 是否原料库
      */
-    private String isMaterialstore;
+    private String is_materialstore;
 
     /**
      * 是否成品库
      */
-    private String isProductstore;
+    private String is_productstore;
 
     /**
      * 是否备件库
      */
-    private String isAttachment;
+    private String is_attachment;
 
     /**
      * 是否允许红冲
      */
-    private String isReversed;
+    private String is_reversed;
 
     /**
      * 是否移出业务自动确认
      */
-    private String isMvoutAutoCfm;
+    private String is_mvout_auto_cfm;
 
     /**
      * 是否移入业务自动确认
      */
-    private String isMvinAutoCfm;
+    private String is_mvin_auto_cfm;
 
     /**
      * 地区
@@ -110,7 +109,7 @@ public class StIvtBsrealstorattr implements Serializable {
     /**
      * 仓库地址
      */
-    private String storeaDdress;
+    private String storea_ddress;
 
     /**
      * 负责人
@@ -120,12 +119,12 @@ public class StIvtBsrealstorattr implements Serializable {
     /**
      * 办公电话
      */
-    private String officePhone;
+    private String office_phone;
 
     /**
      * 负责人手机
      */
-    private String mobileNo;
+    private String mobile_no;
 
     /**
      * 备注
@@ -135,52 +134,52 @@ public class StIvtBsrealstorattr implements Serializable {
     /**
      * 显示顺序
      */
-    private BigDecimal orderIndex;
+    private BigDecimal order_index;
 
     /**
      * 状态
      */
-    private String whstateScode;
+    private String whstate_scode;
 
     /**
      * 是否启用
      */
-    private String isUsed;
+    private String is_used;
 
     /**
      * 物料基本分类
      */
-    private String baseClassId;
+    private String base_class_id;
 
     /**
      * 创建人
      */
-    private Long createId;
+    private Long create_id;
 
     /**
      * 创建人姓名
      */
-    private String createName;
+    private String create_name;
 
     /**
      * 创建时间
      */
-    private String createTime;
+    private String create_time;
 
     /**
      * 修改人
      */
-    private Long updateOptid;
+    private Long update_optid;
 
     /**
      * 修改人姓名
      */
-    private String updateOptname;
+    private String update_optname;
 
     /**
      * 修改时间
      */
-    private String updateTime;
+    private String update_time;
 
     /**
      * 拥有者ID
@@ -200,21 +199,21 @@ public class StIvtBsrealstorattr implements Serializable {
     /**
      * 是否删除
      */
-    private String isDelete;
+    private String is_delete;
 
     /**
      * 外部标识
      */
-    private String extId;
+    private String ext_id;
 
     /**
      * 部门名称
      */
-    private String departName;
+    private String depart_name;
 
     /**
      * 公司名称
      */
-    private String companyName;
+    private String company_name;
 
 }

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

@@ -28,38 +28,38 @@ public class StIvtSectattr implements Serializable {
     /**
      * 库区标识
      */
-    @TableId(value = "sect_id", type = IdType.AUTO)
-    private Long sectId;
+    @TableId
+    private Long sect_id;
 
     /**
      * 库区编码
      */
-    private String sectCode;
+    private String sect_code;
 
     /**
      * 库区名称
      */
-    private String sectName;
+    private String sect_name;
 
     /**
      * 库区简称
      */
-    private String simpleName;
+    private String simple_name;
 
     /**
      * 库区类型
      */
-    private String sectTypeAttr;
+    private String sect_type_attr;
 
     /**
      * 仓库标识
      */
-    private Long storId;
+    private Long stor_id;
 
     /**
      * 仓库类型
      */
-    private String storType;
+    private String stor_type;
 
     /**
      * 容量
@@ -99,12 +99,12 @@ public class StIvtSectattr implements Serializable {
     /**
      * 负责人
      */
-    private String sectManagerName;
+    private String sect_manager_name;
 
     /**
      * 负责人电话
      */
-    private String mobileNo;
+    private String mobile_no;
 
     /**
      * 备注
@@ -114,72 +114,72 @@ public class StIvtSectattr implements Serializable {
     /**
      * 创建人
      */
-    private Long createId;
+    private Long create_id;
 
     /**
      * 创建人姓名
      */
-    private String createName;
+    private String create_name;
 
     /**
      * 创建时间
      */
-    private String createTime;
+    private String create_time;
 
     /**
      * 修改人
      */
-    private Long updateOptid;
+    private Long update_optid;
 
     /**
      * 修改人姓名
      */
-    private String updateOptname;
+    private String update_optname;
 
     /**
      * 修改时间
      */
-    private String updateTime;
+    private String update_time;
 
     /**
      * 是否删除
      */
-    private String isDelete;
+    private String is_delete;
 
     /**
      * 背景色
      */
-    private String backGroundColor;
+    private String back_ground_color;
 
     /**
      * 前景色
      */
-    private String frontGroundColor;
+    private String front_ground_color;
 
     /**
      * 背景图片
      */
-    private String backGroundPic;
+    private String back_ground_pic;
 
     /**
      * 字体显示方向
      */
-    private String fontDirectionScode;
+    private String font_direction_scode;
 
     /**
      * 所在楼层
      */
-    private BigDecimal floorNo;
+    private BigDecimal floor_no;
 
     /**
      * 是否启用
      */
-    private String isUsed;
+    private String is_used;
 
     /**
      * 外部标识
      */
-    private String extId;
+    private String ext_id;
 
 
 }

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

@@ -28,58 +28,58 @@ public class StIvtStructattr implements Serializable {
     /**
      * 仓位标识
      */
-    @TableId(value = "struct_id", type = IdType.AUTO)
-    private Long structId;
+    @TableId
+    private Long struct_id;
 
     /**
      * 仓位编码
      */
-    private String structCode;
+    private String struct_code;
 
     /**
      * 仓位名称
      */
-    private String structName;
+    private String struct_name;
 
     /**
      * 仓位简称
      */
-    private String simpleName;
+    private String simple_name;
 
     /**
      * 区域标识
      */
-    private Long sectId;
+    private Long sect_id;
 
     /**
      * 区域编码
      */
-    private String sectCode;
+    private String sect_code;
 
     /**
      * 区域名称
      */
-    private String sectName;
+    private String sect_name;
 
     /**
      * 仓库标识
      */
-    private Long storId;
+    private Long stor_id;
 
     /**
      * 仓库编码
      */
-    private String storCode;
+    private String stor_code;
 
     /**
      * 仓库名称
      */
-    private String storName;
+    private String stor_name;
 
     /**
      * 仓库类型
      */
-    private String storType;
+    private String stor_type;
 
     /**
      * 容量
@@ -124,182 +124,182 @@ public class StIvtStructattr implements Serializable {
     /**
      * 是否临时仓位
      */
-    private String isTempstruct;
+    private String is_tempstruct;
 
     /**
      * 排
      */
-    private BigDecimal rowNum;
+    private BigDecimal row_num;
 
     /**
      * 列
      */
-    private BigDecimal colNum;
+    private BigDecimal col_num;
 
     /**
      * 层
      */
-    private BigDecimal layerNum;
+    private BigDecimal layer_num;
 
     /**
      * 块
      */
-    private BigDecimal blockNum;
+    private BigDecimal block_num;
 
     /**
      * 入库顺序
      */
-    private BigDecimal inOrderSeq;
+    private BigDecimal in_order_seq;
 
     /**
      * 出库顺序
      */
-    private BigDecimal outOrderSeq;
+    private BigDecimal out_order_seq;
 
     /**
      * 入空载具顺序
      */
-    private BigDecimal inEmptySeq;
+    private BigDecimal in_empty_seq;
 
     /**
      * 出空载具顺序
      */
-    private BigDecimal outEmptySeq;
+    private BigDecimal out_empty_seq;
 
     /**
      * 放置类型
      */
-    private String placementType;
+    private String placement_type;
 
     /**
      * 创建人
      */
-    private Long createId;
+    private Long create_id;
 
     /**
      * 创建人姓名
      */
-    private String createName;
+    private String create_name;
 
     /**
      * 创建时间
      */
-    private String createTime;
+    private String create_time;
 
     /**
      * 修改人
      */
-    private Long updateOptid;
+    private Long update_optid;
 
     /**
      * 修改人姓名
      */
-    private String updateOptname;
+    private String update_optname;
 
     /**
      * 修改时间
      */
-    private String updateTime;
+    private String update_time;
 
     /**
      * 是否删除
      */
-    private String isDelete;
+    private String is_delete;
 
     /**
      * 背景色
      */
-    private String backGroundColor;
+    private String back_ground_color;
 
     /**
      * 前景色
      */
-    private String frontGroundColor;
+    private String front_ground_color;
 
     /**
      * 背景图片
      */
-    private String backGroundPic;
+    private String back_ground_pic;
 
     /**
      * 字体显示方向
      */
-    private String fontDirectionScode;
+    private String font_direction_scode;
 
     /**
      * 是否启用
      */
-    private String isUsed;
+    private String is_used;
 
     /**
      * 是否判断高度
      */
-    private String isZdepth;
+    private String is_zdepth;
 
     /**
      * 存储载具标识
      */
-    private Long storagevehicleId;
+    private Long storagevehicle_id;
 
     /**
      * 存储载具号
      */
-    private String storagevehicleCode;
+    private String storagevehicle_code;
 
     /**
      * 是否空载具
      */
-    private String isEmptyvehicle;
+    private String is_emptyvehicle;
 
     /**
      * 载具数量
      */
-    private BigDecimal storagevehicleQty;
+    private BigDecimal storagevehicle_qty;
 
     /**
      * 锁定类型
      */
-    private String lockType;
+    private String lock_type;
 
     /**
      * 锁定任务类型
      */
-    private String taskdtlType;
+    private String taskdtl_type;
 
     /**
      * 锁定任务明细标识
      */
-    private Long taskdtlId;
+    private Long taskdtl_id;
 
     /**
      * 锁定任务编码
      */
-    private String taskCode;
+    private String task_code;
 
     /**
      * 锁定单据类型
      */
-    private String invType;
+    private String inv_type;
 
     /**
      * 锁定单据标识
      */
-    private Long invId;
+    private Long inv_id;
 
     /**
      * 锁定单据编码
      */
-    private String invCode;
+    private String inv_code;
 
     /**
      * 物料高度类型
      */
-    private String materialHeightType;
+    private String material_height_type;
 
     /**
      * 外部标识
      */
-    private String extId;
+    private String ext_id;
 
     /**
      * 备注

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

@@ -0,0 +1,39 @@
+package org.nl.wms.storage_manage.database.dao;
+
+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;
+
+/**
+ * <p>
+ * 仓库与人员关联表
+ * </p>
+ *
+ * @author author
+ * @since 2024-01-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("st_ivt_userstor")
+public class StIvtUserstor implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 仓库标识
+     */
+    @TableId
+    private Long stor_id;
+
+    /**
+     * 人员标识
+     */
+    private Long user_id;
+
+
+}

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

@@ -0,0 +1,26 @@
+package org.nl.wms.storage_manage.database.dto;
+
+import lombok.Data;
+import org.nl.common.domain.query.BaseQuery;
+import org.nl.common.domain.query.QParam;
+import org.nl.common.enums.QueryTEnum;
+import org.nl.wms.storage_manage.database.dao.StIvtBsrealstorattr;
+
+/**
+ * 仓库查询条件
+ * @author LXY
+ * @Date 2023/11/10 14:49
+ */
+@Data
+public class StorQuery extends BaseQuery<StIvtBsrealstorattr> {
+
+    /**
+     * 仓库编码
+     */
+    private String stor_code;
+
+    @Override
+    public void paramMapping() {
+        super.doP.put("stor_code", QParam.builder().k(new String[]{"stor_code"}).type(QueryTEnum.LK).build());
+    }
+}

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

@@ -0,0 +1,26 @@
+package org.nl.wms.storage_manage.database.dto;
+
+import lombok.Data;
+import org.nl.common.domain.query.BaseQuery;
+import org.nl.common.domain.query.QParam;
+import org.nl.common.enums.QueryTEnum;
+import org.nl.wms.storage_manage.database.dao.StIvtUserstor;
+
+/**
+ * 仓库查询条件
+ * @author LXY
+ * @Date 2023/11/10 14:49
+ */
+@Data
+public class UserStorQuery extends BaseQuery<StIvtUserstor> {
+
+    /**
+     * 模糊查询
+     */
+    private String blurry;
+
+    @Override
+    public void paramMapping() {
+        super.doP.put("blurry", QParam.builder().k(new String[]{"blurry"}).type(QueryTEnum.LK).build());
+    }
+}

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

@@ -1,7 +1,14 @@
 package org.nl.wms.storage_manage.database.mapper;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.nl.common.domain.query.PageQuery;
 import org.nl.wms.storage_manage.database.dao.StIvtBsrealstorattr;
+import org.nl.wms.storage_manage.database.dto.StorQuery;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -13,4 +20,18 @@ import org.nl.wms.storage_manage.database.dao.StIvtBsrealstorattr;
  */
 public interface StIvtBsrealstorattrMapper extends BaseMapper<StIvtBsrealstorattr> {
 
+    /**
+     * 分页查询
+     * @param query：查询条件
+     * @param pageQuery 分页
+     * @return List<Map>
+     */
+    List<Map> getPageQuery(@Param("query") StorQuery query, @Param("pageQuery") PageQuery pageQuery);
+
+    /**
+     * 获取仓库下拉框
+     * @param whereJson：查询条件
+     * @return List<JSONObject>
+     */
+    List<JSONObject> getStor(Map whereJson);
 }

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

@@ -3,6 +3,8 @@ package org.nl.wms.storage_manage.database.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.nl.wms.storage_manage.database.dao.StIvtStructattr;
 
+import java.util.List;
+
 /**
  * <p>
  * 仓位属性表 Mapper 接口
@@ -13,4 +15,11 @@ import org.nl.wms.storage_manage.database.dao.StIvtStructattr;
  */
 public interface StIvtStructattrMapper extends BaseMapper<StIvtStructattr> {
 
+    /**
+     * 根据木箱批量查询
+     * @param list： 木箱集合
+     * @return List<StIvtStructattr>
+     */
+    List<StIvtStructattr> queryBatch(List<String> list);
+
 }

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

@@ -0,0 +1,24 @@
+package org.nl.wms.storage_manage.database.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.nl.common.domain.query.PageQuery;
+import org.nl.wms.storage_manage.database.dao.StIvtUserstor;
+import org.nl.wms.storage_manage.database.dto.UserStorQuery;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 仓库与人员关联表 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2024-01-16
+ */
+public interface StIvtUserstorMapper extends BaseMapper<StIvtUserstor> {
+
+
+    List<Map> getPageQuery(@Param("query") UserStorQuery query, @Param("pageQuery") PageQuery pageQuery);
+}

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

@@ -2,4 +2,58 @@
 <!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">
 
+    <select id="getPageQuery" resultType="java.util.Map">
+        SELECT
+            *
+        FROM
+            st_ivt_bsrealstorattr
+        <where>
+            is_delete = '0'
+
+            <if test="query.stor_code != null and query.stor_code != ''">
+                and stor_code LIKE '%${query.stor_code}%'
+            </if>
+
+        </where>
+
+    </select>
+
+    <select id="getStor" resultType="com.alibaba.fastjson.JSONObject">
+        SELECT
+            CONVERT(stor_id , CHAR ) AS stor_id,
+            stor_name
+        FROM
+            st_ivt_bsrealstorattr
+        <where>
+            is_delete = '0'
+            and is_used = '1'
+
+            <if test="is_materialstore != null and is_materialstore != ''">
+                and is_materialstore = #{is_materialstore}
+            </if>
+
+            <if test="is_virtualstore != null and is_virtualstore != ''">
+                and is_virtualstore = #{is_virtualstore}
+            </if>
+
+            <if test="is_semi_finished != null and is_semi_finished != ''">
+                and is_semi_finished = #{is_semi_finished}
+            </if>
+
+            <if test="is_productstore != null and is_productstore != ''">
+                and is_productstore = #{is_productstore}
+            </if>
+
+            <if test="is_attachment != null and is_attachment != ''">
+                and is_attachment = #{is_attachment}
+            </if>
+
+            <if test="is_reversed != null and is_reversed != ''">
+                and is_reversed = #{is_reversed}
+            </if>
+
+        </where>
+
+    </select>
+
 </mapper>

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

@@ -2,4 +2,23 @@
 <!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">
 
+    <select id="queryBatch" resultType="org.nl.wms.storage_manage.database.dao.StIvtStructattr">
+        SELECT
+            *
+        FROM
+            st_ivt_structattr
+        <where>
+            is_delete = '0'
+            AND is_used = '1'
+
+            <if test="list != null and list != ''">
+                and storagevehicle_code in
+                <foreach item="item" index="index" collection="list" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+
+        </where>
+    </select>
+
 </mapper>

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

@@ -0,0 +1,21 @@
+<?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.StIvtUserstorMapper">
+
+    <select id="getPageQuery" resultType="java.util.Map">
+        SELECT
+        *
+        FROM
+        st_ivt_bsrealstorattr
+        <where>
+            is_delete = '0'
+
+            <if test="query.stor_code != null and query.stor_code != ''">
+                and stor_code LIKE '%${query.stor_code}%'
+            </if>
+
+        </where>
+
+    </select>
+
+</mapper>

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

@@ -1,7 +1,13 @@
 package org.nl.wms.storage_manage.database.service;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.nl.common.domain.query.PageQuery;
 import org.nl.wms.storage_manage.database.dao.StIvtBsrealstorattr;
+import org.nl.wms.storage_manage.database.dto.StorQuery;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -20,4 +26,18 @@ public interface IStIvtBsrealstorattrService extends IService<StIvtBsrealstoratt
      */
     StIvtBsrealstorattr getById(Long storId);
 
+    /**
+     * 分页查询
+     * @param query 查询条件
+     * @param page 分页查询
+     * @return Object
+     */
+    Object pageQuery(StorQuery query, PageQuery page);
+
+    /**
+     * 获取仓库下拉框
+     * @param whereJson ： 查询条件
+     * @return JSONObject
+     */
+    List<JSONObject> getStor(Map whereJson);
 }

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

@@ -0,0 +1,25 @@
+package org.nl.wms.storage_manage.database.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.nl.common.domain.query.PageQuery;
+import org.nl.wms.storage_manage.database.dao.StIvtUserstor;
+import org.nl.wms.storage_manage.database.dto.UserStorQuery;
+
+/**
+ * <p>
+ * 仓库与人员关联表 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2024-01-16
+ */
+public interface IStIvtUserstorService extends IService<StIvtUserstor> {
+
+    /**
+     * 查询用户信息
+     * @param query: 查询条件
+     * @param page：分页工具
+     * @return Object
+     */
+    Object pageQuery(UserStorQuery query, PageQuery page);
+}

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

@@ -1,13 +1,22 @@
 package org.nl.wms.storage_manage.database.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import org.nl.common.base.TableDataInfo;
+import org.nl.common.domain.query.PageQuery;
 import org.nl.common.exception.BadRequestException;
 import org.nl.wms.storage_manage.database.dao.StIvtBsrealstorattr;
+import org.nl.wms.storage_manage.database.dto.StorQuery;
 import org.nl.wms.storage_manage.database.mapper.StIvtBsrealstorattrMapper;
 import org.nl.wms.storage_manage.database.service.IStIvtBsrealstorattrService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 实物库属性表 服务实现类
@@ -27,4 +36,20 @@ public class StIvtBsrealstorattrServiceImpl extends ServiceImpl<StIvtBsrealstora
 
         return this.baseMapper.selectById(storId);
     }
+
+    @Override
+    public Object pageQuery(StorQuery query, PageQuery pageQuery) {
+        Page<Object> page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize());
+        page.setOrderBy("create_time DESC");
+        List<Map> mst_detail = this.baseMapper.getPageQuery(query, pageQuery);
+
+        TableDataInfo<Map> build = TableDataInfo.build(mst_detail);
+        build.setTotalElements(page.getTotal());
+        return build;
+    }
+
+    @Override
+    public List<JSONObject> getStor(Map whereJson) {
+        return this.baseMapper.getStor(whereJson);
+    }
 }

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

@@ -0,0 +1,38 @@
+package org.nl.wms.storage_manage.database.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import org.nl.common.base.TableDataInfo;
+import org.nl.common.domain.query.PageQuery;
+import org.nl.wms.storage_manage.database.dao.StIvtUserstor;
+import org.nl.wms.storage_manage.database.dto.UserStorQuery;
+import org.nl.wms.storage_manage.database.mapper.StIvtUserstorMapper;
+import org.nl.wms.storage_manage.database.service.IStIvtUserstorService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 仓库与人员关联表 服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2024-01-16
+ */
+@Service
+public class StIvtUserstorServiceImpl extends ServiceImpl<StIvtUserstorMapper, StIvtUserstor> implements IStIvtUserstorService {
+
+    @Override
+    public Object pageQuery(UserStorQuery query, PageQuery pageQuery) {
+        Page<Object> page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize());
+        page.setOrderBy("create_time DESC");
+        List<Map> mst_detail = this.baseMapper.getPageQuery(query, pageQuery);
+
+        TableDataInfo<Map> build = TableDataInfo.build(mst_detail);
+        build.setTotalElements(page.getTotal());
+        return build;
+    }
+}

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/enums/IOSEnum.java

@@ -10,6 +10,7 @@ import java.util.Map;
 
 /**
  * 出入库枚举
+ *
  * @author lxy
  * @Date 2023/11/14 20:11
  */
@@ -20,25 +21,32 @@ public enum IOSEnum {
     IS_NOTANDYES(MapOf.of("否", "0", "是", "1")),
 
     //出入库类型
-    IO_TYPE(MapOf.of("入库", "0", "出库", "1","移库", "2")),
+    IO_TYPE(MapOf.of("入库", "0", "出库", "1")),
 
     //出入单据主表/明细状态
-    BILL_STATUS(MapOf.of("生成", "10", "提交", "20","分配中", "30","分配完","40","完成","99")),
+    BILL_STATUS(MapOf.of("生成", "10", "提交", "20", "分配中", "30", "分配完", "40", "完成", "99")),
 
     //出入单据分配状态
-    WORK_STATUS(MapOf.of("未生成", "10", "生成", "20","执行中", "30","完成","99")),
+    WORK_STATUS(MapOf.of("未生成", "00", "生成", "01", "执行中", "02", "完成", "99")),
 
     //出入单创建方式
-    CREATE_MODE(MapOf.of("PC产生", "10", "终端产生", "20","外部接口产生", "30")),
+    CREATE_MODE(MapOf.of("PC产生", "01", "终端产生", "02", "外部接口产生", "03")),
 
     //入库单据类型
-    IN_TYPE(MapOf.of("手工入库", "99")),
+    IN_TYPE(MapOf.of("生产入库", "0001", "退货入库", "0002", "报废入库", "0003", "调拨入库", "0004",
+            "拆箱入库", "0005", "返检入库", "0006", "改切入库", "0007", "手工入库", "0009"
+    )),
 
     //出库单据类型
-    OUT_TYPE(MapOf.of("手工出库", "99")),
+    OUT_TYPE(MapOf.of("发货出库", "1001", "改切出库", "1003", "调拨出库", "1004", "拆箱出库", "1005",
+            "返检出库", "1006", "超期报废", "1007", "退货报废", "1008", "质量问题报废", "1010", "其他报废", "1002",
+            "手工出库", "1009"
+    )),
 
-    //点位锁定类型
-    LOCK_TYPE(MapOf.of("未锁定", "00","入库锁", "10","出库锁", "20")),
+    //仓位锁定类型
+    LOCK_TYPE(MapOf.of("未锁定", "1", "入库锁", "2", "出库锁", "3", "空托盘出库锁", "4",
+            "空托盘入库锁", "5", "移出锁", "6", "移入锁", "7", "其它", "99"
+    )),
     ;
 
     private Map<String, String> code;

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

@@ -4,7 +4,69 @@
 
     <select id="getPageQuery" resultType="java.util.Map">
         SELECT DISTINCT
-            ios.*
+            CONVERT(ios.iostorinv_id , CHAR ) AS iostorinv_id,
+            ios.bill_code,
+            ios.io_type,
+            ios.buss_type,
+            ios.bill_type,
+            ios.biz_date,
+            CONVERT(ios.stor_id , CHAR ) AS stor_id,
+            ios.stor_code,
+            ios.stor_name,
+            ios.source_id,
+            ios.source_name,
+            ios.source_type,
+            ios.total_qty,
+            ios.total_weight,
+            ios.detail_count,
+            ios.bill_status,
+            ios.remark,
+            ios.create_mode,
+            CONVERT(ios.input_optid , CHAR ) AS input_optid,
+            ios.input_optname,
+            ios.input_time,
+            ios.update_optid,
+            ios.update_optname,
+            ios.update_time,
+            ios.dis_optid,
+            ios.dis_optname,
+            ios.dis_time,
+            ios.confirm_optid,
+            ios.confirm_optname,
+            ios.confirm_time,
+            ios.sysdeptid,
+            ios.syscompanyid,
+            ios.is_delete,
+            ios.is_upload,
+            ios.upload_optid,
+            ios.upload_time,
+            ios.is_writeoff,
+            ios.writeoff_optid,
+            ios.writeoff_time,
+            ios.consignee,
+            ios.receiver,
+            ios.receiptaddress,
+            ios.receiptphone,
+            ios.logisticscompany,
+            ios.drivername,
+            ios.carno,
+            ios.driverphone,
+            ios.contractno,
+            ios.deliveryunit,
+            ios.deliveryaddress,
+            ios.deliveryname,
+            ios.deliveryphone,
+            ios.trans_code,
+            ios.estimated_freight,
+            ios.cust_code,
+            ios.out_stor_id,
+            ios.upload_mes,
+            ios.upload_sap,
+            ios.run_freight,
+            ios.unload_freight,
+            ios.other_freight,
+            ios.order_number,
+            ios.car_type
         FROM
             ST_IVT_IOStorInv ios
             LEFT JOIN st_ivt_iostorinvdis dis ON dis.iostorinv_id = ios.iostorinv_id

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

@@ -4,7 +4,32 @@
 
     <select id="getIosDtl" resultType="com.alibaba.fastjson.JSONObject">
         SELECT
-            dtl.*,
+            CONVERT(dtl.iostorinvdtl_id , CHAR ) AS iostorinvdtl_id,
+            CONVERT(dtl.iostorinv_id , CHAR ) AS iostorinv_id,
+            dtl.seq_no,
+            CONVERT(dtl.material_id , CHAR ) AS material_id,
+            dtl.pcsn,
+            dtl.quality_scode,
+            dtl.bill_status,
+            CONVERT(dtl.qty_unit_id , CHAR ) AS qty_unit_id,
+            dtl.qty_unit_name,
+            dtl.plan_qty,
+            dtl.real_qty,
+            CONVERT(dtl.source_billdtl_id , CHAR ) AS source_billdtl_id,
+            dtl.source_bill_type,
+            dtl.source_bill_code,
+            dtl.source_bill_table,
+            CONVERT(dtl.base_billdtl_id , CHAR ) AS base_billdtl_id,
+            dtl.base_bill_type,
+            dtl.base_bill_code,
+            dtl.base_bill_table,
+            dtl.remark,
+            dtl.assign_qty,
+            dtl.unassign_qty,
+            dtl.box_no,
+            dtl.vbeln,
+            dtl.posnr,
+            dtl.width,
             mater.material_code,
             mater.material_name,
             sub.sap_pcsn

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

@@ -16,12 +16,17 @@ import org.nl.common.exception.BadRequestException;
 import org.nl.common.utils.CodeUtil;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.config.IdUtil;
+import org.nl.wms.pdm.enums.SUBEnum;
 import org.nl.wms.pdm.subpackage.service.IPdmBiSubpackagerelationService;
 import org.nl.wms.pdm.subpackage.service.dao.PdmBiSubpackagerelation;
 import org.nl.wms.sch.point.service.ISchBasePointService;
 import org.nl.wms.sch.point.service.dao.SchBasePoint;
 import org.nl.wms.sch.task.service.ISchBaseTaskService;
 import org.nl.wms.sch.task.service.dao.SchBaseTask;
+import org.nl.wms.storage_manage.database.dao.StIvtBsrealstorattr;
+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.IStIvtBsrealstorattrService;
 import org.nl.wms.storage_manage.ios.enums.IOSEnum;
 import org.nl.wms.storage_manage.ios.service.iostorInv.IStIvtIostorinvService;
 import org.nl.wms.storage_manage.ios.service.iostorInv.IStIvtIostorinvdisService;
@@ -89,6 +94,18 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvMapper,
     @Autowired
     private ISchBaseTaskService iSchBaseTaskService;
 
+    /**
+     * 仓库服务
+     */
+    @Autowired
+    private IStIvtBsrealstorattrService iStIvtBsrealstorattrService;
+
+    /**
+     * 仓位mapper服务
+     */
+    @Autowired
+    private StIvtStructattrMapper stIvtStructattrMapper;
+
     @Override
     public Object pageQuery(IostorInvQuery query, PageQuery pageQuery) {
         Page<Object> page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize());
@@ -156,6 +173,30 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvMapper,
         // 插入明细
         iStIvtIostorinvdtlService.insertDtl(mstDao.getIostorinv_id(), dtlList);
 
+        // 校验木箱是否已经入库
+        List<StIvtIostorinvdis> disList = iStIvtIostorinvdisService.list(
+                new QueryWrapper<StIvtIostorinvdis>().lambda()
+                        .eq(StIvtIostorinvdis::getIostorinv_id, mstDao.getIostorinv_id())
+        );
+
+        List<String> boxList = disList.stream()
+                .map(StIvtIostorinvdis::getBox_no)
+                .collect(Collectors.toList());
+
+        List<StIvtStructattr> attrList = stIvtStructattrMapper.queryBatch(boxList);
+
+        if (ObjectUtil.isNotEmpty(attrList)) {
+            String result = attrList.stream().map(StIvtStructattr::getStoragevehicle_code).collect(Collectors.joining("','"));
+            throw new BadRequestException( result + "已经入库，请核查数据!");
+        }
+
+        // 更新子卷包装关系
+        iPdmBiSubpackagerelationService.update(
+                new UpdateWrapper<PdmBiSubpackagerelation>().lambda()
+                    .set(PdmBiSubpackagerelation::getStatus, SUBEnum.STATUS.code("包装"))
+                    .in(PdmBiSubpackagerelation::getPackage_box_sn, boxList)
+        );
+
     }
 
     @Override
@@ -188,6 +229,30 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvMapper,
 
         // 插入明细
         iStIvtIostorinvdtlService.insertDtl(mstDao.getIostorinv_id(), dtlList);
+
+        // 校验木箱是否已经入库
+        List<StIvtIostorinvdis> disList = iStIvtIostorinvdisService.list(
+                new QueryWrapper<StIvtIostorinvdis>().lambda()
+                        .eq(StIvtIostorinvdis::getIostorinv_id, mstDao.getIostorinv_id())
+        );
+
+        List<String> boxList = disList.stream()
+                .map(StIvtIostorinvdis::getBox_no)
+                .collect(Collectors.toList());
+
+        List<StIvtStructattr> attrList = stIvtStructattrMapper.queryBatch(boxList);
+
+        if (ObjectUtil.isNotEmpty(attrList)) {
+            String result = attrList.stream().map(StIvtStructattr::getStoragevehicle_code).collect(Collectors.joining("','"));
+            throw new BadRequestException( result + "已经入库，请核查数据!");
+        }
+
+        // 更新子卷包装关系
+        iPdmBiSubpackagerelationService.update(
+                new UpdateWrapper<PdmBiSubpackagerelation>().lambda()
+                        .set(PdmBiSubpackagerelation::getStatus, SUBEnum.STATUS.code("包装"))
+                        .in(PdmBiSubpackagerelation::getPackage_box_sn, boxList)
+        );
     }
 
     @Override
@@ -199,6 +264,22 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvMapper,
                         .set(StIvtIostorinv::getIs_delete, IOSEnum.IS_NOTANDYES.code("是"))
                         .eq(StIvtIostorinv::getIostorinv_id, id)
             );
+
+            // 更新子卷包装关系
+            List<StIvtIostorinvdis> disList = iStIvtIostorinvdisService.list(
+                    new QueryWrapper<StIvtIostorinvdis>().lambda()
+                            .eq(StIvtIostorinvdis::getIostorinv_id, id)
+            );
+
+            List<String> boxList = disList.stream()
+                    .map(StIvtIostorinvdis::getBox_no)
+                    .collect(Collectors.toList());
+
+            iPdmBiSubpackagerelationService.update(
+                    new UpdateWrapper<PdmBiSubpackagerelation>().lambda()
+                            .set(PdmBiSubpackagerelation::getStatus, SUBEnum.STATUS.code("包装"))
+                            .in(PdmBiSubpackagerelation::getPackage_box_sn, boxList)
+            );
         }
     }
 
@@ -546,9 +627,12 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvMapper,
         mstDao.setBuss_type(whereJson.getString("bill_type"));
         mstDao.setBill_type(whereJson.getString("bill_type"));
         mstDao.setBiz_date(whereJson.getString("biz_date").substring(0,10));
-        mstDao.setStor_id(whereJson.getLongValue("stor_id"));
-        mstDao.setStor_code(whereJson.getString("stor_code"));
-        mstDao.setStor_name(whereJson.getString("stor_name"));
+        仓库: {
+            StIvtBsrealstorattr storDao = iStIvtBsrealstorattrService.getById(whereJson.getLongValue("stor_id"));
+            mstDao.setStor_id(storDao.getStor_id());
+            mstDao.setStor_code(storDao.getStor_code());
+            mstDao.setStor_name(storDao.getStor_name());
+        }
         mstDao.setSource_id(whereJson.getLongValue("source_id"));
         mstDao.setSource_name(whereJson.getString("source_name"));
         mstDao.setSource_type(whereJson.getString("source_type"));

lms/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml

@@ -64,7 +64,7 @@ https://juejin.cn/post/6844903775631572999
     </appender>
     <!--开发环境:打印控制台-->
     <springProfile name="dev">
-        <root level="INFO">
+        <root level="debug">
             <appender-ref ref="asyncLuceneAppender"/>
             <appender-ref ref="CONSOLE"/>
         </root>

lms/nladmin-ui/src/views/wms/basedata/st/stor/index.vue

@@ -0,0 +1,407 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <el-input
+        v-model="query.stor_code"
+        clearable
+        style="width: 300px"
+        size="mini"
+        placeholder="输入仓库编码或名称"
+        prefix-icon="el-icon-search"
+        class="filter-item"
+      />
+      <rrOperation />
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <crudOperation :permission="permission" />
+      <!--表单组件-->
+      <el-dialog
+        :close-on-click-modal="false"
+        :before-close="crud.cancelCU"
+        :visible.sync="crud.status.cu > 0"
+        :title="crud.status.title"
+        width="700px"
+      >
+        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="100px">
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="仓库编码" prop="stor_code">
+                <el-input v-model="form.stor_code" style="width: 200px;" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="仓库名称" prop="stor_name">
+                <el-input v-model="form.stor_name" style="width: 200px;" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="仓库简称">
+                <el-input v-model="form.simple_name" style="width: 200px;" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="所属部门" prop="sysdeptid">
+                <treeselect
+                  v-model="form.sysdeptid"
+                  :options="depts"
+                  :load-options="loadDepts"
+                  style="width: 200px"
+                  placeholder="选择部门"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="仓库容量" prop="stor_capacity">
+                <el-input v-model="form.stor_capacity" style="width: 200px;" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="总面积(㎡)" prop="total_area">
+                <el-input v-model="form.total_area" style="width: 200px;" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="仓库性质" prop="stor_type_scode">
+                <el-select
+                  v-model="form.stor_type_scode"
+                  placeholder=""
+                  style="width: 200px"
+                >
+                  <el-option
+                    v-for="item in dict.st_stor_type"
+                    :key="item.id"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="仓库地址">
+                <el-input v-model="form.storea_ddress" style="width: 200px;" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="负责人">
+                <el-input v-model="form.principal" style="width: 200px;" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="联系电话" prop="office_phone">
+                <el-input v-model="form.office_phone" style="width: 200px;" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="外部标识">
+                <el-input v-model="form.ext_id" style="width: 200px;" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-form-item label="仓库类型" required>
+              <el-col :span="4" />
+              <el-col :span="4">
+                <el-checkbox v-model="form.is_materialstore" true-label="1" false-label="0">原材料库</el-checkbox>
+              </el-col>
+              <el-col :span="4">
+                <el-checkbox v-model="form.is_semi_finished" true-label="1" false-label="0">半成品库</el-checkbox>
+              </el-col>
+              <el-col :span="4">
+                <el-checkbox v-model="form.is_productstore" true-label="1" false-label="0">成品库</el-checkbox>
+              </el-col>
+              <el-col :span="4">
+                <el-checkbox v-model="form.is_attachment" true-label="1" false-label="0">备件库</el-checkbox>
+              </el-col>
+              <el-col :span="4">
+                <el-checkbox v-model="form.is_virtualstore" true-label="1" false-label="0">虚拟库</el-checkbox>
+              </el-col>
+            </el-form-item>
+
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="24">
+              <el-form-item label="备注">
+                <label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注</label>
+                <el-input v-model="form.remark" :rows="3" type="textarea" style="width: 550px;" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="text" @click="crud.cancelCU">取消</el-button>
+          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+        </div>
+      </el-dialog>
+      <!--表格渲染-->
+      <el-table
+        ref="table"
+        v-loading="crud.loading"
+        :data="crud.data"
+        size="mini"
+        style="width: 100%;"
+        @selection-change="crud.selectionChangeHandler"
+      >
+        <el-table-column prop="stor_code" label="仓库编码" />
+        <el-table-column prop="stor_name" label="仓库名称" width="150" />
+        <el-table-column prop="simple_name" label="简称" width="130" />
+        <el-table-column prop="stor_capacity" label="容量" />
+        <el-table-column prop="total_area" width="100px" label="总面积(㎡)" />
+        <el-table-column prop="label" label="仓库性质" />
+        <el-table-column prop="storea_ddress" label="地址" />
+        <el-table-column prop="principal" label="负责人" />
+        <el-table-column prop="office_phone" label="联系电话" width="130" />
+        <el-table-column prop="ext_id" label="外部标识" width="130" />
+        <el-table-column label="是否启用" align="center" prop="is_used">
+          <template slot-scope="scope">
+            <el-switch
+              :value="format_is_used(scope.row.is_used)"
+              active-color="#409EFF"
+              inactive-color="#F56C6C"
+              @change="changeEnabled(scope.row, scope.row.is_used)"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column prop="remark" label="备注" />
+        <el-table-column
+          v-permission="['admin','stIvtBsrealstorattr:edit','stIvtBsrealstorattr:del']"
+          label="操作"
+          fixed="right"
+          width="120px"
+          align="center"
+        >
+          <template slot-scope="scope">
+            <udOperation
+              :data="scope.row"
+              :permission="permission"
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
+  </div>
+</template>
+
+<script>
+import crudStorattr from '@/views/wms/basedata/st/stor/storattr'
+import CRUD, { crud, form, header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
+import pagination from '@crud/Pagination'
+import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import { getDepts, getDeptSuperior } from '@/views/system/dept/dept'
+import { isvalidPhone } from '@/utils/validate'
+
+const defaultForm = {
+  stor_id: null,
+  stor_code: null,
+  stor_name: null,
+  simple_name: null,
+  stor_capacity: null,
+  total_area: null,
+  stor_type_scode: null,
+  is_virtualstore: null,
+  is_semi_finished: null,
+  is_materialstore: null,
+  is_productstore: null,
+  is_reversed: null,
+  is_mvout_auto_cfm: null,
+  is_mvin_auto_cfm: null,
+  area: null,
+  storea_ddress: null,
+  principal: null,
+  office_phone: null,
+  mobile_no: null,
+  remark: null,
+  order_index: null,
+  whstate_scode: null,
+  is_used: '1',
+  base_class_id: null,
+  create_id: null,
+  create_name: null,
+  create_time: null,
+  update_optid: null,
+  update_optname: null,
+  update_time: null,
+  sysownerid: null,
+  sysdeptid: null,
+  syscompanyid: null,
+  is_delete: null,
+  ext_id: null,
+  depart_name: null,
+  company_name: null,
+  is_attachment: null
+}
+export default {
+  name: 'StIvtBsrealstorattr',
+  dicts: ['st_stor_type', 'is_used'],
+  components: { pagination, crudOperation, rrOperation, udOperation, Treeselect },
+  mixins: [presenter(), header(), form(defaultForm), crud()],
+  cruds() {
+    return CRUD({
+      title: '仓库',
+      optShow: { add: true, reset: true },
+      url: 'api/stIvtBsrealstorattr',
+      idField: 'stor_id',
+      sort: 'stor_id,desc',
+      crudMethod: { ...crudStorattr }
+    })
+  },
+  data() {
+    const validPhone = (rule, value, callback) => {
+      if (value && !isvalidPhone(value)) {
+        callback(new Error('请输入正确的11位手机号码'))
+      } else {
+        callback()
+      }
+    }
+    const numberOne = (rule, value, callback) => {
+      const numReg = /^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/
+      const numRe = new RegExp(numReg)
+      if (value) {
+        if (!numRe.test(value)) {
+          callback(new Error('只能输入数字'))
+        } else {
+          callback()
+        }
+      } else {
+        callback()
+      }
+    }
+    return {
+      depts: [],
+      permission: {},
+      rules: {
+        stor_code: [
+          { required: true, message: '仓库编码不能为空', trigger: 'blur' }
+        ],
+        stor_name: [
+          { required: true, message: '仓库名称不能为空', trigger: 'blur' }
+        ],
+        sysdeptid: [
+          { required: true, message: '所属部门不能为空', trigger: 'blur' }
+        ],
+        stor_capacity: [
+          { required: false, message: '不能为空', trigger: 'blur' },
+          { validator: numberOne }
+        ],
+        total_area: [
+          { required: false, message: '不能为空', trigger: 'blur' },
+          { validator: numberOne }
+        ],
+        office_phone: [
+          { required: false, trigger: 'blur', validator: validPhone }
+        ]
+      }
+    }
+  },
+  methods: {
+    // 新增与编辑前做的操作
+    [CRUD.HOOK.afterToCU](crud, form) {
+      if (form.id == null) {
+        this.getDepts()
+      } else {
+        this.getSupDepts(form.dept.id)
+      }
+    },
+    [CRUD.HOOK.beforeSubmit](crud, form) {
+      if (this.form.is_virtualstore === '0' && this.form.is_semi_finished === '0' && this.form.is_materialstore === '0' &&
+        this.form.is_productstore === '0' && this.form.is_attachment === '0') {
+        this.crud.notify('仓库类型至少选一条', CRUD.NOTIFICATION_TYPE.INFO)
+        return false
+      }
+      if (!this.form.is_virtualstore && !this.form.is_semi_finished && !this.form.is_materialstore &&
+        !this.form.is_productstore && !this.form.is_attachment) {
+        this.crud.notify('仓库类型至少选一条', CRUD.NOTIFICATION_TYPE.INFO)
+        return false
+      }
+    },
+    getDepts() {
+      getDepts({ enabled: true }).then(res => {
+        this.depts = res.content.map(function(obj) {
+          if (obj.hasChildren) {
+            obj.children = null
+          }
+          return obj
+        })
+      })
+    },
+    // 改变状态
+    format_is_used(is_used) {
+      return is_used === '1'
+    },
+    changeEnabled(data, val) {
+      let msg = '此操作将停用，是否继续！'
+      if (val !== '1') {
+        msg = '此操作将启用，是否继续！'
+      }
+      this.$confirm(msg, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        crudStorattr.changeActive(data).then(res => {
+          this.crud.toQuery()
+          this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        }).catch(() => {
+          data.is_used = !data.is_used
+        })
+      }).catch(() => {
+      })
+    },
+    getSupDepts(deptId) {
+      getDeptSuperior(deptId).then(res => {
+        const date = res.content
+        this.buildDepts(date)
+        this.depts = date
+      })
+    },
+    buildDepts(depts) {
+      depts.forEach(data => {
+        if (data.children) {
+          this.buildDepts(data.children)
+        }
+        if (data.hasChildren && !data.children) {
+          data.children = null
+        }
+      })
+    },
+    loadDepts({ action, parentNode, callback }) {
+      if (action === LOAD_CHILDREN_OPTIONS) {
+        getDepts({ enabled: true, pid: parentNode.id }).then(res => {
+          parentNode.children = res.content.map(function(obj) {
+            if (obj.hasChildren) {
+              obj.children = null
+            }
+            return obj
+          })
+          setTimeout(() => {
+            callback()
+          }, 200)
+        })
+      }
+    },
+    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
+    [CRUD.HOOK.beforeRefresh]() {
+      return true
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

lms/nladmin-ui/src/views/wms/basedata/st/stor/storattr.js

@@ -0,0 +1,43 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/stIvtBsrealstorattr',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'api/stIvtBsrealstorattr/',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/stIvtBsrealstorattr',
+    method: 'put',
+    data
+  })
+}
+
+export function getStor(params) {
+  return request({
+    url: 'api/stIvtBsrealstorattr/getStor',
+    method: 'get',
+    params
+  })
+}
+
+export function changeActive(data) {
+  return request({
+    url: 'api/stIvtBsrealstorattr/changeActive',
+    method: 'put',
+    data
+  })
+}
+
+export default { add, edit, del, getStor, changeActive }

lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/AddDialog.vue

@@ -169,8 +169,8 @@
 import CRUD, { crud, form } from '@crud/crud'
 import AddDtl from '@/views/wms/storage_manage/ios/inbill/AddDtl'
 import inBill from '@/views/wms/storage_manage/ios/inbill/inbill'
+import crudStorattr from '@/views/wms/basedata/st/stor/storattr'
 // import MaterDtl from '@/views/wms/pub/MaterDialog'
-// import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
 
 const defaultForm = {
   bill_code: '',
@@ -205,9 +205,7 @@ export default {
       bill_btn: false,
       mater_btn: false,
       materType: '',
-      storlist: [
-        { 'stor_id': '1010101', 'stor_name': '测试仓库' }
-      ],
+      storlist: [],
       rules: {
         stor_id: [
           { required: true, message: '仓库不能为空', trigger: 'blur' }
@@ -230,9 +228,9 @@ export default {
   },
   methods: {
     open() {
-  /*    crudUserStor.getUserStor().then(res => {
+      crudStorattr.getStor({}).then(res => {
         this.storlist = res
-      })*/
+      })
     },
     close() {
       this.$emit('AddChanged')

lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/AddDtl.vue

@@ -146,7 +146,7 @@ export default {
   },
   methods: {
     [CRUD.HOOK.beforeRefresh]() {
-      this.crud.query.status = '10'
+      this.crud.query.status = '0'
       return true
     },
     open() {

lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/ViewDialog.vue

@@ -153,6 +153,7 @@
 
 import { crud } from '@crud/crud'
 import inBill from '@/views/wms/storage_manage/ios/inbill/inbill'
+import crudStorattr from '@/views/wms/basedata/st/stor/storattr'
 // import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
 
 export default {
@@ -196,10 +197,10 @@ export default {
   created() {
    /* checkoutbill.getInvTypes().then(res => {
       this.billtypelist = res
-    })
-    crudUserStor.getUserStor().then(res => {
-      this.storlist = res
     })*/
+    crudStorattr.getStor({}).then(res => {
+      this.storlist = res
+    })
   },
   methods: {
     open() {

lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/index.vue

@@ -196,7 +196,7 @@
           </template>
         </el-table-column>
         <el-table-column show-overflow-tooltip :formatter="stateFormat" prop="bill_status" label="单据状态" />
-        <el-table-column prop="stor_name" label="仓库" />
+        <el-table-column prop="stor_name" label="仓库" min-width="120" />
         <el-table-column show-overflow-tooltip prop="bill_type" min-width="120" :formatter="bill_typeFormat" label="业务类型" />
         <el-table-column show-overflow-tooltip min-width="120" prop="biz_date" label="业务日期" />
         <el-table-column show-overflow-tooltip prop="create_mode" :formatter="create_modeFormat" label="生成方式" />
@@ -233,7 +233,7 @@ import AddDialog from '@/views/wms/storage_manage/ios/inbill/AddDialog'
 import DivDialog from '@/views/wms/storage_manage/ios/inbill/DivDialog'
 import ViewDialog from '@/views/wms/storage_manage/ios/inbill/ViewDialog'
 import TaskDialog from '@/views/wms/storage_manage/ios/inbill/TaskDialog'
-// import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
+import crudStorattr, { getStor } from '@/views/wms/basedata/st/stor/storattr'
 
 export default {
   name: 'Inbill',
@@ -272,9 +272,9 @@ export default {
     }
   },
   created() {
-    /*crudUserStor.getUserStor().then(res => {
+    crudStorattr.getStor({}).then(res => {
       this.storlist = res
-    })*/
+    })
   },
   methods: {
     canUd(row) {