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

opt:分支合并

Browse Source
This commit is contained in:
zhangzhiqiang
2023-09-20 16:31:09 +08:00
parent 7f142e1e91
commit 6308d6ba37
91 changed files with 234 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/lubricate/service/impl/DevicelubricatemstServiceImpl.java
View File

@@ -19,7 +19,7 @@ import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.WqlUtil;
import org.nl.wms.device_manage.lubricate.service.DevicelubricatemstService;
import org.nl.wms.device_manage.lubricate.service.dto.DevicelubricatemstDto;
import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService;
import org.nl.wms.masterdata_manage.bfmaster.service.ClassstandardService;
import org.nl.wms.system_manage.service.dept.ISysDeptService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Pageable;

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/lubricate/service/impl/DevicelubricateplanmstServiceImpl.java
View File

@@ -19,7 +19,7 @@ import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.WqlUtil;
import org.nl.wms.device_manage.lubricate.service.DevicelubricateplanmstService;
import org.nl.wms.device_manage.lubricate.service.dto.DevicelubricateplanmstDto;
import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService;
import org.nl.wms.masterdata_manage.bfmaster.service.ClassstandardService;
import org.nl.wms.system_manage.service.dept.ISysDeptService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Pageable;

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/service/impl/DevicerepairmstServiceImpl.java
View File

@@ -24,7 +24,7 @@ import org.nl.wms.device_manage.repair.service.DevicerepairmstService;
import org.nl.wms.device_manage.repair.service.dto.DevicerepairmstDto;
import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtBsrealstorattrService;
import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtBsrealstorattr;
import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService;
import org.nl.wms.masterdata_manage.bfmaster.service.ClassstandardService;
import org.nl.wms.system_manage.service.dept.ISysDeptService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Pageable;

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/service/impl/DevicerepairplanmstServiceImpl.java
View File

@@ -19,7 +19,7 @@ import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.WqlUtil;
import org.nl.wms.device_manage.repair.service.DevicerepairplanmstService;
import org.nl.wms.device_manage.repair.service.dto.DevicerepairplanmstDto;
import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService;
import org.nl.wms.masterdata_manage.bfmaster.service.ClassstandardService;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/service/impl/DevicerepairrequestServiceImpl.java
View File

@@ -20,7 +20,7 @@ import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.WqlUtil;
import org.nl.wms.device_manage.repair.service.DevicerepairrequestService;
import org.nl.wms.device_manage.repair.service.dto.DevicerepairrequestDto;
import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService;
import org.nl.wms.masterdata_manage.bfmaster.service.ClassstandardService;
import org.nl.wms.system_manage.service.dept.ISysDeptService;
import org.nl.wms.system_manage.service.user.ISysUserService;
import org.nl.wms.system_manage.service.user.dao.SysUser;

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/sportcheck/service/impl/DevicesportcheckmstServiceImpl.java
View File

@@ -19,7 +19,7 @@ import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.WqlUtil;
import org.nl.wms.device_manage.sportcheck.service.DevicesportcheckmstService;
import org.nl.wms.device_manage.sportcheck.service.dto.DevicesportcheckmstDto;
import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService;
import org.nl.wms.masterdata_manage.bfmaster.service.ClassstandardService;
import org.nl.wms.system_manage.service.dept.ISysDeptService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Pageable;

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/sportcheck/service/impl/DevicesportcheckplanmstServiceImpl.java
View File

@@ -19,7 +19,7 @@ import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.WqlUtil;
import org.nl.wms.device_manage.sportcheck.service.DevicesportcheckplanmstService;
import org.nl.wms.device_manage.sportcheck.service.dto.DevicesportcheckplanmstDto;
import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService;
import org.nl.wms.masterdata_manage.bfmaster.service.ClassstandardService;
import org.nl.wms.system_manage.service.dept.ISysDeptService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Pageable;

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/stat/service/impl/DevicePairQueryServiceImpl.java
View File

