root/yinnihailiang_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

opt:修改仓储模块代码路径

Browse Source
This commit is contained in:
zds
2024-10-22 17:30:59 +08:00
parent 08bf09b36a
commit 375e950ecf
28 changed files with 81 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInTask.java
View File

@@ -2,37 +2,24 @@ package org.nl.b_lms.sch.tasks;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import org.nl.b_lms.storage_manage.ios.enums.IOSEnum;
import org.nl.b_lms.storage_manage.ios.service.iostorInv.IStIvtIostorinvdisService;
import org.nl.b_lms.storage_manage.ios.service.iostorInv.dao.StIvtIostorinvdis;
import org.nl.b_lms.storage_manage.ios.service.iostorInv.impl.StIvtIostorinvServiceImpl;
import org.nl.b_lms.storage_manage.ios.service.iostorInv.impl.StIvtIostorinvdisServiceImpl;
import org.nl.common.utils.SecurityUtils;
import org.nl.modules.common.exception.BadRequestException;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.SpringContextHolder;
import org.nl.wms.basedata.master.structattr.service.dto.StructattrDto;
import org.nl.wms.basedata.master.structattr.service.impl.StructattrServiceImpl;
import org.nl.wms.sch.AcsTaskDto;
import org.nl.wms.sch.manage.AbstractAcsTask;
import org.nl.wms.sch.manage.TaskStatusEnum;
import org.nl.wms.st.inbill.service.impl.InbillServiceImpl;
import org.nl.wms.st.inbill.service.impl.RawAssistIStorServiceImpl;
import org.nl.wms.st.inbill.service.impl.StorPublicServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import static org.nl.wms.util.TaskUtil.getRoutePlanCode;

5
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java
View File