@@ -13,7 +13,7 @@ import org.nl.modules.common.utils.FileUtil;
import org.nl.modules.wql.WQL;
import org.nl.modules.wql.util.WqlUtil;
import org.nl.wms.device_manage.stat.service.DevicePairQueryService;
import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService;
import org.nl.wms.masterdata_manage.bfmaster.service.ClassstandardService;
import org.nl.wms.system_manage.service.dept.ISysDeptService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Pageable;
@@ -27,7 +27,7 @@ import java.util.*;
@RequiredArgsConstructor
@Slf4j
public class DevicePairQueryServiceImpl implements DevicePairQueryService {
private final ClassstandardService classstandardService;
@Autowired

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/stat/service/impl/DevicefaultcaeServiceImpl.java
View File

@@ -21,7 +21,7 @@ import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.WqlUtil;
import org.nl.wms.device_manage.stat.service.DevicefaultcaeService;
import org.nl.wms.device_manage.stat.service.dto.DevicesparepartivtDto;
import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService;
import org.nl.wms.masterdata_manage.bfmaster.service.ClassstandardService;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/service/impl/DevicemaintenancemstServiceImpl.java
View File

@@ -19,7 +19,7 @@ import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.WqlUtil;
import org.nl.wms.device_manage.upkeep.service.DevicemaintenancemstService;
import org.nl.wms.device_manage.upkeep.service.dto.DevicemaintenancemstDto;
import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService;
import org.nl.wms.masterdata_manage.bfmaster.service.ClassstandardService;
import org.nl.wms.system_manage.service.dept.ISysDeptService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Pageable;

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/service/impl/DevicemaintenanceplanmstServiceImpl.java
View File

@@ -19,7 +19,7 @@ import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.WqlUtil;
import org.nl.wms.device_manage.upkeep.service.DevicemaintenanceplanmstService;
import org.nl.wms.device_manage.upkeep.service.dto.DevicemaintenanceplanmstDto;
import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService;
import org.nl.wms.masterdata_manage.bfmaster.service.ClassstandardService;
import org.nl.wms.system_manage.service.dept.ISysDeptService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Pageable;

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/common/enums/MaterialEnum.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/common/enums/MaterialEnum.java
View File

@@ -1,4 +1,4 @@
package org.nl.wms.masterdata_manage.备份master.common.enums;
package org.nl.wms.masterdata_manage.bfmaster.common.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/constant/MaterOptTypeEnum.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/constant/MaterOptTypeEnum.java
View File

@@ -1,4 +1,4 @@
package org.nl.wms.masterdata_manage.备份master.constant;
package org.nl.wms.masterdata_manage.bfmaster.constant;
import com.alibaba.fastjson.JSONObject;

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/eum/BusinessCodeEnum.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/eum/BusinessCodeEnum.java
View File

@@ -1,4 +1,4 @@
package org.nl.wms.masterdata_manage.备份master.eum;
package org.nl.wms.masterdata_manage.bfmaster.eum;
public enum BusinessCodeEnum {
STOCK_IN(1,"10","入库"),

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/eum/RecordStatusEnum.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/eum/RecordStatusEnum.java
View File

@@ -1,4 +1,4 @@
package org.nl.wms.masterdata_manage.备份master.eum;
package org.nl.wms.masterdata_manage.bfmaster.eum;
public enum RecordStatusEnum {
CREATE(1,"01","生成"),

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/manage/AbstructMaterialType.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/manage/AbstructMaterialType.java
View File

@@ -1,4 +1,4 @@
package org.nl.wms.masterdata_manage.备份master.manage;
package org.nl.wms.masterdata_manage.bfmaster.manage;
import java.util.HashSet;
import java.util.Set;

8
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/rest/MaterialbaseController.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/rest/MaterialbaseController.java
View File

@@ -1,5 +1,5 @@
package org.nl.wms.masterdata_manage.备份master.rest;
package org.nl.wms.masterdata_manage.bfmaster.rest;
import cn.hutool.core.map.MapUtil;
@@ -11,9 +11,9 @@ import org.nl.common.anno.Log;
import lombok.extern.slf4j.Slf4j;
import org.nl.common.domain.query.PageQuery;
import org.nl.common.utils.RedissonUtils;
import org.nl.wms.masterdata_manage.备份master.constant.MaterOptTypeEnum;
import org.nl.wms.masterdata_manage.备份master.service.MaterialbaseService;
import org.nl.wms.masterdata_manage.备份master.service.dto.MaterialbaseDto;
import org.nl.wms.masterdata_manage.bfmaster.constant.MaterOptTypeEnum;
import org.nl.wms.masterdata_manage.bfmaster.service.MaterialbaseService;
import org.nl.wms.masterdata_manage.bfmaster.service.dto.MaterialbaseDto;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;

6
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/rest/SemirealrawmaterialController.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/rest/SemirealrawmaterialController.java
View File

@@ -1,5 +1,5 @@
package org.nl.wms.masterdata_manage.备份master.rest;
package org.nl.wms.masterdata_manage.bfmaster.rest;
import com.alibaba.fastjson.JSONObject;
@@ -9,8 +9,8 @@ import io.swagger.annotations.ApiOperation;
import org.nl.common.anno.Log;
import lombok.extern.slf4j.Slf4j;
import org.nl.common.utils.RedissonUtils;
import org.nl.wms.masterdata_manage.备份master.service.SemirealrawmaterialService;
import org.nl.wms.masterdata_manage.备份master.service.dto.SemirealrawmaterialDto;
import org.nl.wms.masterdata_manage.bfmaster.service.SemirealrawmaterialService;
import org.nl.wms.masterdata_manage.bfmaster.service.dto.SemirealrawmaterialDto;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;

6
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/rest/SupplierbaseController.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/rest/SupplierbaseController.java
View File

@@ -1,5 +1,5 @@
package org.nl.wms.masterdata_manage.备份master.rest;
package org.nl.wms.masterdata_manage.bfmaster.rest;
import io.swagger.annotations.Api;
@@ -7,8 +7,8 @@ import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.nl.common.anno.Log;
import lombok.extern.slf4j.Slf4j;
import org.nl.wms.masterdata_manage.备份master.service.SupplierbaseService;
import org.nl.wms.masterdata_manage.备份master.service.dto.SupplierbaseDto;
import org.nl.wms.masterdata_manage.bfmaster.service.SupplierbaseService;
import org.nl.wms.masterdata_manage.bfmaster.service.dto.SupplierbaseDto;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;

16
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/ClassstandardService.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/service/ClassstandardService.java
View File

@@ -1,9 +1,9 @@
package org.nl.wms.masterdata_manage.备份master.service;
package org.nl.wms.masterdata_manage.bfmaster.service;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import org.nl.wms.masterdata_manage.备份master.service.dto.ClassstandardDto;
import org.nl.wms.masterdata_manage.master.service.classstandard.dao.MdPbClassstandard;
import org.springframework.data.domain.Pageable;
import java.util.List;
@@ -30,9 +30,9 @@ public interface ClassstandardService {
* 查询所有数据不分页
*
* @param whereJson 条件参数
* @return List<ClassstandardDto>
* @return List<MdPbClassstandard>
*/
List<ClassstandardDto> queryAll(Map whereJson);
List<MdPbClassstandard> queryAll(Map whereJson);
/**
* 根据ID查询
@@ -40,7 +40,7 @@ public interface ClassstandardService {
* @param class_id ID
* @return Classstandard
*/
ClassstandardDto findById(String class_id);
MdPbClassstandard findById(String class_id);
/**
* 根据编码查询
@@ -48,7 +48,7 @@ public interface ClassstandardService {
* @param code code
* @return Classstandard
*/
ClassstandardDto findByCode(String code);
MdPbClassstandard findByCode(String code);
/**
@@ -56,14 +56,14 @@ public interface ClassstandardService {
*
* @param dto /
*/
void create(ClassstandardDto dto);
void create(MdPbClassstandard dto);
/**
* 编辑
*
* @param dto /
*/
void update(ClassstandardDto dto);
void update(MdPbClassstandard dto);
/**
* 多选删除

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/MaterialbaseService.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/service/MaterialbaseService.java
View File

@@ -1,10 +1,10 @@
package org.nl.wms.masterdata_manage.备份master.service;
package org.nl.wms.masterdata_manage.bfmaster.service;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import org.nl.common.domain.query.PageQuery;
import org.nl.wms.masterdata_manage.备份master.service.dto.MaterialbaseDto;
import org.nl.wms.masterdata_manage.bfmaster.service.dto.MaterialbaseDto;
import org.springframework.data.domain.Pageable;
import org.springframework.web.multipart.MultipartFile;

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/SemirealrawmaterialService.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/service/SemirealrawmaterialService.java
View File

@@ -1,8 +1,8 @@
package org.nl.wms.masterdata_manage.备份master.service;
package org.nl.wms.masterdata_manage.bfmaster.service;
import com.alibaba.fastjson.JSONObject;
import org.nl.wms.masterdata_manage.备份master.service.dto.SemirealrawmaterialDto;
import org.nl.wms.masterdata_manage.bfmaster.service.dto.SemirealrawmaterialDto;
import org.springframework.data.domain.Pageable;
import org.springframework.web.multipart.MultipartFile;

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/SupplierbaseService.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/service/SupplierbaseService.java
View File

@@ -1,7 +1,7 @@
package org.nl.wms.masterdata_manage.备份master.service;
package org.nl.wms.masterdata_manage.bfmaster.service;
import org.nl.wms.masterdata_manage.备份master.service.dto.SupplierbaseDto;
import org.nl.wms.masterdata_manage.bfmaster.service.dto.SupplierbaseDto;
import org.springframework.data.domain.Pageable;
import java.util.List;

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/UnitService.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/service/UnitService.java
View File

@@ -1,8 +1,8 @@
package org.nl.wms.masterdata_manage.备份master.service;
package org.nl.wms.masterdata_manage.bfmaster.service;
import com.alibaba.fastjson.JSONObject;
import org.nl.wms.masterdata_manage.备份master.service.dto.UnitDto;
import org.nl.wms.masterdata_manage.bfmaster.service.dto.UnitDto;
import org.springframework.data.domain.Pageable;
import java.util.List;

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/dto/BusinesstypematerialDto.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/service/dto/BusinesstypematerialDto.java
View File

@@ -1,4 +1,4 @@
package org.nl.wms.masterdata_manage.备份master.service.dto;
package org.nl.wms.masterdata_manage.bfmaster.service.dto;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/dto/CustomerbaseDto.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/service/dto/CustomerbaseDto.java
View File

@@ -1,4 +1,4 @@
package org.nl.wms.masterdata_manage.备份master.service.dto;
package org.nl.wms.masterdata_manage.bfmaster.service.dto;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/dto/EndrealsemimaterialDto.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/service/dto/EndrealsemimaterialDto.java
View File

@@ -1,4 +1,4 @@
package org.nl.wms.masterdata_manage.备份master.service.dto;
package org.nl.wms.masterdata_manage.bfmaster.service.dto;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/dto/MaterialParametersDto.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/service/dto/MaterialParametersDto.java
View File

@@ -1,4 +1,4 @@
package org.nl.wms.masterdata_manage.备份master.service.dto;
package org.nl.wms.masterdata_manage.bfmaster.service.dto;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/dto/MaterialbaseDto.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/service/dto/MaterialbaseDto.java
View File

@@ -1,4 +1,4 @@
package org.nl.wms.masterdata_manage.备份master.service.dto;
package org.nl.wms.masterdata_manage.bfmaster.service.dto;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/dto/SemirealrawmaterialDto.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/service/dto/SemirealrawmaterialDto.java
View File

@@ -1,4 +1,4 @@
package org.nl.wms.masterdata_manage.备份master.service.dto;
package org.nl.wms.masterdata_manage.bfmaster.service.dto;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/dto/StoragevehicleinfoDto.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/service/dto/StoragevehicleinfoDto.java
View File

@@ -1,4 +1,4 @@
package org.nl.wms.masterdata_manage.备份master.service.dto;
package org.nl.wms.masterdata_manage.bfmaster.service.dto;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

3
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/dto/SupplierbaseDto.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/service/dto/SupplierbaseDto.java
View File

@@ -1,4 +1,4 @@
package org.nl.wms.masterdata_manage.备份master.service.dto;
package org.nl.wms.masterdata_manage.bfmaster.service.dto;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -17,7 +17,6 @@ import java.math.BigDecimal;
public class SupplierbaseDto implements Serializable {
/** 供应商标识 */
/** 防止精度丢失 */
@JsonSerialize(using= ToStringSerializer.class)
private Long supp_id;
/** 供应商编码 */

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/dto/UnitDto.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/service/dto/UnitDto.java
View File

@@ -1,4 +1,4 @@
package org.nl.wms.masterdata_manage.备份master.service.dto;
package org.nl.wms.masterdata_manage.bfmaster.service.dto;
import lombok.Data;

63
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/impl/ClassstandardServiceImpl.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/service/impl/ClassstandardServiceImpl.java
View File

@@ -1,9 +1,8 @@
package org.nl.wms.masterdata_manage.备份master.service.impl;
package org.nl.wms.masterdata_manage.bfmaster.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 cn.hutool.db.Db;
@@ -13,6 +12,7 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.common.utils.IdUtil;
import org.nl.modules.common.exception.BadRequestException;
import org.nl.common.utils.SecurityUtils;
import org.nl.modules.wql.WQL;
@@ -20,8 +20,8 @@ import org.nl.modules.wql.core.bean.ResultBean;
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.masterdata_manage.备份master.service.ClassstandardService;
import org.nl.wms.masterdata_manage.备份master.service.dto.ClassstandardDto;
import org.nl.wms.masterdata_manage.bfmaster.service.ClassstandardService;
import org.nl.wms.masterdata_manage.master.service.classstandard.dao.MdPbClassstandard;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -71,53 +71,52 @@ public class ClassstandardServiceImpl implements ClassstandardService {
}
@Override
public List<ClassstandardDto> queryAll(Map whereJson) {
public List<MdPbClassstandard> queryAll(Map whereJson) { //MdPbClassstandard
WQLObject wo = WQLObject.getWQLObject("MD_PB_ClassStandard");
JSONArray arr = wo.query().getResultJSONArray(0);
List<ClassstandardDto> list = arr.toJavaList(ClassstandardDto.class);
List<MdPbClassstandard> list = arr.toJavaList(MdPbClassstandard.class);
return list;
}
@Override
public ClassstandardDto findById(String class_id) {
public MdPbClassstandard findById(String class_id) {
WQLObject wo = WQLObject.getWQLObject("MD_PB_ClassStandard");
JSONObject json = wo.query("class_id = '" + class_id + "'").uniqueResult(0);
final ClassstandardDto obj = json.toJavaObject(ClassstandardDto.class);
MdPbClassstandard obj = json.toJavaObject(MdPbClassstandard.class);
return obj;
}
@Override
public ClassstandardDto findByCode(String code) {
public MdPbClassstandard findByCode(String code) {
WQLObject wo = WQLObject.getWQLObject("MD_PB_ClassStandard");
JSONObject json = wo.query("class_code ='" + code + "'").uniqueResult(0);
if (ObjectUtil.isEmpty(json)) return null;
final ClassstandardDto obj = json.toJavaObject(ClassstandardDto.class);
final MdPbClassstandard obj = json.toJavaObject(MdPbClassstandard.class);
return obj;
}
@Override
@Transactional(rollbackFor = Exception.class)
public void create(ClassstandardDto dto) {
public void create(MdPbClassstandard dto) {
String class_code = dto.getClass_code();
ClassstandardDto classstandardDto = this.findByCode(class_code);
if (classstandardDto != null && classstandardDto.getIs_delete().equals("0") ) {
MdPbClassstandard MdPbClassstandard = this.findByCode(class_code);
if (MdPbClassstandard != null && MdPbClassstandard.getIs_delete().equals("0") ) {
throw new BadRequestException("存在相同的基础类别编号");
}
String currentUserId = SecurityUtils.getCurrentUserId();
String nickName = SecurityUtils.getCurrentNickName();
String now = DateUtil.now();
dto.setClass_id(IdUtil.getSnowflake(1, 1).nextId());
dto.setClass_id(IdUtil.getStringId());
dto.setCreate_id(currentUserId);
dto.setCreate_name(nickName);
dto.setUpdate_id(currentUserId);
dto.setUpdate_name(nickName);
dto.setUpdate_time(now);
dto.setCreate_time(now);
dto.setIs_leaf("1");
dto.setIs_leaf(true);
dto.setClass_level(Math.ceil(dto.getClass_code().length() / 2.0) + "");
dto.setSub_count(new BigDecimal(0));
dto.setPath_code(dto.getClass_code());
dto.setSub_count(0);
dto.setLong_class_code(dto.getClass_code());
WQLObject wo = WQLObject.getWQLObject("MD_PB_ClassStandard");
@@ -132,20 +131,20 @@ public class ClassstandardServiceImpl implements ClassstandardService {
@Override
@Transactional(rollbackFor = Exception.class)
public void update(ClassstandardDto dto) {
ClassstandardDto entity = this.findById(dto.getClass_id() + "");
public void update(MdPbClassstandard dto) {
MdPbClassstandard entity = this.findById(dto.getClass_id() + "");
if (entity == null) {
throw new BadRequestException("被删除或无权限，操作失败!");
}
String class_code = dto.getClass_code();
ClassstandardDto classstandardDto = this.findByCode(class_code);
if (classstandardDto != null && !dto.getClass_id().equals(classstandardDto.getClass_id()) && classstandardDto.getIs_delete().equals("0") ) {
MdPbClassstandard MdPbClassstandard = this.findByCode(class_code);
if (MdPbClassstandard != null && !dto.getClass_id().equals(MdPbClassstandard.getClass_id()) && MdPbClassstandard.getIs_delete().equals("0") ) {
throw new BadRequestException("存在相同的供应商编号");
}
Long oldPid = findById(dto.getClass_id() + "").getParent_class_id();
Long newPid = dto.getParent_class_id();
String oldPid = findById(dto.getClass_id() + "").getParent_class_id();
String newPid = dto.getParent_class_id();
if (dto.getParent_class_id() != null && dto.getClass_id().equals(dto.getParent_class_id())) {
throw new BadRequestException("上级不能为自己");
@@ -179,7 +178,7 @@ public class ClassstandardServiceImpl implements ClassstandardService {
for (Long class_id : ids) {
JSONObject param = new JSONObject();
param.put("class_id", String.valueOf(class_id));
ClassstandardDto classstandardDto = findById(class_id + "");
MdPbClassstandard MdPbClassstandard = findById(class_id + "");
param.put("is_delete", "1");
param.put("update_optid", currentUserId);
param.put("update_optname", nickName);
@@ -197,7 +196,7 @@ public class ClassstandardServiceImpl implements ClassstandardService {
}
this.deleteAll(child_ids);
}
updateSubCnt(classstandardDto.getParent_class_id());
updateSubCnt(MdPbClassstandard.getParent_class_id());
}
}
@@ -341,19 +340,19 @@ public class ClassstandardServiceImpl implements ClassstandardService {
JSONObject jo = new JSONObject();
JSONArray ja = new JSONArray();
String where = "";
ClassstandardDto classstandardDto = null;
MdPbClassstandard MdPbClassstandard = null;
if (!StrUtil.isEmpty(parent_class_code)) {
classstandardDto = this.findByCode(parent_class_code);
if (classstandardDto == null) {
MdPbClassstandard = this.findByCode(parent_class_code);
if (MdPbClassstandard == null) {
throw new BadRequestException("请输入正确的父节点编号!");
}
}
if (!StrUtil.isEmpty(class_code)) {
where = " AND class_code IN ('" + class_code + "')";
}
//parent_class_code不为空，查出 id等于classstandardDto.getClass_id()
//parent_class_code不为空，查出 id等于MdPbClassstandard.getClass_id()
if (StrUtil.isNotEmpty(parent_class_code)) {
ja = WQLObject.getWQLObject("MD_PB_ClassStandard").query("class_id = '" + classstandardDto.getClass_id() + "' order by class_id").getResultJSONArray(0);
ja = WQLObject.getWQLObject("MD_PB_ClassStandard").query("class_id = '" + MdPbClassstandard.getClass_id() + "' order by class_id").getResultJSONArray(0);
} else if (StrUtil.isNotEmpty(where)) {
ja = WQLObject.getWQLObject("MD_PB_ClassStandard").query("1=1 " + where + " order by class_id").getResultJSONArray(0);
} else if (StrUtil.isEmpty(parent_class_code) || parent_class_code.equals("0")) {
@@ -543,8 +542,8 @@ public class ClassstandardServiceImpl implements ClassstandardService {
}
public void updateSubCnt(Long Id) {
if (Id != null && Id != 0) {
public void updateSubCnt(String Id) {
if (Id != null && !Id.equals("0")) {
WQLObject wo = WQLObject.getWQLObject("MD_PB_ClassStandard");
int count = wo.query("parent_class_id = '" + Id + "' AND is_delete = '0'").getResultJSONArray(0).size();
JSONObject pid = wo.query("class_id = '" + Id + "'").uniqueResult(0);

10
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/impl/MaterialbaseServiceImpl.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/service/impl/MaterialbaseServiceImpl.java
View File

@@ -1,4 +1,4 @@
package org.nl.wms.masterdata_manage.备份master.service.impl;
package org.nl.wms.masterdata_manage.bfmaster.service.impl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.map.MapUtil;
@@ -27,10 +27,10 @@ import org.nl.wms.masterdata_manage.service.master.IMdPbMeasureunitService;
import org.nl.wms.masterdata_manage.service.master.dao.MdPbMeasureunit;
import org.nl.wms.masterdata_manage.service.material.IMdMeMaterialbaseService;
import org.nl.wms.masterdata_manage.service.material.dao.MdMeMaterialbase;
import org.nl.wms.masterdata_manage.备份master.constant.MaterOptTypeEnum;
import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService;
import org.nl.wms.masterdata_manage.备份master.service.MaterialbaseService;
import org.nl.wms.masterdata_manage.备份master.service.dto.MaterialbaseDto;
import org.nl.wms.masterdata_manage.bfmaster.constant.MaterOptTypeEnum;
import org.nl.wms.masterdata_manage.bfmaster.service.ClassstandardService;
import org.nl.wms.masterdata_manage.bfmaster.service.MaterialbaseService;
import org.nl.wms.masterdata_manage.bfmaster.service.dto.MaterialbaseDto;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;

6
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/impl/SemirealrawmaterialServiceImpl.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/service/impl/SemirealrawmaterialServiceImpl.java
View File

@@ -1,4 +1,4 @@
package org.nl.wms.masterdata_manage.备份master.service.impl;
package org.nl.wms.masterdata_manage.bfmaster.service.impl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.map.MapUtil;
@@ -20,8 +20,8 @@ import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.WqlUtil;
import org.nl.wms.masterdata_manage.service.material.IMdMeMaterialbaseService;
import org.nl.wms.masterdata_manage.service.material.dao.MdMeMaterialbase;
import org.nl.wms.masterdata_manage.备份master.service.SemirealrawmaterialService;
import org.nl.wms.masterdata_manage.备份master.service.dto.SemirealrawmaterialDto;
import org.nl.wms.masterdata_manage.bfmaster.service.SemirealrawmaterialService;
import org.nl.wms.masterdata_manage.bfmaster.service.dto.SemirealrawmaterialDto;
import org.nl.wms.product_manage.service.workprocedure.IPdmBiWorkprocedureService;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/impl/StoragevehicleinfoServiceImpl2.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/service/impl/StoragevehicleinfoServiceImpl2.java
View File

@@ -1,5 +1,5 @@
//
//package org.nl.wms.masterdata_manage.备份master.service.impl;
//package org.nl.wms.masterdata_manage.bfmaster.service.impl;
//
//
//import cn.hutool.core.date.DateUtil;
@@ -21,7 +21,7 @@
//import org.nl.modules.wql.util.WqlUtil;
//import org.nl.wms.masterdata_manage.service.vehicle.IMdPbStoragevehicleinfoService;
//import org.nl.wms.masterdata_manage.service.vehicle.dao.MdPbStoragevehicleinfo;
//import org.nl.wms.masterdata_manage.备份master.service.dto.StoragevehicleinfoDto;
//import org.nl.wms.masterdata_manage.bfmaster.service.dto.StoragevehicleinfoDto;
//
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.data.domain.Pageable;

14
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/impl/SupplierbaseServiceImpl.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/service/impl/SupplierbaseServiceImpl.java
View File

@@ -1,5 +1,5 @@
package org.nl.wms.masterdata_manage.备份master.service.impl;
package org.nl.wms.masterdata_manage.bfmaster.service.impl;
import cn.hutool.core.date.DateUtil;
@@ -16,10 +16,10 @@ import org.nl.modules.common.exception.BadRequestException;
import org.nl.modules.wql.core.bean.ResultBean;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.WqlUtil;
import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService;
import org.nl.wms.masterdata_manage.备份master.service.SupplierbaseService;
import org.nl.wms.masterdata_manage.备份master.service.dto.ClassstandardDto;
import org.nl.wms.masterdata_manage.备份master.service.dto.SupplierbaseDto;
import org.nl.wms.masterdata_manage.bfmaster.service.ClassstandardService;
import org.nl.wms.masterdata_manage.bfmaster.service.SupplierbaseService;
import org.nl.wms.masterdata_manage.master.service.classstandard.dao.MdPbClassstandard;
import org.nl.wms.masterdata_manage.bfmaster.service.dto.SupplierbaseDto;
@@ -94,7 +94,7 @@ public class SupplierbaseServiceImpl implements SupplierbaseService {
String nickName = SecurityUtils.getCurrentNickName();
ClassstandardDto classDto = classstandardService.findById(dto.getClass_id() + "");
MdPbClassstandard classDto = classstandardService.findById(dto.getClass_id() + "");
if (ObjectUtil.isNotEmpty(classDto)) {
dto.setClass_code(classDto.getClass_code());
dto.setClass_name(classDto.getClass_name());
@@ -120,7 +120,7 @@ public class SupplierbaseServiceImpl implements SupplierbaseService {
if (entity == null) {
throw new BadRequestException("被删除或无权限，操作失败!");
}
ClassstandardDto classDto = classstandardService.findById(dto.getClass_id() + "");
MdPbClassstandard classDto = classstandardService.findById(dto.getClass_id() + "");
if (ObjectUtil.isNotEmpty(classDto)) {
dto.setClass_code(classDto.getClass_code());
dto.setClass_name(classDto.getClass_name());

6
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/impl/UnitServiceImpl.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/service/impl/UnitServiceImpl.java
View File

@@ -1,5 +1,5 @@
package org.nl.wms.masterdata_manage.备份master.service.impl;
package org.nl.wms.masterdata_manage.bfmaster.service.impl;
import cn.hutool.core.date.DateUtil;
@@ -16,8 +16,8 @@ import org.nl.modules.common.exception.BadRequestException;
import org.nl.modules.wql.core.bean.ResultBean;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.WqlUtil;
import org.nl.wms.masterdata_manage.备份master.service.UnitService;
import org.nl.wms.masterdata_manage.备份master.service.dto.UnitDto;
import org.nl.wms.masterdata_manage.bfmaster.service.UnitService;
import org.nl.wms.masterdata_manage.bfmaster.service.dto.UnitDto;

0
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/wql/QMD_ME_ENDREALRAWMATERIAL001.wql → mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/wql/QMD_ME_ENDREALRAWMATERIAL001.wql
View File

0
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/wql/QMD_ME_MATERIAL.wql → mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/wql/QMD_ME_MATERIAL.wql
View File

0
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/wql/QMD_ME_SEMIREALRAWMATERIAL001.wql → mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/wql/QMD_ME_SEMIREALRAWMATERIAL001.wql
View File

0
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/wql/QMD_ME_material_param01.wql → mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/wql/QMD_ME_material_param01.wql
View File

0
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/wql/QMD_PB_BUSINESSTYPEMATERIAL.wql → mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/wql/QMD_PB_BUSINESSTYPEMATERIAL.wql
View File

0
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/wql/QMD_PB_CLASSBASE.wql → mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/wql/QMD_PB_CLASSBASE.wql
View File

0
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/wql/QMD_PB_STORAGEVEHICLEEXT.wql → mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/wql/QMD_PB_STORAGEVEHICLEEXT.wql
View File

0
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/wql/QMD_PB_STORAGEVEHICLEINFO.wql → mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/wql/QMD_PB_STORAGEVEHICLEINFO.wql
View File

0
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/wql/QMD_PB_STORAGEVEHICLEPOINT.wql → mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/wql/QMD_PB_STORAGEVEHICLEPOINT.wql
View File

0
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/wql/QMD_STORAGEVEHICLECLEANING.wql → mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/wql/QMD_STORAGEVEHICLECLEANING.wql
View File

0
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/wql/QMT_MATERIALPARAMETERS_001.wql → mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/wql/QMT_MATERIALPARAMETERS_001.wql
View File

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/IvtChangeTypeEnum.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfst/IvtChangeTypeEnum.java
View File

@@ -1,4 +1,4 @@
package org.nl.wms.masterdata_manage.备份st;
package org.nl.wms.masterdata_manage.bfst;
/**
* // 11-扣减可用; 12-增加可用;

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/StoreIvtServiceImpl.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfst/StoreIvtServiceImpl.java
View File

@@ -1,4 +1,4 @@
package org.nl.wms.masterdata_manage.备份st;
package org.nl.wms.masterdata_manage.bfst;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil;

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/MaterialsafeivtService.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfst/service/MaterialsafeivtService.java
View File

@@ -1,7 +1,7 @@
package org.nl.wms.masterdata_manage.备份st.service;
package org.nl.wms.masterdata_manage.bfst.service;
import org.nl.wms.masterdata_manage.备份st.service.dto.MaterialsafeivtDto;
import org.nl.wms.masterdata_manage.bfst.service.dto.MaterialsafeivtDto;
import org.springframework.data.domain.Pageable;
import java.util.List;

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/StructrelamaterialService.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfst/service/StructrelamaterialService.java
View File

@@ -1,7 +1,7 @@
package org.nl.wms.masterdata_manage.备份st.service;
package org.nl.wms.masterdata_manage.bfst.service;
import org.nl.wms.masterdata_manage.备份st.service.dto.StructrelamaterialDto;
import org.nl.wms.masterdata_manage.bfst.service.dto.StructrelamaterialDto;
import org.springframework.data.domain.Pageable;
import java.util.List;

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/StructrelavehicletypeService.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfst/service/StructrelavehicletypeService.java
View File

@@ -1,9 +1,9 @@
package org.nl.wms.masterdata_manage.备份st.service;
package org.nl.wms.masterdata_manage.bfst.service;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import org.nl.wms.masterdata_manage.备份st.service.dto.StructrelavehicletypeDto;
import org.nl.wms.masterdata_manage.bfst.service.dto.StructrelavehicletypeDto;
import org.springframework.data.domain.Pageable;
import java.util.List;

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/dto/MaterialsafeivtDto.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfst/service/dto/MaterialsafeivtDto.java
View File

@@ -1,4 +1,4 @@
package org.nl.wms.masterdata_manage.备份st.service.dto;
package org.nl.wms.masterdata_manage.bfst.service.dto;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/dto/SectattrDto.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfst/service/dto/SectattrDto.java
View File

@@ -1,4 +1,4 @@
package org.nl.wms.masterdata_manage.备份st.service.dto;
package org.nl.wms.masterdata_manage.bfst.service.dto;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/dto/StorattrDto.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfst/service/dto/StorattrDto.java
View File

@@ -1,4 +1,4 @@
package org.nl.wms.masterdata_manage.备份st.service.dto;
package org.nl.wms.masterdata_manage.bfst.service.dto;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/dto/StructattrDto.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfst/service/dto/StructattrDto.java
View File

@@ -1,4 +1,4 @@
package org.nl.wms.masterdata_manage.备份st.service.dto;
package org.nl.wms.masterdata_manage.bfst.service.dto;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/dto/StructivtDto.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfst/service/dto/StructivtDto.java
View File

@@ -1,4 +1,4 @@
package org.nl.wms.masterdata_manage.备份st.service.dto;
package org.nl.wms.masterdata_manage.bfst.service.dto;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/dto/StructrelamaterialDto.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfst/service/dto/StructrelamaterialDto.java
View File

@@ -1,4 +1,4 @@
package org.nl.wms.masterdata_manage.备份st.service.dto;
package org.nl.wms.masterdata_manage.bfst.service.dto;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/dto/StructrelavehicletypeDto.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfst/service/dto/StructrelavehicletypeDto.java
View File

@@ -1,4 +1,4 @@
package org.nl.wms.masterdata_manage.备份st.service.dto;
package org.nl.wms.masterdata_manage.bfst.service.dto;
import lombok.Data;

8
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/impl/MaterialsafeivtServiceImpl.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfst/service/impl/MaterialsafeivtServiceImpl.java
View File

@@ -1,5 +1,5 @@
package org.nl.wms.masterdata_manage.备份st.service.impl;
package org.nl.wms.masterdata_manage.bfst.service.impl;
import cn.hutool.core.date.DateUtil;
@@ -16,9 +16,9 @@ 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.masterdata_manage.备份master.service.ClassstandardService;
import org.nl.wms.masterdata_manage.备份st.service.MaterialsafeivtService;
import org.nl.wms.masterdata_manage.备份st.service.dto.MaterialsafeivtDto;
import org.nl.wms.masterdata_manage.bfmaster.service.ClassstandardService;
import org.nl.wms.masterdata_manage.bfst.service.MaterialsafeivtService;
import org.nl.wms.masterdata_manage.bfst.service.dto.MaterialsafeivtDto;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;

8
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/impl/StructrelamaterialServiceImpl.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfst/service/impl/StructrelamaterialServiceImpl.java
View File

@@ -1,5 +1,5 @@
package org.nl.wms.masterdata_manage.备份st.service.impl;
package org.nl.wms.masterdata_manage.bfst.service.impl;
import cn.hutool.core.date.DateUtil;
@@ -16,9 +16,9 @@ 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.masterdata_manage.备份master.service.ClassstandardService;
import org.nl.wms.masterdata_manage.备份st.service.StructrelamaterialService;
import org.nl.wms.masterdata_manage.备份st.service.dto.StructrelamaterialDto;
import org.nl.wms.masterdata_manage.bfmaster.service.ClassstandardService;
import org.nl.wms.masterdata_manage.bfst.service.StructrelamaterialService;
import org.nl.wms.masterdata_manage.bfst.service.dto.StructrelamaterialDto;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;

6
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/impl/StructrelavehicletypeServiceImpl.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfst/service/impl/StructrelavehicletypeServiceImpl.java
View File

@@ -1,5 +1,5 @@
package org.nl.wms.masterdata_manage.备份st.service.impl;
package org.nl.wms.masterdata_manage.bfst.service.impl;
import cn.hutool.core.date.DateUtil;
@@ -15,8 +15,8 @@ import lombok.extern.slf4j.Slf4j;
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.masterdata_manage.备份st.service.StructrelavehicletypeService;
import org.nl.wms.masterdata_manage.备份st.service.dto.StructrelavehicletypeDto;
import org.nl.wms.masterdata_manage.bfst.service.StructrelavehicletypeService;
import org.nl.wms.masterdata_manage.bfst.service.dto.StructrelavehicletypeDto;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;

0
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/wql/QLK01.wql → mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfst/wql/QLK01.wql
View File

0
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/wql/QST_IVT_MATERIALSAFE.wql → mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfst/wql/QST_IVT_MATERIALSAFE.wql
View File

0
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/wql/QST_IVT_MATERIALSET.wql → mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfst/wql/QST_IVT_MATERIALSET.wql
View File

0
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/wql/ST_Structrelavehicletype_01.wql → mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfst/wql/ST_Structrelavehicletype_01.wql
View File

0
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/wql/stivt.xls → mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfst/wql/stivt.xls
View File

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/service/impl/DeviceLubricateitemsServiceImpl.java
View File

@@ -18,7 +18,7 @@ import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.WqlUtil;
import org.nl.wms.masterdata_manage.em.service.DeviceLubricateitemsService;
import org.nl.wms.masterdata_manage.em.service.dto.DevicemaintenanceitemsDto;
import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService;
import org.nl.wms.masterdata_manage.bfmaster.service.ClassstandardService;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/service/impl/DeviceSportCheckitemsServiceImpl.java
View File

@@ -18,7 +18,7 @@ import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.WqlUtil;
import org.nl.wms.masterdata_manage.em.service.DeviceSportCheckitemsService;
import org.nl.wms.masterdata_manage.em.service.dto.DevicemaintenanceitemsDto;
import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService;
import org.nl.wms.masterdata_manage.bfmaster.service.ClassstandardService;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/service/impl/DevicefaultclassServiceImpl.java
View File

@@ -18,7 +18,7 @@ import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.WqlUtil;
import org.nl.wms.masterdata_manage.em.service.DevicefaultclassService;
import org.nl.wms.masterdata_manage.em.service.dto.DevicefaultclassDto;
import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService;
import org.nl.wms.masterdata_manage.bfmaster.service.ClassstandardService;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/service/impl/DevicemaintenanceitemsServiceImpl.java
View File

@@ -18,7 +18,7 @@ import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.WqlUtil;
import org.nl.wms.masterdata_manage.em.service.DevicemaintenanceitemsService;
import org.nl.wms.masterdata_manage.em.service.dto.DevicemaintenanceitemsDto;
import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService;
import org.nl.wms.masterdata_manage.bfmaster.service.ClassstandardService;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/service/impl/DevicerepairitemsServiceImpl.java
View File

@@ -18,7 +18,7 @@ import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.WqlUtil;
import org.nl.wms.masterdata_manage.em.service.DevicerepairitemsService;
import org.nl.wms.masterdata_manage.em.service.dto.DevicerepairitemsDto;
import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService;
import org.nl.wms.masterdata_manage.bfmaster.service.ClassstandardService;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/service/impl/EquipmentfileServiceImpl.java
View File

@@ -17,7 +17,7 @@ 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.masterdata_manage.em.service.EquipmentfileService;
import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService;
import org.nl.wms.masterdata_manage.bfmaster.service.ClassstandardService;
import org.nl.wms.system_manage.service.dept.ISysDeptService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Pageable;

22
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/controller/classstandard/ClassstandardController.java
View File

@@ -15,8 +15,8 @@ import org.nl.common.anno.Log;
import org.nl.common.utils.RedissonUtils;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.wms.masterdata_manage.master.service.classstandard.IMdPbClassstandardService;
import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService;
import org.nl.wms.masterdata_manage.备份master.service.dto.ClassstandardDto;
import org.nl.wms.masterdata_manage.bfmaster.service.ClassstandardService;
import org.nl.wms.masterdata_manage.master.service.classstandard.dao.MdPbClassstandard;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
@@ -44,13 +44,13 @@ public class ClassstandardController {
private final ClassstandardService ClassstandardService;
@Autowired
private IMdPbClassstandardService mdPbClassstandardService;
private IMdPbClassstandardService MdPbClassstandardService;
@GetMapping
@Log("查询基础类别")
//("查询基础类别")
public ResponseEntity<Object> queryList(@RequestParam Map whereJson) {
return new ResponseEntity<>(TableDataInfo.build(mdPbClassstandardService.dropdownList(whereJson)), HttpStatus.OK);
return new ResponseEntity<>(TableDataInfo.build(MdPbClassstandardService.dropdownList(whereJson)), HttpStatus.OK);
}
@PostMapping
@@ -58,7 +58,7 @@ public class ClassstandardController {
//("新增基础类别")
//@PreAuthorize("@el.check('Classstandard:add')")
public ResponseEntity<Object> create(@Validated @RequestBody JSONObject form) {
mdPbClassstandardService.create(form);
MdPbClassstandardService.create(form);
return new ResponseEntity<>(HttpStatus.CREATED);
}
@@ -67,7 +67,7 @@ public class ClassstandardController {
//("修改基础类别")
//@PreAuthorize("@el.check('Classstandard:edit')")
public ResponseEntity<Object> update(@Validated @RequestBody JSONObject form) {
mdPbClassstandardService.updateForm(form);
MdPbClassstandardService.updateForm(form);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@@ -76,7 +76,7 @@ public class ClassstandardController {
//@PreAuthorize("@el.check('Classstandard:del')")
@DeleteMapping
public ResponseEntity<Object> delete(@RequestBody String[] ids) {
mdPbClassstandardService.deleteAll(ids);
MdPbClassstandardService.deleteAll(ids);
return new ResponseEntity<>(HttpStatus.OK);
}
@@ -85,7 +85,7 @@ public class ClassstandardController {
//("查询基础类型")
//@PreAuthorize("@el.check('materialtype:list')")
public ResponseEntity<Object> query(@RequestParam Map whereJson) {
return new ResponseEntity<>(TableDataInfo.build(mdPbClassstandardService.loadClass(whereJson)), HttpStatus.OK);
return new ResponseEntity<>(TableDataInfo.build(MdPbClassstandardService.loadClass(whereJson)), HttpStatus.OK);
}
@GetMapping("/getClass")
@@ -93,7 +93,7 @@ public class ClassstandardController {
//("查询基础类型")
//@PreAuthorize("@el.check('materialtype:list')")
public ResponseEntity<Object> queryClassBycode(@RequestParam Map whereJson) {
return new ResponseEntity<>(TableDataInfo.build(mdPbClassstandardService.queryClassBycode(whereJson)), HttpStatus.OK);
return new ResponseEntity<>(TableDataInfo.build(MdPbClassstandardService.queryClassBycode(whereJson)), HttpStatus.OK);
}
@@ -102,7 +102,7 @@ public class ClassstandardController {
//("查询分类基础列表")
//@PreAuthorize("@el.check('materialtype:list')")
public ResponseEntity<Object> queryClassById(@RequestParam Map whereJson) {
return new ResponseEntity<>(TableDataInfo.build(mdPbClassstandardService.queryClassById(whereJson)), HttpStatus.OK);
return new ResponseEntity<>(TableDataInfo.build(MdPbClassstandardService.queryClassById(whereJson)), HttpStatus.OK);
}
@GetMapping("/getClassTable")
@@ -144,7 +144,7 @@ public class ClassstandardController {
@ApiOperation("excel导入")
public ResponseEntity<Object> excelImport(@RequestParam("file") MultipartFile file, HttpServletRequest request, HttpServletResponse response) {
RedissonUtils.lock(() -> {
mdPbClassstandardService.excelImport(file, request, response);
MdPbClassstandardService.excelImport(file, request, response);
}, "基础分类导入", null);
return new ResponseEntity<>(HttpStatus.OK);
}

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/classstandard/impl/MdPbClassstandardServiceImpl.java
View File

@@ -172,7 +172,7 @@ public class MdPbClassstandardServiceImpl extends ServiceImpl<MdPbClassstandardM
}
public void updateSubCnt(String class_id) {
if (!StringUtils.isEmpty(class_id)) {
if (!StringUtils.isEmpty(class_id) && !class_id.equals("0")) {
MdPbClassstandard one = this.getOne(new QueryWrapper<MdPbClassstandard>().eq("class_id", class_id).eq("is_delete", false));
if (one == null) {
throw new BadRequestException(class_id + "没有对应分类数据");

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/customer/impl/MdCsCustomerbaseServiceImpl.java
View File

@@ -19,8 +19,8 @@ import org.nl.wms.masterdata_manage.master.service.customer.dao.MdCsCustomerbase
import org.nl.wms.masterdata_manage.master.service.customer.dao.mapper.MdCsCustomerbaseMapper;
import org.nl.wms.masterdata_manage.master.service.customer.IMdCsCustomerbaseService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.nl.wms.masterdata_manage.备份master.service.dto.ClassstandardDto;
import org.nl.wms.masterdata_manage.备份master.service.dto.CustomerbaseDto;
import org.nl.wms.masterdata_manage.master.service.classstandard.dao.MdPbClassstandard;
import org.nl.wms.masterdata_manage.bfmaster.service.dto.CustomerbaseDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/IMdPbStoragevehicleinfoService.java
View File

@@ -7,7 +7,7 @@ import org.nl.common.domain.query.PageQuery;
import org.nl.wms.masterdata_manage.service.vehicle.dao.MdPbStoragevehicleinfo;
import com.baomidou.mybatisplus.extension.service.IService;
import org.nl.wms.masterdata_manage.service.vehicle.dto.VehicleQuery;
import org.nl.wms.masterdata_manage.备份master.service.dto.StoragevehicleinfoDto;
import org.nl.wms.masterdata_manage.bfmaster.service.dto.StoragevehicleinfoDto;
import org.springframework.data.domain.Pageable;
import java.util.List;

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/impl/MdPbStoragevehicleinfoServiceImpl.java
View File

@@ -28,7 +28,7 @@ import org.nl.wms.masterdata_manage.service.vehicle.dao.mapper.MdPbStoragevehicl
import org.nl.wms.masterdata_manage.service.vehicle.IMdPbStoragevehicleinfoService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.nl.wms.masterdata_manage.service.vehicle.dto.VehicleQuery;
import org.nl.wms.masterdata_manage.备份master.service.dto.StoragevehicleinfoDto;
import org.nl.wms.masterdata_manage.bfmaster.service.dto.StoragevehicleinfoDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;

3
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/vehicle/StructrelavehicletypeController.java
View File

@@ -4,11 +4,10 @@ package org.nl.wms.masterdata_manage.storage.controller.vehicle;
import com.alibaba.fastjson.JSONObject;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.common.anno.Log;
import org.nl.wms.masterdata_manage.备份st.service.StructrelavehicletypeService;
import org.nl.wms.masterdata_manage.bfst.service.StructrelavehicletypeService;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;

59
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/dto/ClassstandardDto.java
View File

@@ -1,59 +0,0 @@
package org.nl.wms.masterdata_manage.备份master.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;
/**
* @description /
* @author zhouz
* @date 2021-12-07
**/
@Data
public class ClassstandardDto implements Serializable {
/** 防止精度丢失 */
@JsonSerialize(using= ToStringSerializer.class)
private Long class_id;
private String path_code;
private String class_code;
private String long_class_code;
private String class_name;
private String class_desc;
private Long parent_class_id;
private String is_leaf;
private BigDecimal sub_count;
private String is_modify;
private String is_delete;
private String class_level;
private String ext_id;
private String ext_parent_id;
private String create_id;
private String create_name;
private String create_time;
private String update_id;
private String update_name;
private String update_time;
}

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/other/service/impl/ProduceshiftorderServiceImpl.java
View File

@@ -29,7 +29,7 @@ import org.nl.modules.wql.util.WqlUtil;
import org.nl.wms.system_manage.service.user.ISysUserService;
import org.nl.wms.system_manage.service.user.dao.SysUser;
import org.nl.wms.system_manage.service.user.dto.CurrentUser;
import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService;
import org.nl.wms.masterdata_manage.bfmaster.service.ClassstandardService;
import org.nl.wms.ext_manage.acs.service.WmsToAcsService;
import org.nl.wms.mps_manage.other.service.ProduceshiftorderService;
import org.nl.wms.mps_manage.other.service.WorkOrderImportEnum;

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/impl/TaskServiceImpl.java
View File

@@ -14,7 +14,7 @@ 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.masterdata_manage.备份master.service.ClassstandardService;
import org.nl.wms.masterdata_manage.bfmaster.service.ClassstandardService;
import org.nl.wms.ext_manage.acs.service.AcsToWmsService;
import org.nl.wms.scheduler_manage.service.task.TaskService;
import org.nl.wms.scheduler_manage.service.task.dto.TaskDto;
@@ -68,7 +68,7 @@ public class TaskServiceImpl implements TaskService {
map.put("vehicle_code", "%" + whereJson.getString("vehicle_code") + "%");
}
if (StrUtil.isNotEmpty(whereJson.getString("task_type"))) {
// ClassstandardDto task_type = classstandardService.findById(whereJson.getString("task_type"));
// MdPbClassstandard task_type = classstandardService.findById(whereJson.getString("task_type"));
map.put("task_type", whereJson.getString("task_type"));
}
if (StrUtil.isNotEmpty(whereJson.getString("finishTypeList"))) {

4
mes/hd/nladmin-system/src/main/resources/config/application.yml
View File

@@ -2,7 +2,7 @@ spring:
freemarker:
check-template-location: false
profiles:
active: prod
active: dev3
jackson:
time-zone: GMT+8
data:
@@ -12,7 +12,7 @@ spring:
task:
pool:
# 核心线程池大小
core-pool-size: 10
core-pool-size: 10pcsIfPurchaseorder/confirm
# 最大线程数
max-pool-size: 30
# 活跃时间

113
mes/hd/nladmin-system/src/main/resources/sql/aps_insert_sql_0919.sql
View File

@@ -428,44 +428,44 @@ INSERT INTO `pdm_bi_workprocedure` VALUES ('1694247968535875584', 'A3', 'A3_CPQX
-- 制造订单视图
-- ----------------------------
CREATE
CREATE
OR REPLACE ALGORITHM = UNDEFINED DEFINER = `root` @`localhost` SQL SECURITY DEFINER VIEW `hl_one_lms`.`pcs_sale_order_view` AS SELECT
*
*
FROM
`mps_sale_order`
`mps_sale_order`
WHERE
( `mps_sale_order`.`aps_status` <> 'B' );
( `mps_sale_order`.`aps_status` <> 'B' );
-- ----------------------------
-- 原材料视图
-- ----------------------------
CREATE
OR REPLACE ALGORITHM = UNDEFINED DEFINER = `root` @`localhost` SQL SECURITY DEFINER VIEW
CREATE
OR REPLACE ALGORITHM = UNDEFINED DEFINER = `root` @`localhost` SQL SECURITY DEFINER VIEW
`hl_one_lms`.`pcs_if_purchaseorder_create_view` AS SELECT
*
*
FROM
`pcs_if_demandorder`
WHERE
( `pcs_if_demandorder`.`create_mode` = '03' );
-- ----------------------------
-- 在途库存视图
-- ----------------------------
CREATE
CREATE
OR REPLACE ALGORITHM = UNDEFINED DEFINER = `root` @`localhost` SQL SECURITY DEFINER VIEW `hl_one_lms`.`pcs_if_purchaseorder_view` AS SELECT
*
*
FROM
`pcs_if_purchaseorder`
WHERE
(
`pcs_if_purchaseorder`.`status` = '30');
-- ----------------------------
-- 生产日历视图
-- ----------------------------
CREATE
CREATE
OR REPLACE ALGORITHM = UNDEFINED DEFINER = `root` @`localhost` SQL SECURITY DEFINER VIEW `hl_one_lms`.`pdm_bi_factorycalendardtl_view` AS SELECT
`d`.`factorycalendardtl_id` AS `factorycalendardtl_id`,
`d`.`factorycalendar_id` AS `factorycalendar_id`,
@@ -474,52 +474,52 @@ CREATE
`d`.`work_type` AS `work_type`,
`d`.`work_type_name` AS `work_type_name`,
`d`.`resource` AS `resource`,
`d`.`priority` AS `priority`
`d`.`priority` AS `priority`
FROM
(
`pdm_bi_factorycalendardtl` `d`
LEFT JOIN `pdm_bi_factorycalendar` `f` ON ((
`d`.`factorycalendar_id` = `f`.`factorycalendar_id`
)))
`d`.`factorycalendar_id` = `f`.`factorycalendar_id`
)))
WHERE
((
`d`.`work_type` = '01'
)
`d`.`work_type` = '01'
)
AND ((
`f`.`is_active` = 1
)
`f`.`is_active` = 1
)
OR ( `d`.`factorycalendardtl_id` = '1' )));
-- ----------------------------
-- 原料库存视图
-- ----------------------------
-- ----------------------------
CREATE
CREATE
OR REPLACE ALGORITHM = UNDEFINED DEFINER = `root` @`localhost` SQL SECURITY DEFINER VIEW `hl_one_lms`.`st_ivt_structivt_yl_view` AS SELECT
*
*
FROM
`st_ivt_structivt_yl`;
`st_ivt_structivt_yl`;
-- ----------------------------
-- 半成品库存视图
-- ----------------------------
CREATE
-- ----------------------------
CREATE
OR REPLACE ALGORITHM = UNDEFINED DEFINER = `root` @`localhost` SQL SECURITY DEFINER VIEW `hl_one_lms`.`st_ivt_structivt_bcp_view` AS SELECT
*
*
FROM
`st_ivt_structivt_bcp`;
`st_ivt_structivt_bcp`;
-- ----------------------------
-- 前段排产BOM视图
-- ----------------------------
-- ----------------------------
CREATE
CREATE
OR REPLACE ALGORITHM = UNDEFINED DEFINER = `root` @`localhost` SQL SECURITY DEFINER VIEW `hl_one_lms`.`pdm_bom_view_front` AS
SELECT
`pdm_bom`.`bom_status` AS `bom_status`,
@@ -544,24 +544,24 @@ SELECT
`pdm_bi_bomdtl`.`piece_weight` AS `dtl_piece_weight`,
`pdm_bi_bomdtl`.`material_id` AS `material_id`,
`pdm_bi_bomdtl`.`move_expression` AS `move_expression`,
`pdm_bi_bomdtl`.`batch_expression` AS `batch_expression`
`pdm_bi_bomdtl`.`batch_expression` AS `batch_expression`
FROM
(
`pdm_bi_bom` `pdm_bom`
LEFT JOIN `pdm_bi_bomdtl` `pdm_bi_bomdtl` ON ((
`pdm_bom`.`bom_id` = `pdm_bi_bomdtl`.`bom_id`
`pdm_bom`.`bom_id` = `pdm_bi_bomdtl`.`bom_id`
)))
WHERE `pdm_bi_bomdtl`.is_front =1 AND pdm_bom.create_mode='03';
-- ----------------------------
-- 后段排产BOM视图
-- ----------------------------
-- ----------------------------
CREATE
CREATE
OR REPLACE ALGORITHM = UNDEFINED DEFINER = `root` @`localhost` SQL SECURITY DEFINER VIEW `hl_one_lms`.`pdm_bom_view_behind` AS
SELECT
`pdm_bom`.`bom_status` AS `bom_status`,
@@ -586,23 +586,23 @@ SELECT
`pdm_bi_bomdtl`.`piece_weight` AS `dtl_piece_weight`,
`pdm_bi_bomdtl`.`material_id` AS `material_id`,
`pdm_bi_bomdtl`.`move_expression` AS `move_expression`,
`pdm_bi_bomdtl`.`batch_expression` AS `batch_expression`
`pdm_bi_bomdtl`.`batch_expression` AS `batch_expression`
FROM
(
`pdm_bi_bom` `pdm_bom`
LEFT JOIN `pdm_bi_bomdtl` `pdm_bi_bomdtl` ON ((
`pdm_bom`.`bom_id` = `pdm_bi_bomdtl`.`bom_id`
`pdm_bom`.`bom_id` = `pdm_bi_bomdtl`.`bom_id`
)))
WHERE `pdm_bi_bomdtl`.is_front =0 AND pdm_bom.create_mode='03';
WHERE `pdm_bi_bomdtl`.is_front =0 AND pdm_bom.create_mode='03';
-- ----------------------------
-- 工单视图
-- ----------------------------
CREATE
OR REPLACE ALGORITHM = UNDEFINED DEFINER = `root` @`localhost` SQL SECURITY DEFINER VIEW `hl_one_lms`.`pdm_produce_workorder_view` AS
-- ----------------------------
CREATE
OR REPLACE ALGORITHM = UNDEFINED DEFINER = `root` @`localhost` SQL SECURITY DEFINER VIEW `hl_one_lms`.`pdm_produce_workorder_view` AS
SELECT
`pdm_produce_workorder_aps`.`workorder_id` AS `workorder_id`,
`pdm_produce_workorder_aps`.`workorder_code` AS `workorder_code`,
@@ -652,12 +652,12 @@ SELECT
`pdm_produce_workorder_aps`.`update_id` AS `update_id`,
`pdm_produce_workorder_aps`.`update_name` AS `update_name`,
`pdm_produce_workorder_aps`.`update_time` AS `update_time`,
`pdm_produce_workorder_aps`.`material_code` AS `material_code`
`pdm_produce_workorder_aps`.`material_code` AS `material_code`
FROM
`pdm_produce_workorder_aps`;
DELETE FROM `sys_dict` WHERE code = 'PCS_SALE_STATUS';
DELETE FROM `sys_dict` WHERE code = 'PCS_SALE_STATUS';
INSERT INTO `pdm_bi_device` (`device_code`, `device_name`, `product_area`, `workprocedure_id`, `ext_code`, `material_id`, `workorder_code`, `device_code2`, `inupperlimit_qty`, `inlowerlimit_qty`, `outupperlimit_qty`, `outlowerlimit_qty`, `deviceinitinstor_qty`, `deviceinstor_qty`, `deviceinstor_weight`, `deviceoutstor_qty`, `is_artificial`, `remark`, `cacheLine_code`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`, `is_delete`, `is_used`, `device_icon`, `spec`, `aps_device_code`, `product_series`) VALUES ('A1_XY_80_5', 'A1_旋压下料_80_5', 'A1', '1535144356586165920', NULL, NULL, NULL, NULL, 150, 150, 1200, 150, 150, 0, NULL, 150, 0, NULL, NULL, '1', '管理员', '2023-05-18 17:20:58', NULL, NULL, NULL, 0, 0, NULL, '28', NULL, NULL);
INSERT INTO `sys_dict` (`dict_id`, `code`, `name`, `label`, `value`, `dict_sort`, `dict_type`, `para1`, `para2`, `para3`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`) VALUES ('1701861908820398080', 'WORKORDER_CREATE_TYPE', '工单创建类型', 'APS创建', '3', 3, NULL, NULL, NULL, NULL, '1694303357524643840', '管理员', '2023-09-13 15:34:32', '1694303357524643840', '管理员', '2023-09-13 15:34:32');
INSERT INTO `sys_dict` (`dict_id`, `code`, `name`, `label`, `value`, `dict_sort`, `dict_type`, `para1`, `para2`, `para3`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`) VALUES ('1682657446490935296', 'PURCHASE_STATUS', '原料需求单据状态', '生成', '10', 0, NULL, NULL, NULL, NULL, '1', '管理员', '2023-07-22 15:42:52', '1', '管理员', '2023-07-22 15:43:10');
@@ -668,7 +668,7 @@ INSERT INTO `sys_dict` (`dict_id`, `code`, `name`, `label`, `value`, `dict_sort`
INSERT INTO `sys_dict` (`dict_id`, `code`, `name`, `label`, `value`, `dict_sort`, `dict_type`, `para1`, `para2`, `para3`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`) VALUES ('432', 'PCS_SALE_STATUS', '销售订单状态', '生成', '1', 1, NULL, NULL, NULL, NULL, NULL, NULL, '1900/1/1 0:00', '1', '管理员', '2023-08-21 20:40:34');
INSERT INTO `sys_dict` (`dict_id`, `code`, `name`, `label`, `value`, `dict_sort`, `dict_type`, `para1`, `para2`, `para3`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`) VALUES ('433', 'PCS_SALE_STATUS', '销售订单状态', '前段提交', '2', 2, NULL, NULL, NULL, NULL, NULL, NULL, '1900/1/2 0:00', '1', '管理员', '2023-08-21 20:40:37');
INSERT INTO `sys_dict` (`dict_id`, `code`, `name`, `label`, `value`, `dict_sort`, `dict_type`, `para1`, `para2`, `para3`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`) VALUES ('434', 'PCS_SALE_STATUS', '销售订单状态', '后段提交', '3', 3, NULL, NULL, NULL, NULL, NULL, NULL, '1900/1/3 0:00', '1', '管理员', '2023-08-21 20:40:40');
INSERT INTO `sys_dict` (`dict_id`, `code`, `name`, `label`, `value`, `dict_sort`, `dict_type`, `para1`, `para2`, `para3`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`) VALUES ('435', 'PCS_SALE_STATUS', '销售订单状态', '确认', '5', 5, NULL, NULL, NULL, NULL, NULL, NULL, '1900/1/4 0:00', '1', '管理员', '2023-08-21 20:40:49');
INSERT INTO `sys_dict` (`dict_id`, `code`, `name`, `label`, `value`, `dict_sort`, `dict_type`, `para1`, `para2`, `para3`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`) VALUES ('435', 'PCS_SALE_STATUS', '销售订单状态', '确认', '5', 5, NULL, NULL, NULL, NULL, NULL, NULL, '1900/1/4 0:00', '1', '管理员', '2023-08-21 20:40:49');
-- ----------------------------
-- Table structure for md_me_materialbase
@@ -38654,3 +38654,6 @@ INSERT INTO `pdm_bi_workprocedure` VALUES ('1694247968535875584', 'A3', 'A3_CPQX
SET FOREIGN_KEY_CHECKS = 1;
update md_me_materialbase set material_type_id = '' where material_type_id = '1638127956159238144';
update md_me_materialbase set base_unit_id = '1', assist_unit_id = '1' where material_code like '10100%';