@@ -36,8 +36,8 @@ import org.nl.common.utils.CodeUtil;
import org.nl.modules.wql.WQL;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.system.service.param.ISysParamService;
import org.nl.wms.basedata.master.storattr.service.StorattrService;
import org.nl.wms.basedata.master.storattr.service.dto.StorattrDto;
import org.nl.wms.basedata.st.storattr.service.StorattrService;
import org.nl.wms.basedata.st.storattr.service.dto.StorattrDto;
import org.nl.wms.pda.mps.eum.RegionTypeEnum;
import org.nl.wms.sch.manage.TaskStatusEnum;
import org.nl.wms.util.TranUtil;
@@ -49,7 +49,6 @@ import java.math.BigDecimal;
import java.util.*;
import java.util.function.Consumer;
import java.util.function.Function;
import java.util.stream.Collector;
import java.util.stream.Collectors;
/**

9
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java
View File

@@ -3,7 +3,6 @@ package org.nl.b_lms.storage_manage.ios.service.iostorInv.impl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
@@ -16,10 +15,7 @@ import com.github.pagehelper.PageHelper;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.nl.b_lms.pdm.bi.slittingproductionplan.service.IPdmBiSlittingproductionplanService;
import org.nl.b_lms.pdm.bi.slittingproductionplan.service.dao.mapper.PdmBiSlittingproductionplanMapper;
import org.nl.b_lms.pdm.subpackagerelation.dao.PdmBiSubpackagerelation;
import org.nl.b_lms.pdm.subpackagerelation.dao.mapper.PdmBiSubpackagerelationMapper;
import org.nl.b_lms.pdm.subpackagerelation.service.IpdmBiSubpackagerelationService;
import org.nl.b_lms.pdm_manage.enums.SUBEnum;
import org.nl.b_lms.sch.tasks.TwoInTask;
@@ -43,14 +39,13 @@ import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.SpringContextHolder;
import org.nl.system.service.param.ISysParamService;
import org.nl.system.service.param.impl.SysParamServiceImpl;
import org.nl.wms.basedata.master.storattr.service.StorattrService;
import org.nl.wms.basedata.master.storattr.service.dto.StorattrDto;
import org.nl.wms.basedata.st.storattr.service.StorattrService;
import org.nl.wms.basedata.st.storattr.service.dto.StorattrDto;
import org.nl.wms.basedata.st.service.impl.UserStorServiceImpl;
import org.nl.wms.sch.manage.AbstractAcsTask;
import org.nl.wms.sch.manage.TaskStatusEnum;
import org.nl.wms.sch.service.PointService;
import org.nl.wms.sch.service.dto.PointDto;
import org.nl.wms.sch.tasks.InTask;
import org.nl.wms.st.inbill.service.StorPublicService;
import org.nl.wms.st.returns.service.impl.InAndOutRetrunServiceImpl;
import org.redisson.api.RLock;

3
lms/nladmin-system/src/main/java/org/nl/modules/mnt/websocket/SendRegionWebSocketServer.java
View File

@@ -20,9 +20,8 @@ import com.alibaba.fastjson.JSONArray;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.nl.common.utils.RedissonUtils;
import org.nl.modules.mnt.service.AutoRiKuService;
import org.nl.modules.wql.util.SpringContextHolder;
import org.nl.wms.basedata.master.structattr.service.StructattrService;
import org.nl.wms.basedata.st.structattr.service.StructattrService;
import org.springframework.stereotype.Component;
import javax.websocket.*;

7
lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/sectattr/controller/SectattrController.java → lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/sectattr/controller/SectattrController.java
View File

@@ -1,4 +1,4 @@
package org.nl.wms.basedata.master.sectattr.controller;
package org.nl.wms.basedata.st.sectattr.controller;
import com.alibaba.fastjson.JSONObject;
@@ -6,9 +6,8 @@ import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.common.domain.query.PageQuery;
import org.nl.modules.logging.annotation.Log;
import org.nl.wms.basedata.master.sectattr.service.SectattrService;
import org.nl.wms.basedata.master.sectattr.service.dto.SectattrDto;
import org.springframework.data.domain.Pageable;
import org.nl.wms.basedata.st.sectattr.service.SectattrService;
import org.nl.wms.basedata.st.sectattr.service.dto.SectattrDto;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;

8
lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/sectattr/service/SectattrService.java → lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/sectattr/service/SectattrService.java
View File

@@ -1,12 +1,10 @@
package org.nl.wms.basedata.master.sectattr.service;
package org.nl.wms.basedata.st.sectattr.service;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import org.nl.common.domain.query.PageQuery;
import org.nl.wms.basedata.master.sectattr.service.dao.Sectattr;
import org.nl.wms.basedata.master.sectattr.service.dto.SectattrDto;
import org.springframework.data.domain.Pageable;
import org.nl.wms.basedata.st.sectattr.service.dao.Sectattr;
import org.nl.wms.basedata.st.sectattr.service.dto.SectattrDto;
import java.util.HashMap;
import java.util.List;

2
lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/sectattr/service/dao/Sectattr.java → lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/sectattr/service/dao/Sectattr.java
View File

@@ -1,4 +1,4 @@
package org.nl.wms.basedata.master.sectattr.service.dao;
package org.nl.wms.basedata.st.sectattr.service.dao;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;

10
lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/sectattr/service/dao/mapper/SectattrMapper.java → lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/sectattr/service/dao/mapper/SectattrMapper.java
View File

@@ -1,16 +1,10 @@
package org.nl.wms.basedata.master.sectattr.service.dao.mapper;
package org.nl.wms.basedata.st.sectattr.service.dao.mapper;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
import org.nl.common.domain.query.PageQuery;
import org.nl.modules.common.annotation.Query;
import org.nl.wms.basedata.master.sectattr.service.dao.Sectattr;
import org.springframework.data.domain.Pageable;
import java.util.HashMap;
import java.util.List;
import org.nl.wms.basedata.st.sectattr.service.dao.Sectattr;
/**
* @author LENOVO

4
lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/sectattr/service/dao/mapper/SectattrMapper.xml → lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/sectattr/service/dao/mapper/SectattrMapper.xml
View File

@@ -1,8 +1,8 @@
<?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.basedata.master.sectattr.service.dao.mapper.SectattrMapper">
<mapper namespace="org.nl.wms.basedata.st.sectattr.service.dao.mapper.SectattrMapper">
<select id="queryAll" resultType="org.nl.wms.basedata.master.sectattr.service.dto.SectattrDto">
<select id="queryAll" resultType="org.nl.wms.basedata.st.sectattr.service.dto.SectattrDto">
select
sect.*,
stor.stor_name

2
lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/sectattr/service/dto/SectattrDto.java → lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/sectattr/service/dto/SectattrDto.java
View File

@@ -1,4 +1,4 @@
package org.nl.wms.basedata.master.sectattr.service.dto;
package org.nl.wms.basedata.st.sectattr.service.dto;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

26
lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/sectattr/service/impl/SectattrServiceImpl.java → lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/sectattr/service/impl/SectattrServiceImpl.java
View File

@@ -1,4 +1,4 @@
package org.nl.wms.basedata.master.sectattr.service.impl;
package org.nl.wms.basedata.st.sectattr.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
@@ -6,10 +6,8 @@ import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -21,25 +19,19 @@ import org.nl.common.utils.SecurityUtils;
import org.nl.modules.common.exception.BadRequestException;
import org.nl.modules.wql.WQL;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.WqlUtil;
import org.nl.system.service.logicflow.dao.StageImage;
import org.nl.wms.basedata.master.sectattr.service.dao.Sectattr;
import org.nl.wms.basedata.master.sectattr.service.dao.mapper.SectattrMapper;
import org.nl.wms.basedata.master.sectattr.service.SectattrService;
import org.nl.wms.basedata.master.storattr.service.dao.Storattr;
import org.nl.wms.basedata.master.structattr.service.StructattrService;
import org.nl.wms.basedata.master.structattr.service.dao.Structattr;
import org.nl.wms.basedata.master.structattr.service.impl.StructattrServiceImpl;
import org.nl.wms.basedata.master.storattr.service.StorattrService;
import org.nl.wms.basedata.master.sectattr.service.dto.SectattrDto;
import org.nl.wms.basedata.master.storattr.service.dto.StorattrDto;
import org.nl.wms.basedata.st.sectattr.service.dao.Sectattr;
import org.nl.wms.basedata.st.sectattr.service.dao.mapper.SectattrMapper;
import org.nl.wms.basedata.st.sectattr.service.SectattrService;
import org.nl.wms.basedata.st.structattr.service.StructattrService;
import org.nl.wms.basedata.st.structattr.service.dao.Structattr;
import org.nl.wms.basedata.st.storattr.service.StorattrService;
import org.nl.wms.basedata.st.sectattr.service.dto.SectattrDto;
import org.nl.wms.basedata.st.storattr.service.dto.StorattrDto;
import org.nl.wms.basedata.st.service.impl.UserStorServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

10
lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/storattr/controller/StorattrController.java → lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/storattr/controller/StorattrController.java
View File

@@ -1,15 +1,13 @@
package org.nl.wms.basedata.master.storattr.controller;
package org.nl.wms.basedata.st.storattr.controller;
import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.common.domain.query.PageQuery;
import org.nl.modules.logging.annotation.Log;
import org.nl.wms.basedata.master.storattr.service.StorattrService;
import org.nl.wms.basedata.master.storattr.service.dao.Storattr;
import org.nl.wms.basedata.master.storattr.service.dto.StorattrDto;
import org.springframework.data.domain.Pageable;
import org.nl.wms.basedata.st.storattr.service.StorattrService;
import org.nl.wms.basedata.st.storattr.service.dao.Storattr;
import org.nl.wms.basedata.st.storattr.service.dto.StorattrDto;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;

7
lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/storattr/service/StorattrService.java → lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/storattr/service/StorattrService.java
View File

@@ -1,11 +1,10 @@
package org.nl.wms.basedata.master.storattr.service;
package org.nl.wms.basedata.st.storattr.service;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.service.IService;
import org.nl.common.domain.query.PageQuery;
import org.nl.wms.basedata.master.storattr.service.dao.Storattr;
import org.nl.wms.basedata.master.storattr.service.dto.StorattrDto;
import org.springframework.data.domain.Pageable;
import org.nl.wms.basedata.st.storattr.service.dao.Storattr;
import org.nl.wms.basedata.st.storattr.service.dto.StorattrDto;
import java.util.List;
import java.util.Map;

3
lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/storattr/service/dao/Storattr.java → lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/storattr/service/dao/Storattr.java
View File

@@ -1,4 +1,4 @@
package org.nl.wms.basedata.master.storattr.service.dao;
package org.nl.wms.basedata.st.storattr.service.dao;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -9,7 +9,6 @@ import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.math.BigDecimal;
/**
* @author zhouz

10
lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/storattr/service/dao/mapper/StorattrMapper.java → lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/storattr/service/dao/mapper/StorattrMapper.java
View File

@@ -1,15 +1,9 @@
package org.nl.wms.basedata.master.storattr.service.dao.mapper;
package org.nl.wms.basedata.st.storattr.service.dao.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
import org.nl.wms.basedata.master.materialbase.service.dao.Materialbase;
import org.nl.wms.basedata.master.storattr.service.dao.Storattr;
import org.nl.wms.basedata.master.structattr.service.dao.Structattr;
import org.springframework.data.domain.Pageable;
import java.util.HashMap;
import java.util.List;
import org.nl.wms.basedata.st.storattr.service.dao.Storattr;
public interface StorattrMapper extends BaseMapper<Storattr> {

4
lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/storattr/service/dao/mapper/StorattrMapper.xml → lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/storattr/service/dao/mapper/StorattrMapper.xml
View File

@@ -1,8 +1,8 @@
<?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.basedata.master.storattr.service.dao.mapper.StorattrMapper">
<mapper namespace="org.nl.wms.basedata.st.storattr.service.dao.mapper.StorattrMapper">
<select id="queryAll" resultType="org.nl.wms.basedata.master.storattr.service.dao.Storattr">
<select id="queryAll" resultType="org.nl.wms.basedata.st.storattr.service.dao.Storattr">
SELECT stor.*
FROM st_ivt_bsrealstorattr stor
<where>

3
lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/storattr/service/dto/StorattrDto.java → lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/storattr/service/dto/StorattrDto.java
View File

@@ -1,11 +1,10 @@
package org.nl.wms.basedata.master.storattr.service.dto;
package org.nl.wms.basedata.st.storattr.service.dto;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
/**
* @author zhouz

26
lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/storattr/service/impl/StorattrServiceImpl.java → lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/storattr/service/impl/StorattrServiceImpl.java
View File

@@ -1,12 +1,9 @@
package org.nl.wms.basedata.master.storattr.service.impl;
package org.nl.wms.basedata.st.storattr.service.impl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -18,20 +15,15 @@ import net.dreamlu.mica.core.utils.BeanUtil;
import org.nl.common.domain.query.PageQuery;
import org.nl.common.utils.SecurityUtils;
import org.nl.modules.common.exception.BadRequestException;
import org.nl.modules.wql.WQL;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.WqlUtil;
import org.nl.wms.basedata.master.materialbase.service.dao.Materialbase;
import org.nl.wms.basedata.master.sectattr.service.SectattrService;
import org.nl.wms.basedata.master.sectattr.service.dao.Sectattr;
import org.nl.wms.basedata.master.storattr.service.StorattrService;
import org.nl.wms.basedata.master.storattr.service.dao.Storattr;
import org.nl.wms.basedata.master.storattr.service.dao.mapper.StorattrMapper;
import org.nl.wms.basedata.master.storattr.service.dto.StorattrDto;
import org.nl.wms.basedata.master.structattr.service.StructattrService;
import org.nl.wms.basedata.master.structattr.service.dao.Structattr;
import org.nl.wms.basedata.st.sectattr.service.SectattrService;
import org.nl.wms.basedata.st.sectattr.service.dao.Sectattr;
import org.nl.wms.basedata.st.storattr.service.StorattrService;
import org.nl.wms.basedata.st.storattr.service.dao.Storattr;
import org.nl.wms.basedata.st.storattr.service.dao.mapper.StorattrMapper;
import org.nl.wms.basedata.st.storattr.service.dto.StorattrDto;
import org.nl.wms.basedata.st.structattr.service.StructattrService;
import org.nl.wms.basedata.st.structattr.service.dao.Structattr;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

6
lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/structattr/controller/StructattrController.java → lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/structattr/controller/StructattrController.java
View File

@@ -1,4 +1,4 @@
package org.nl.wms.basedata.master.structattr.controller;
package org.nl.wms.basedata.st.structattr.controller;
import com.alibaba.fastjson.JSONArray;
@@ -7,8 +7,8 @@ import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.common.domain.query.PageQuery;
import org.nl.modules.logging.annotation.Log;
import org.nl.wms.basedata.master.structattr.service.StructattrService;
import org.nl.wms.basedata.master.structattr.service.dto.StructattrDto;
import org.nl.wms.basedata.st.structattr.service.StructattrService;
import org.nl.wms.basedata.st.structattr.service.dto.StructattrDto;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;

6
lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/structattr/service/StructattrService.java → lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/structattr/service/StructattrService.java
View File

@@ -1,12 +1,12 @@
package org.nl.wms.basedata.master.structattr.service;
package org.nl.wms.basedata.st.structattr.service;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import org.nl.common.domain.query.PageQuery;
import org.nl.wms.basedata.master.structattr.service.dao.Structattr;
import org.nl.wms.basedata.master.structattr.service.dto.StructattrDto;
import org.nl.wms.basedata.st.structattr.service.dao.Structattr;
import org.nl.wms.basedata.st.structattr.service.dto.StructattrDto;
import org.springframework.data.domain.Pageable;
import java.util.List;

2
lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/structattr/service/dao/Structattr.java → lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/structattr/service/dao/Structattr.java
View File

@@ -1,4 +1,4 @@
package org.nl.wms.basedata.master.structattr.service.dao;
package org.nl.wms.basedata.st.structattr.service.dao;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;

4
lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/structattr/service/dao/mapper/StructattrMapper.java → lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/structattr/service/dao/mapper/StructattrMapper.java
View File

@@ -1,10 +1,10 @@
package org.nl.wms.basedata.master.structattr.service.dao.mapper;
package org.nl.wms.basedata.st.structattr.service.dao.mapper;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.nl.wms.basedata.master.structattr.service.dao.Structattr;
import org.nl.wms.basedata.st.structattr.service.dao.Structattr;
import java.util.List;

2
lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/structattr/service/dao/mapper/StructattrMapper.xml → lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/structattr/service/dao/mapper/StructattrMapper.xml
View File

@@ -1,6 +1,6 @@
<?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.basedata.master.structattr.service.dao.mapper.StructattrMapper">
<mapper namespace="org.nl.wms.basedata.st.structattr.service.dao.mapper.StructattrMapper">
<select id="getPrefix" resultType="com.alibaba.fastjson.JSONObject">
select *

2
lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/structattr/service/dto/StructattrDto.java → lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/structattr/service/dto/StructattrDto.java
View File

@@ -1,4 +1,4 @@
package org.nl.wms.basedata.master.structattr.service.dto;
package org.nl.wms.basedata.st.structattr.service.dto;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

25
lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/structattr/service/impl/StructattrServiceImpl.java → lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/structattr/service/impl/StructattrServiceImpl.java
View File

@@ -1,6 +1,4 @@
package org.nl.wms.basedata.master.structattr.service.impl;
import com.google.common.collect.Maps;
package org.nl.wms.basedata.st.structattr.service.impl;
import cn.hutool.core.bean.BeanUtil;
@@ -10,7 +8,6 @@ import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -26,21 +23,19 @@ import org.nl.b_lms.storage_manage.database.service.dao.BstIvtBoxlashbound;
import org.nl.b_lms.storage_manage.database.service.dao.mapper.BstIvtBoxinfoMapper;
import org.nl.b_lms.storage_manage.ios.enums.IOSEnum;
import org.nl.common.domain.query.PageQuery;
import org.nl.common.utils.MapOf;
import org.nl.common.utils.SecurityUtils;
import org.nl.modules.common.exception.BadRequestException;
import org.nl.modules.wql.WQL;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.WqlUtil;
import org.nl.wms.basedata.master.sectattr.service.dao.Sectattr;
import org.nl.wms.basedata.master.structattr.service.dao.Structattr;
import org.nl.wms.basedata.master.structattr.service.dao.mapper.StructattrMapper;
import org.nl.wms.basedata.master.sectattr.service.SectattrService;
import org.nl.wms.basedata.master.storattr.service.StorattrService;
import org.nl.wms.basedata.master.structattr.service.StructattrService;
import org.nl.wms.basedata.master.sectattr.service.dto.SectattrDto;
import org.nl.wms.basedata.master.storattr.service.dto.StorattrDto;
import org.nl.wms.basedata.master.structattr.service.dto.StructattrDto;
import org.nl.wms.basedata.st.sectattr.service.dao.Sectattr;
import org.nl.wms.basedata.st.structattr.service.dao.Structattr;
import org.nl.wms.basedata.st.structattr.service.dao.mapper.StructattrMapper;
import org.nl.wms.basedata.st.sectattr.service.SectattrService;
import org.nl.wms.basedata.st.storattr.service.StorattrService;
import org.nl.wms.basedata.st.structattr.service.StructattrService;
import org.nl.wms.basedata.st.sectattr.service.dto.SectattrDto;
import org.nl.wms.basedata.st.storattr.service.dto.StorattrDto;
import org.nl.wms.basedata.st.structattr.service.dto.StructattrDto;
import org.nl.wms.basedata.st.service.impl.UserStorServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Pageable;

4
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InTask.java
View File

@@ -10,8 +10,8 @@ import org.nl.common.utils.SecurityUtils;
import org.nl.modules.common.exception.BadRequestException;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.SpringContextHolder;
import org.nl.wms.basedata.master.structattr.service.dto.StructattrDto;
import org.nl.wms.basedata.master.structattr.service.impl.StructattrServiceImpl;
import org.nl.wms.basedata.st.structattr.service.dto.StructattrDto;
import org.nl.wms.basedata.st.structattr.service.impl.StructattrServiceImpl;
import org.nl.wms.sch.AcsTaskDto;
import org.nl.wms.sch.manage.AbstractAcsTask;
import org.nl.wms.sch.manage.TaskStatusEnum;

16
lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java
View File

@@ -20,11 +20,11 @@ import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.SpringContextHolder;
import org.nl.modules.wql.util.WqlUtil;
import org.nl.system.service.param.impl.SysParamServiceImpl;
import org.nl.wms.basedata.master.structattr.service.dto.StructattrDto;
import org.nl.wms.basedata.master.storattr.service.StorattrService;
import org.nl.wms.basedata.master.structattr.service.StructattrService;
import org.nl.wms.basedata.master.storattr.service.dto.StorattrDto;
import org.nl.wms.basedata.master.structattr.service.impl.StructattrServiceImpl;
import org.nl.wms.basedata.st.structattr.service.dto.StructattrDto;
import org.nl.wms.basedata.st.storattr.service.StorattrService;
import org.nl.wms.basedata.st.structattr.service.StructattrService;
import org.nl.wms.basedata.st.storattr.service.dto.StorattrDto;
import org.nl.wms.basedata.st.structattr.service.impl.StructattrServiceImpl;
import org.nl.wms.basedata.st.service.impl.UserStorServiceImpl;
import org.nl.wms.pda.mps.eum.RegionTypeEnum;
import org.nl.wms.sch.manage.AbstractAcsTask;
@@ -812,7 +812,7 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService {
if (dis_rows.size() <= 0) {
throw new BadRequestException("数据参数有误！");
}
org.nl.wms.basedata.master.structattr.service.dto.StructattrDto old_struct = structattrService.findByCode((String) whereJson.get("struct_code"));
org.nl.wms.basedata.st.structattr.service.dto.StructattrDto old_struct = structattrService.findByCode((String) whereJson.get("struct_code"));
JSONObject mst_jo = WQLObject.getWQLObject("ST_IVT_IOStorInv").query("iostorinv_id = '" + dis_rows.getJSONObject(0).getString("iostorinv_id") + "'").uniqueResult(0);
for (int i = 0; i < dis_rows.size(); i++) {
JSONObject i_form = new JSONObject();
@@ -2338,7 +2338,7 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService {
task_wql.update(task_map, "taskdtl_id = '" + whereJson.get("task_id") + "'");
//更新分配表的目的仓位
org.nl.wms.basedata.master.structattr.service.dto.StructattrDto structattrDto = structattrService.findByCode((String) whereJson.get("new_struct_code"));
org.nl.wms.basedata.st.structattr.service.dto.StructattrDto structattrDto = structattrService.findByCode((String) whereJson.get("new_struct_code"));
HashMap str_map = new HashMap<>();
str_map.put("sect_id", structattrDto.getSect_id());
str_map.put("sect_code", structattrDto.getSect_code());
@@ -2365,7 +2365,7 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService {
if (dis_rows.size() <= 0) {
throw new BadRequestException("数据参数有误！");
}
org.nl.wms.basedata.master.structattr.service.dto.StructattrDto old_struct = structattrService.findByCode((String) whereJson.get("struct_code"));
org.nl.wms.basedata.st.structattr.service.dto.StructattrDto old_struct = structattrService.findByCode((String) whereJson.get("struct_code"));
JSONObject mst_jo = WQLObject.getWQLObject("ST_IVT_IOStorInv").query("iostorinv_id = '" + dis_rows.getJSONObject(0).getString("iostorinv_id") + "'").uniqueResult(0);
for (int i = 0; i < dis_rows.size(); i++) {
JSONObject i_form = new JSONObject();

4
lms/nladmin-system/src/main/java/org/nl/wms/st/instor/movestor/service/impl/HandMoveStorServiceImpl.java
View File

@@ -23,8 +23,8 @@ import org.nl.modules.wql.WQL;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.SpringContextHolder;
import org.nl.modules.wql.util.WqlUtil;
import org.nl.wms.basedata.master.structattr.service.dao.Structattr;
import org.nl.wms.basedata.master.structattr.service.dao.mapper.StructattrMapper;
import org.nl.wms.basedata.st.structattr.service.dao.Structattr;
import org.nl.wms.basedata.st.structattr.service.dao.mapper.StructattrMapper;
import org.nl.wms.basedata.st.service.impl.UserStorServiceImpl;
import org.nl.wms.pda.mps.eum.RegionTypeEnum;
import org.nl.wms.sch.manage.TaskStatusEnum;