diff --git a/acs/nladmin-system/src/main/resources/config/application-dev.yml b/acs/nladmin-system/src/main/resources/config/application-dev.yml index 79fb23c..7e9974e 100644 --- a/acs/nladmin-system/src/main/resources/config/application-dev.yml +++ b/acs/nladmin-system/src/main/resources/config/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 8010 + port: 8011 #配置数据源 spring: datasource: diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/eum/MaterOptTypeEnum.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/eum/MaterOptTypeEnum.java similarity index 97% rename from lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/eum/MaterOptTypeEnum.java rename to lms/nladmin-system/src/main/java/org/nl/wms/basedata/eum/MaterOptTypeEnum.java index 69d6426..ec31add 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/eum/MaterOptTypeEnum.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/eum/MaterOptTypeEnum.java @@ -1,4 +1,4 @@ -package org.nl.wms.basedata.master.eum; +package org.nl.wms.basedata.eum; import com.alibaba.fastjson.JSONObject; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/manage/AbstructMaterialType.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/manage/AbstructMaterialType.java similarity index 77% rename from lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/manage/AbstructMaterialType.java rename to lms/nladmin-system/src/main/java/org/nl/wms/basedata/manage/AbstructMaterialType.java index 83f07f1..488fda5 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/manage/AbstructMaterialType.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/manage/AbstructMaterialType.java @@ -1,4 +1,4 @@ -package org.nl.wms.basedata.master.manage; +package org.nl.wms.basedata.manage; import java.util.HashSet; import java.util.Set; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/BusinesstypematerialDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/BusinesstypematerialDto.java deleted file mode 100644 index 1d25b2e..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/BusinesstypematerialDto.java +++ /dev/null @@ -1,69 +0,0 @@ -package org.nl.wms.basedata.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; - -/** -* @description / -* @author Liuxy -* @date 2022-01-19 -**/ -@Data -public class BusinesstypematerialDto implements Serializable { - - /** 业务明细标识 */ - /** 防止精度丢失 */ - @JsonSerialize(using= ToStringSerializer.class) - private Long business_id; - - /** 业务类型编码 */ - private String business_type_code; - - /** 业务类型名称 */ - private String business_type_name; - - /** 单据类型编码 */ - private String inv_type_code; - - /** 单据类型名称 */ - private String inv_type_name; - - /** 物料分类标识 */ - private String material_type_id; - - /** 物料分类编码 */ - private String material_type_code; - - /** 说明 */ - private String remark; - - /** 是否启用 */ - private String is_used; - - /** 创建人 */ - private Long create_id; - - /** 创建人姓名 */ - private String create_name; - - /** 创建时间 */ - private String create_time; - - /** 修改人 */ - private Long update_optid; - - /** 修改人姓名 */ - private String update_optname; - - /** 修改时间 */ - private String update_time; - - /** 是否删除 */ - private String is_delete; - - /** 外部标识 */ - private String ext_id; -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/EndrealsemimaterialDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/EndrealsemimaterialDto.java deleted file mode 100644 index 221b611..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/EndrealsemimaterialDto.java +++ /dev/null @@ -1,45 +0,0 @@ -package org.nl.wms.basedata.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; - -/** -* @description / -* @author geng by -* @date 2022-05-31 -**/ -@Data -public class EndrealsemimaterialDto implements Serializable { - - /** 关系标识 */ - /** 防止精度丢失 */ - @JsonSerialize(using= ToStringSerializer.class) - private Long relation_id; - - /** 成品标识 */ - private Long end_material_id; - - /** 半成品标识 */ - private Long semi_material_id; - - /** 创建人 */ - private Long create_id; - - /** 创建人姓名 */ - private String create_name; - - /** 创建时间 */ - private String create_time; - - /** 修改人 */ - private Long update_optid; - - /** 修改人姓名 */ - private String update_optname; - - /** 修改时间 */ - private String update_time; -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/MaterialParametersDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/MaterialParametersDto.java deleted file mode 100644 index 6ebacb2..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/MaterialParametersDto.java +++ /dev/null @@ -1,86 +0,0 @@ -package org.nl.wms.basedata.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 MaterialParametersDto implements Serializable { - - /** 防止精度丢失 */ - @JsonSerialize(using= ToStringSerializer.class) - private Long material_id; - - /** 物料编码 */ - private String material_code; - - /** 物料名称 */ - private String material_name; - - private String material_spec; - - private String material_model; - - private String english_name; - - private Long base_unit_id; - - private String approve_fileno; - - private String print_no; - - /** 物料分类 */ - private Long material_type_id; - - - private Long len_unit_id; - - private BigDecimal length; - - private BigDecimal width; - - private BigDecimal height; - - /** 计量单位 */ - private Long weight_unit_id; - - private BigDecimal gross_weight; - - private BigDecimal net_weight; - - private Long cubage_unit_id; - - private BigDecimal cubage; - - private Long create_id; - - private String create_name; - - private String create_time; - - private Long update_optid; - - private String update_optname; - - private String update_time; - - private String is_used_time; - - /** 是否启用 */ - private String is_used; - - private String is_delete; - - private String ext_id; - - private String material_height_type; -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/SemirealrawmaterialDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/SemirealrawmaterialDto.java deleted file mode 100644 index 316588d..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/SemirealrawmaterialDto.java +++ /dev/null @@ -1,45 +0,0 @@ -package org.nl.wms.basedata.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; - -/** -* @description / -* @author geng by -* @date 2022-05-31 -**/ -@Data -public class SemirealrawmaterialDto implements Serializable { - - /** 关系标识 */ - /** 防止精度丢失 */ - @JsonSerialize(using= ToStringSerializer.class) - private Long relation_id; - - /** 半成品标识 */ - private Long semi_material_id; - - /** 原材料标识 */ - private Long raw_material_id; - - /** 创建人 */ - private Long create_id; - - /** 创建人姓名 */ - private String create_name; - - /** 创建时间 */ - private String create_time; - - /** 修改人 */ - private Long update_optid; - - /** 修改人姓名 */ - private String update_optname; - - /** 修改时间 */ - private String update_time; -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_PB_BUSINESSTYPEMATERIAL.wql b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_PB_BUSINESSTYPEMATERIAL.wql deleted file mode 100644 index e89ac05..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_PB_BUSINESSTYPEMATERIAL.wql +++ /dev/null @@ -1,61 +0,0 @@ -[交易说明] - 交易名： 业务单据类型物料对应分页查询 - 所属模块： - 功能简述： - 版权所有： - 表引用： - 版本经历： - -[数据库] - --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库 - -[IO定义] - ################################################# - ## 表字段对应输入参数 - ################################################# - 输入.flag TYPEAS s_string - 输入.inv_type_code TYPEAS s_string - - -[临时表] - --这边列出来的临时表就会在运行期动态创建 - -[临时变量] - --所有中间过程变量均可在此处定义 - -[业务过程] - - ########################################## - # 1、输入输出检查 # - ########################################## - - - ########################################## - # 2、主过程前处理 # - ########################################## - - - ########################################## - # 3、业务主过程 # - ########################################## - - IF 输入.flag = "1" - PAGEQUERY - SELECT - b.* - FROM - md_pb_businesstypematerial b - WHERE - b.is_delete = '0' - - OPTION 输入.inv_type_code <> "" - (b.inv_type_code like 输入.inv_type_code or - b.inv_type_name like 输入.inv_type_code ) - ENDOPTION - - ENDSELECT - ENDPAGEQUERY - ENDIF - - - diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/ClassstandardController.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/rest/ClassstandardController.java similarity index 96% rename from lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/ClassstandardController.java rename to lms/nladmin-system/src/main/java/org/nl/wms/basedata/rest/ClassstandardController.java index 4d71a0c..1d67e1d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/ClassstandardController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/rest/ClassstandardController.java @@ -1,5 +1,5 @@ -package org.nl.wms.basedata.master.rest; +package org.nl.wms.basedata.rest; import cn.hutool.core.map.MapUtil; @@ -11,8 +11,8 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; import org.nl.modules.wql.core.bean.WQLObject; -import org.nl.wms.basedata.master.service.ClassstandardService; -import org.nl.wms.basedata.master.service.dto.ClassstandardDto; +import org.nl.wms.basedata.service.ClassstandardService; +import org.nl.wms.basedata.service.dto.ClassstandardDto; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/CustomerbaseController.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/rest/CustomerbaseController.java similarity index 92% rename from lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/CustomerbaseController.java rename to lms/nladmin-system/src/main/java/org/nl/wms/basedata/rest/CustomerbaseController.java index 56da490..217ac6b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/CustomerbaseController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/rest/CustomerbaseController.java @@ -1,5 +1,5 @@ -package org.nl.wms.basedata.master.rest; +package org.nl.wms.basedata.rest; import io.swagger.annotations.Api; @@ -7,8 +7,8 @@ import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; -import org.nl.wms.basedata.master.service.CustomerbaseService; -import org.nl.wms.basedata.master.service.dto.CustomerbaseDto; +import org.nl.wms.basedata.service.CustomerbaseService; +import org.nl.wms.basedata.service.dto.CustomerbaseDto; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/MaterialbaseController.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/rest/MaterialbaseController.java similarity index 94% rename from lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/MaterialbaseController.java rename to lms/nladmin-system/src/main/java/org/nl/wms/basedata/rest/MaterialbaseController.java index 78627d0..742a3a9 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/MaterialbaseController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/rest/MaterialbaseController.java @@ -1,5 +1,5 @@ -package org.nl.wms.basedata.master.rest; +package org.nl.wms.basedata.rest; import cn.hutool.core.map.MapUtil; @@ -8,9 +8,9 @@ import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; -import org.nl.wms.basedata.master.eum.MaterOptTypeEnum; -import org.nl.wms.basedata.master.service.MaterialbaseService; -import org.nl.wms.basedata.master.service.dto.MaterialbaseDto; +import org.nl.wms.basedata.eum.MaterOptTypeEnum; +import org.nl.wms.basedata.service.MaterialbaseService; +import org.nl.wms.basedata.service.dto.MaterialbaseDto; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/StoragevehicleinfoController.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/rest/StoragevehicleinfoController.java similarity index 92% rename from lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/StoragevehicleinfoController.java rename to lms/nladmin-system/src/main/java/org/nl/wms/basedata/rest/StoragevehicleinfoController.java index fdc1d2a..eca68cd 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/StoragevehicleinfoController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/rest/StoragevehicleinfoController.java @@ -1,5 +1,5 @@ -package org.nl.wms.basedata.master.rest; +package org.nl.wms.basedata.rest; import com.alibaba.fastjson.JSONObject; @@ -8,8 +8,8 @@ import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; -import org.nl.wms.basedata.master.service.StoragevehicleinfoService; -import org.nl.wms.basedata.master.service.dto.StoragevehicleinfoDto; +import org.nl.wms.basedata.service.StoragevehicleinfoService; +import org.nl.wms.basedata.service.dto.VehicleDto; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -51,7 +51,7 @@ public class StoragevehicleinfoController { @Log("修改载具") @ApiOperation("修改载具") //@SaCheckPermission("mdPbStoragevehicleinfo:edit") - public ResponseEntity update(@Validated @RequestBody StoragevehicleinfoDto dto){ + public ResponseEntity update(@Validated @RequestBody VehicleDto dto){ storagevehicleinfoService.update(dto); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/SupplierbaseController.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/rest/SupplierbaseController.java similarity index 91% rename from lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/SupplierbaseController.java rename to lms/nladmin-system/src/main/java/org/nl/wms/basedata/rest/SupplierbaseController.java index 09619ba..b6831df 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/SupplierbaseController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/rest/SupplierbaseController.java @@ -1,5 +1,5 @@ -package org.nl.wms.basedata.master.rest; +package org.nl.wms.basedata.rest; import io.swagger.annotations.Api; @@ -7,8 +7,8 @@ import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; -import org.nl.wms.basedata.master.service.SupplierbaseService; -import org.nl.wms.basedata.master.service.dto.SupplierbaseDto; +import org.nl.wms.basedata.service.SupplierbaseService; +import org.nl.wms.basedata.service.dto.SupplierbaseDto; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/UnitController.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/rest/UnitController.java similarity index 93% rename from lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/UnitController.java rename to lms/nladmin-system/src/main/java/org/nl/wms/basedata/rest/UnitController.java index c1f988d..7f8beac 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/UnitController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/rest/UnitController.java @@ -1,5 +1,5 @@ -package org.nl.wms.basedata.master.rest; +package org.nl.wms.basedata.rest; import io.swagger.annotations.Api; @@ -7,8 +7,8 @@ import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; -import org.nl.wms.basedata.master.service.UnitService; -import org.nl.wms.basedata.master.service.dto.UnitDto; +import org.nl.wms.basedata.service.UnitService; +import org.nl.wms.basedata.service.dto.UnitDto; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/ClassstandardService.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/ClassstandardService.java similarity index 95% rename from lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/ClassstandardService.java rename to lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/ClassstandardService.java index 2772ff7..0c6c699 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/ClassstandardService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/ClassstandardService.java @@ -1,9 +1,9 @@ -package org.nl.wms.basedata.master.service; +package org.nl.wms.basedata.service; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import org.nl.wms.basedata.master.service.dto.ClassstandardDto; +import org.nl.wms.basedata.service.dto.ClassstandardDto; import org.springframework.data.domain.Pageable; import java.util.List; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/CustomerbaseService.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/CustomerbaseService.java similarity index 91% rename from lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/CustomerbaseService.java rename to lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/CustomerbaseService.java index 67bf4c2..8e2420b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/CustomerbaseService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/CustomerbaseService.java @@ -1,7 +1,7 @@ -package org.nl.wms.basedata.master.service; +package org.nl.wms.basedata.service; -import org.nl.wms.basedata.master.service.dto.CustomerbaseDto; +import org.nl.wms.basedata.service.dto.CustomerbaseDto; import org.springframework.data.domain.Pageable; import java.util.List; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/MaterialbaseService.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/MaterialbaseService.java similarity index 94% rename from lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/MaterialbaseService.java rename to lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/MaterialbaseService.java index 2f01466..e3dd259 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/MaterialbaseService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/MaterialbaseService.java @@ -1,9 +1,9 @@ -package org.nl.wms.basedata.master.service; +package org.nl.wms.basedata.service; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import org.nl.wms.basedata.master.service.dto.MaterialbaseDto; +import org.nl.wms.basedata.service.dto.MaterialbaseDto; import org.springframework.data.domain.Pageable; import java.util.List; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/StoragevehicleinfoService.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/StoragevehicleinfoService.java similarity index 79% rename from lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/StoragevehicleinfoService.java rename to lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/StoragevehicleinfoService.java index 61ace9d..c8ac1dd 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/StoragevehicleinfoService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/StoragevehicleinfoService.java @@ -1,9 +1,9 @@ -package org.nl.wms.basedata.master.service; +package org.nl.wms.basedata.service; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import org.nl.wms.basedata.master.service.dto.StoragevehicleinfoDto; +import org.nl.wms.basedata.service.dto.VehicleDto; import org.springframework.data.domain.Pageable; import java.util.List; @@ -29,21 +29,21 @@ public interface StoragevehicleinfoService { * @param whereJson 条件参数 * @return List */ - List queryAll(Map whereJson); + List queryAll(Map whereJson); /** * 根据ID查询 * @param storagevehicle_id ID * @return MdPbStoragevehicleinfo */ - StoragevehicleinfoDto findById(Long storagevehicle_id); + VehicleDto findById(Long storagevehicle_id); /** * 根据编码查询 * @param code code * @return MdPbStoragevehicleinfo */ - StoragevehicleinfoDto findByCode(String code); + VehicleDto findByCode(String code); /** @@ -56,7 +56,7 @@ public interface StoragevehicleinfoService { * 编辑 * @param dto / */ - void update(StoragevehicleinfoDto dto); + void update(VehicleDto dto); /** * 多选删除 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/SupplierbaseService.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/SupplierbaseService.java similarity index 91% rename from lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/SupplierbaseService.java rename to lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/SupplierbaseService.java index 4160412..623345e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/SupplierbaseService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/SupplierbaseService.java @@ -1,7 +1,7 @@ -package org.nl.wms.basedata.master.service; +package org.nl.wms.basedata.service; -import org.nl.wms.basedata.master.service.dto.SupplierbaseDto; +import org.nl.wms.basedata.service.dto.SupplierbaseDto; import org.springframework.data.domain.Pageable; import java.util.List; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/UnitService.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/UnitService.java similarity index 92% rename from lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/UnitService.java rename to lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/UnitService.java index a326fc5..b916e41 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/UnitService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/UnitService.java @@ -1,8 +1,8 @@ -package org.nl.wms.basedata.master.service; +package org.nl.wms.basedata.service; import com.alibaba.fastjson.JSONObject; -import org.nl.wms.basedata.master.service.dto.UnitDto; +import org.nl.wms.basedata.service.dto.UnitDto; import org.springframework.data.domain.Pageable; import java.util.List; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/ClassstandardDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/dto/ClassstandardDto.java similarity index 96% rename from lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/ClassstandardDto.java rename to lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/dto/ClassstandardDto.java index 2ddb629..ca98538 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/ClassstandardDto.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/dto/ClassstandardDto.java @@ -1,4 +1,4 @@ -package org.nl.wms.basedata.master.service.dto; +package org.nl.wms.basedata.service.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/CustomerbaseDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/dto/CustomerbaseDto.java similarity index 97% rename from lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/CustomerbaseDto.java rename to lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/dto/CustomerbaseDto.java index ae5374b..e52e337 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/CustomerbaseDto.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/dto/CustomerbaseDto.java @@ -1,4 +1,4 @@ -package org.nl.wms.basedata.master.service.dto; +package org.nl.wms.basedata.service.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/MaterialbaseDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/dto/MaterialbaseDto.java similarity index 97% rename from lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/MaterialbaseDto.java rename to lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/dto/MaterialbaseDto.java index ce35192..b8b4ac8 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/MaterialbaseDto.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/dto/MaterialbaseDto.java @@ -1,4 +1,4 @@ -package org.nl.wms.basedata.master.service.dto; +package org.nl.wms.basedata.service.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/SupplierbaseDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/dto/SupplierbaseDto.java similarity index 97% rename from lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/SupplierbaseDto.java rename to lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/dto/SupplierbaseDto.java index 57fb0b2..2ac434d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/SupplierbaseDto.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/dto/SupplierbaseDto.java @@ -1,4 +1,4 @@ -package org.nl.wms.basedata.master.service.dto; +package org.nl.wms.basedata.service.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/UnitDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/dto/UnitDto.java similarity index 93% rename from lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/UnitDto.java rename to lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/dto/UnitDto.java index 7168b6e..15d89f4 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/UnitDto.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/dto/UnitDto.java @@ -1,4 +1,4 @@ -package org.nl.wms.basedata.master.service.dto; +package org.nl.wms.basedata.service.dto; import lombok.Data; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/StoragevehicleinfoDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/dto/VehicleDto.java similarity index 84% rename from lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/StoragevehicleinfoDto.java rename to lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/dto/VehicleDto.java index 171d914..a856a22 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/StoragevehicleinfoDto.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/dto/VehicleDto.java @@ -1,4 +1,4 @@ -package org.nl.wms.basedata.master.service.dto; +package org.nl.wms.basedata.service.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -13,15 +13,15 @@ import java.math.BigDecimal; * @date 2021-12-09 **/ @Data -public class StoragevehicleinfoDto implements Serializable { +public class VehicleDto implements Serializable { /** 防止精度丢失 */ @JsonSerialize(using= ToStringSerializer.class) private Long storagevehicle_id; - private String storagevehicle_code; + private String vehicle_code; - private String storagevehicle_name; + private String vehicle_name; private String one_code; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/ClassstandardServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/impl/ClassstandardServiceImpl.java similarity index 99% rename from lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/ClassstandardServiceImpl.java rename to lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/impl/ClassstandardServiceImpl.java index 35d304f..5caa5cf 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/ClassstandardServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/impl/ClassstandardServiceImpl.java @@ -1,5 +1,5 @@ -package org.nl.wms.basedata.master.service.impl; +package org.nl.wms.basedata.service.impl; import cn.hutool.core.date.DateUtil; @@ -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.basedata.master.service.ClassstandardService; -import org.nl.wms.basedata.master.service.dto.ClassstandardDto; +import org.nl.wms.basedata.service.ClassstandardService; +import org.nl.wms.basedata.service.dto.ClassstandardDto; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/CustomerbaseServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/impl/CustomerbaseServiceImpl.java similarity index 95% rename from lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/CustomerbaseServiceImpl.java rename to lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/impl/CustomerbaseServiceImpl.java index 4a72e54..c564af7 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/CustomerbaseServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/impl/CustomerbaseServiceImpl.java @@ -1,5 +1,5 @@ -package org.nl.wms.basedata.master.service.impl; +package org.nl.wms.basedata.service.impl; import cn.hutool.core.date.DateUtil; @@ -16,10 +16,10 @@ import org.nl.modules.common.utils.SecurityUtils; 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.basedata.master.service.ClassstandardService; -import org.nl.wms.basedata.master.service.CustomerbaseService; -import org.nl.wms.basedata.master.service.dto.ClassstandardDto; -import org.nl.wms.basedata.master.service.dto.CustomerbaseDto; +import org.nl.wms.basedata.service.ClassstandardService; +import org.nl.wms.basedata.service.CustomerbaseService; +import org.nl.wms.basedata.service.dto.ClassstandardDto; +import org.nl.wms.basedata.service.dto.CustomerbaseDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/MaterialbaseServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/impl/MaterialbaseServiceImpl.java similarity index 96% rename from lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/MaterialbaseServiceImpl.java rename to lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/impl/MaterialbaseServiceImpl.java index 5b7e83f..8b69b3f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/MaterialbaseServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/impl/MaterialbaseServiceImpl.java @@ -1,5 +1,5 @@ -package org.nl.wms.basedata.master.service.impl; +package org.nl.wms.basedata.service.impl; import cn.hutool.core.date.DateUtil; @@ -17,10 +17,10 @@ import org.nl.modules.common.utils.SecurityUtils; 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.eum.MaterOptTypeEnum; -import org.nl.wms.basedata.master.service.ClassstandardService; -import org.nl.wms.basedata.master.service.MaterialbaseService; -import org.nl.wms.basedata.master.service.dto.MaterialbaseDto; +import org.nl.wms.basedata.eum.MaterOptTypeEnum; +import org.nl.wms.basedata.service.ClassstandardService; +import org.nl.wms.basedata.service.MaterialbaseService; +import org.nl.wms.basedata.service.dto.MaterialbaseDto; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/StoragevehicleinfoServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/impl/StoragevehicleinfoServiceImpl.java similarity index 74% rename from lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/StoragevehicleinfoServiceImpl.java rename to lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/impl/StoragevehicleinfoServiceImpl.java index 1600e10..389b69b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/StoragevehicleinfoServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/impl/StoragevehicleinfoServiceImpl.java @@ -1,5 +1,5 @@ -package org.nl.wms.basedata.master.service.impl; +package org.nl.wms.basedata.service.impl; import cn.hutool.core.date.DateUtil; @@ -19,8 +19,8 @@ import org.nl.modules.system.util.CodeUtil; 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.service.StoragevehicleinfoService; -import org.nl.wms.basedata.master.service.dto.StoragevehicleinfoDto; +import org.nl.wms.basedata.service.StoragevehicleinfoService; +import org.nl.wms.basedata.service.dto.VehicleDto; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -43,56 +43,48 @@ public class StoragevehicleinfoServiceImpl implements StoragevehicleinfoService public Map queryAll(Map whereJson, Pageable page) { WQLObject taskTab = WQLObject.getWQLObject("sch_base_task"); - String storagevehicle_code_begin = (String) whereJson.get("storagevehicle_code_begin"); - String storagevehicle_code_end = (String) whereJson.get("storagevehicle_code_end"); + String ehicle_code_begin = (String) whereJson.get("ehicle_code_begin"); + String ehicle_code_end = (String) whereJson.get("ehicle_code_end"); String storagevehicle_type = (String) whereJson.get("storagevehicle_type"); HashMap map = new HashMap(); - map.put("storagevehicle_code_begin", storagevehicle_code_begin); - map.put("storagevehicle_code_end", storagevehicle_code_end); + map.put("ehicle_code_begin", ehicle_code_begin); + map.put("ehicle_code_end", ehicle_code_end); map.put("storagevehicle_type", storagevehicle_type); map.put("flag", "1"); - JSONObject json = WQL.getWO("QMD_PB_STORAGEVEHICLEINFO").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "s.storagevehicle_code ASC"); + JSONObject json = WQL.getWO("QMD_PB_STORAGEVEHICLEINFO").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "s.ehicle_code ASC"); JSONArray content = json.getJSONArray("content"); for (int i = 0; i < content.size(); i++) { JSONObject jsonObject = content.getJSONObject(i); - JSONObject jsonTask = taskTab.query("vehicle_code = '" + jsonObject.getString("storagevehicle_code") + "' and task_status <> '99' and is_delete = '0'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(jsonTask)) { - jsonObject.put("start_point_code", jsonTask.getString("start_point_code")); - jsonObject.put("next_point_code", jsonTask.getString("next_point_code")); - jsonObject.put("is_task", "1"); - jsonObject.put("point_code", ""); - } else { - jsonObject.put("is_task", "0"); - } + JSONObject jsonTask = taskTab.query("vehicle_code = '" + jsonObject.getString("ehicle_code") + "' and task_status <> '99' and is_delete = '0'").uniqueResult(0); } return json; } @Override - public List queryAll(Map whereJson) { + public List queryAll(Map whereJson) { WQLObject wo = WQLObject.getWQLObject("md_pb_storagevehicleinfo"); JSONArray arr = wo.query().getResultJSONArray(0); - List list = arr.toJavaList(StoragevehicleinfoDto.class); + List list = arr.toJavaList(VehicleDto.class); return list; } @Override - public StoragevehicleinfoDto findById(Long storagevehicle_id) { + public VehicleDto findById(Long storagevehicle_id) { WQLObject wo = WQLObject.getWQLObject("md_pb_storagevehicleinfo"); JSONObject json = wo.query("storagevehicle_id =" + storagevehicle_id + "").uniqueResult(0); - final StoragevehicleinfoDto obj = json.toJavaObject(StoragevehicleinfoDto.class); + final VehicleDto obj = json.toJavaObject(VehicleDto.class); return obj; } @Override - public StoragevehicleinfoDto findByCode(String code) { + public VehicleDto findByCode(String code) { WQLObject wo = WQLObject.getWQLObject("md_pb_storagevehicleinfo"); - JSONObject json = wo.query("storagevehicle_code ='" + code + "'").uniqueResult(0); + JSONObject json = wo.query("ehicle_code ='" + code + "'").uniqueResult(0); if (ObjectUtil.isEmpty(json)){ throw new BadRequestException("请输入正确的载具号！"); } - final StoragevehicleinfoDto obj = json.toJavaObject(StoragevehicleinfoDto.class); + final VehicleDto obj = json.toJavaObject(VehicleDto.class); return obj; } @@ -100,7 +92,7 @@ public class StoragevehicleinfoServiceImpl implements StoragevehicleinfoService @Transactional(rollbackFor = Exception.class) public JSONArray create(Map map) { WQLObject wo = WQLObject.getWQLObject("md_pb_storagevehicleinfo"); - JSONObject jsonObject = wo.query("storagevehicle_code = '" + map.get("storagevehicle_code") + "' and is_delete = '0'").uniqueResult(0); + JSONObject jsonObject = wo.query("ehicle_code = '" + map.get("ehicle_code") + "' and is_delete = '0'").uniqueResult(0); if (!ObjectUtil.isEmpty(jsonObject)) { throw new BadRequestException("此载具已存在"); } @@ -121,11 +113,11 @@ public class StoragevehicleinfoServiceImpl implements StoragevehicleinfoService JSONArray resultCodeArr = new JSONArray(); int num = MapUtil.getInt(map, "num"); for (int i = 0; i < num; i++) { - StoragevehicleinfoDto dto = new StoragevehicleinfoDto(); + VehicleDto dto = new VehicleDto(); dto.setStoragevehicle_id(IdUtil.getSnowflake(1, 1).nextId()); - dto.setStoragevehicle_code(CodeUtil.getNewCode(code)); + dto.setVehicle_code(CodeUtil.getNewCode(code)); dto.setCreate_id(currentUserId); - dto.setStoragevehicle_name(dto.getStoragevehicle_code()); + dto.setVehicle_name(dto.getVehicle_code()); dto.setCreate_name(nickName); dto.setUpdate_optid(currentUserId); dto.setUpdate_optname(nickName); @@ -134,20 +126,20 @@ public class StoragevehicleinfoServiceImpl implements StoragevehicleinfoService dto.setStoragevehicle_type((String) map.get("storagevehicle_type")); JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); wo.insert(json); - resultCodeArr.add(dto.getStoragevehicle_code()); + resultCodeArr.add(dto.getVehicle_code()); } return resultCodeArr; } @Override @Transactional(rollbackFor = Exception.class) - public void update(StoragevehicleinfoDto dto) { + public void update(VehicleDto dto) { WQLObject wo = WQLObject.getWQLObject("md_pb_storagevehicleinfo"); - JSONObject jsonObject = wo.query("storagevehicle_code = '" + dto.getStoragevehicle_code() + "' and is_delete = '0'").uniqueResult(0); + JSONObject jsonObject = wo.query("ehicle_code = '" + dto.getVehicle_code() + "' and is_delete = '0'").uniqueResult(0); if (!ObjectUtil.isEmpty(jsonObject)) { throw new BadRequestException("此载具已存在"); } - StoragevehicleinfoDto entity = this.findById(dto.getStoragevehicle_id()); + VehicleDto entity = this.findById(dto.getStoragevehicle_id()); if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!"); Long currentUserId = SecurityUtils.getCurrentUserId(); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/SupplierbaseServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/impl/SupplierbaseServiceImpl.java similarity index 95% rename from lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/SupplierbaseServiceImpl.java rename to lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/impl/SupplierbaseServiceImpl.java index 6d5e365..44deb3b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/SupplierbaseServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/impl/SupplierbaseServiceImpl.java @@ -1,5 +1,5 @@ -package org.nl.wms.basedata.master.service.impl; +package org.nl.wms.basedata.service.impl; import cn.hutool.core.date.DateUtil; @@ -16,10 +16,10 @@ import org.nl.modules.common.utils.SecurityUtils; 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.basedata.master.service.ClassstandardService; -import org.nl.wms.basedata.master.service.SupplierbaseService; -import org.nl.wms.basedata.master.service.dto.ClassstandardDto; -import org.nl.wms.basedata.master.service.dto.SupplierbaseDto; +import org.nl.wms.basedata.service.ClassstandardService; +import org.nl.wms.basedata.service.SupplierbaseService; +import org.nl.wms.basedata.service.dto.ClassstandardDto; +import org.nl.wms.basedata.service.dto.SupplierbaseDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/UnitServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/impl/UnitServiceImpl.java similarity index 97% rename from lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/UnitServiceImpl.java rename to lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/impl/UnitServiceImpl.java index c396e9c..e7df20f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/UnitServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/impl/UnitServiceImpl.java @@ -1,5 +1,5 @@ -package org.nl.wms.basedata.master.service.impl; +package org.nl.wms.basedata.service.impl; import cn.hutool.core.date.DateUtil; @@ -16,8 +16,8 @@ import org.nl.modules.common.utils.SecurityUtils; 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.basedata.master.service.UnitService; -import org.nl.wms.basedata.master.service.dto.UnitDto; +import org.nl.wms.basedata.service.UnitService; +import org.nl.wms.basedata.service.dto.UnitDto; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/IvtChangeTypeEnum.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/IvtChangeTypeEnum.java deleted file mode 100644 index 402eb99..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/IvtChangeTypeEnum.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.nl.wms.basedata.st; - -/** - * // 11-扣减可用; 12-增加可用; - * // 21-减库存; 22-加库存; 23-同时加; 24-同时减 - */ -public enum IvtChangeTypeEnum { - SUB_CAN_USE("扣减可用数", 11), - ADD_CAN_USE("增加用数", 12), - - SUB_IVT("扣减库存", 21), - ADD_IVT("增加库存", 22), - ADD_IVT_AND_CAN_USE("同时加库存和可用", 23), - SUB_IVT_AND_CAN_USE("同时减库存和可用", 24); - - private final String name; - private final int index; - - IvtChangeTypeEnum(String name, int index) { - this.name = name; - this.index = index; - } - - public String getName() { - return name; - } - - public int getIndex() { - return index; - } -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/StoreIvtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/StoreIvtServiceImpl.java deleted file mode 100644 index 45cf89d..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/StoreIvtServiceImpl.java +++ /dev/null @@ -1,297 +0,0 @@ -package org.nl.wms.basedata.st; - -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.NumberUtil; -import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSONObject; -import org.nl.modules.common.exception.BadRequestException; -import org.nl.modules.common.utils.SecurityUtils; -import org.nl.modules.wql.core.bean.WQLObject; - -import java.math.BigDecimal; - -/** - * Title: Test.java Description: 一、入库 单据审核，可用数、库存数加上。 取消审核，可用数、库存数减掉 二、出库 - * 单据分配，可用数减掉 取消分配，可用数加回 单据审核，库存数减掉 取消审核，库存数加回 - * - * @author ldjun - * @created 2020年7月23日 下午2:23:04 - */ -public class StoreIvtServiceImpl { - /** - * @discription 添加仓储变动记录 - * @author ldjun - * @created 2020年5月12日 下午12:54:42 - */ - public void addIvtFlow(JSONObject disObj, IvtChangeTypeEnum changeType) { - String struct_id = disObj.getString("struct_id"); - JSONObject pointObj = WQLObject.getWQLObject("sch_base_point").query("point_id ='" + struct_id + "'").uniqueResult(0); - String vehicle_code = disObj.getString("vehicle_code"); - if (StrUtil.isEmpty(struct_id)) { - throw new BadRequestException("仓位标识不能为空!"); - } - String change_qty = disObj.getString("change_qty"); - if (StrUtil.isEmpty(change_qty)) { - change_qty = "0"; - } - if (StrUtil.equals("0", change_qty)) { - throw new BadRequestException("变动量不能都为0!"); - } - JSONObject param = new JSONObject(); - param.put("change_id", IdUtil.getSnowflake(1, 1).nextId()); - param.put("struct_id", struct_id); - param.put("struct_code",pointObj.getString("point_code")); - param.put("struct_name",pointObj.getString("point_name")); - param.put("material_id", disObj.getString("material_id")); - param.put("pcsn", disObj.getString("pcsn")); - //先默认写死，只有一个仓库 - param.put("stor_id", "1528627995269533696"); - param.put("change_type_scode",changeType.getIndex()); - - param.put("inv_id", disObj.getString("bill_id")); - param.put("bill_code", disObj.getString("bill_code")); - param.put("bill_type_scode", disObj.getString("bill_type_scode")); - param.put("qty_unit_id", disObj.getString("qty_unit_id")); - param.put("change_time", DateUtil.now()); - param.put("change_qty", change_qty); - param.put("change_person_id", SecurityUtils.getCurrentUserId()); - param.put("change_person_name", SecurityUtils.getCurrentNickName()); - - - param.put("change_type", changeType.getIndex()); - param.put("region_id", disObj.getString("region_id")); - param.put("is_full", disObj.getString("is_full")); - - - // 仓位库存变动记录表【ST_IVT_StructIvtFlow】 - WQLObject ivtFlowTab = WQLObject.getWQLObject("ST_IVT_StructIvtFlow"); - ivtFlowTab.insert(param); - // 根据变动记录改变仓位库存 - param.put("vehicle_code", vehicle_code); - param.put("stewing_time", disObj.getString("stewing_time")); - param.put("producetask_id", disObj.getString("producetask_id")); - this.changeInventory(param, changeType); - } - - /** - * @param param - * @discription 扣减可用数 - * @author ldjun - * @created 2020年5月12日 上午8:52:44 - */ - private void changeInventory(JSONObject param, IvtChangeTypeEnum changeType) { - WQLObject stackIvtTab = WQLObject.getWQLObject("ST_IVT_StructIvt"); - String struct_id = param.getString("struct_id"); - String vehicle_code = param.getString("vehicle_code"); - String stewing_time = param.getString("stewing_time"); - String producetask_id = param.getString("producetask_id"); - String struct_name = param.getString("struct_name"); - String struct_code = param.getString("struct_code"); - if (StrUtil.isEmpty(struct_id)) { - throw new BadRequestException("仓位标识不能为空!"); - } - - String material_id = param.getString("material_id"); - // 拼接查询条件参数 - String whereArgs = "struct_id = '" + struct_id + "' and material_id = '" + material_id + "'"; - JSONObject stackIvtObj = stackIvtTab.query(whereArgs).uniqueResult(0); - - // 需变动的数量 - String change_qty = param.getString("change_qty"); - - // 变动类型 - // 11-扣减可用; 12-增加可用; 13-刷新可用 - // 21-减库存; 22-加库存; 23-同时加; 24-同时减 - // 31-加待入; 32-减待入 33减库存可用数可以为0 34同时减(库存和数量) 考虑负数 35 加库存 考虑负数 - if (stackIvtObj == null) {// 说明该货位上还没有该物料，直接插入记录即可 - JSONObject json = new JSONObject(); - json.put("stockrecord_id", IdUtil.getSnowflake(1, 1).nextId()); - json.put("struct_id", param.getString("struct_id")); - json.put("struct_name", param.getString("struct_name")); - json.put("material_id", param.getString("material_id")); - - json.put("pcsn", param.getString("pcsn")); - json.put("qty_unit_id", param.getString("qty_unit_id")); - json.put("instorage_time", DateUtil.now()); - - json.put("canuse_qty", "0"); - json.put("frozen_qty", "0"); - json.put("ivt_qty", "0"); - json.put("warehousing_qty", "0"); - json.put("qc_qty", "0"); - - // 11-扣减可用; 12-增加可用; - // 21-减库存; 22-加库存; 23-同时加(可用和库存); 24-同时减(可用和库存) - // 31-加待入; 32-减待入 - switch (changeType.getIndex()) { - case 11: // 扣减可用重量和数量 - break; - - case 12: - break; - case 13: - break; - case 21: - break; - case 22: - json.put("ivt_qty", change_qty); - break; - case 23: - json.put("ivt_qty", change_qty); - json.put("canuse_qty", change_qty); - break; - case 24:// 同时减 - // 语句 - break; - case 31:// 加待入 - // 语句 - break; - case 32:// 减待入 - // 语句 - break; - default: // 可选 - throw new BadRequestException("变动类型不正确!"); - } - json.put("vehicle_code", vehicle_code); - json.put("stewing_time", stewing_time); - json.put("producetask_id", producetask_id); - json.put("struct_code", struct_code); - json.put("struct_name", struct_name); - json.put("barcode", param.getString("barcode")); - json.put("region_id", param.getString("region_id")); - String is_full = param.getString("is_full"); - if (StrUtil.isEmpty(is_full)) { - is_full = "1"; - } - json.put("is_full", is_full); - - stackIvtTab.insert(json); - } - // 对应的货位上有物料，需判断数量重量相关字段是否符合实际逻辑，符合时更新相应记录 - if (stackIvtObj != null) { - // 变动前可用数量 - String before_canuse_qty = stackIvtObj.getString("canuse_qty"); - // 变动前冻结数量 - String before_frozen_qty = stackIvtObj.getString("frozen_qty"); - // 变动前库存数量 - String before_ivt_qty = stackIvtObj.getString("ivt_qty"); - // 变动前待入数量 - String before_warehousing_qty = stackIvtObj.getString("warehousing_qty"); - // 变动前待检数量 - String before_qc_qty = stackIvtObj.getString("qc_qty"); - - // 变动后可用数量 - BigDecimal after_canuse_qty = new BigDecimal(0); - // 变动后冻结数量 - BigDecimal after_frozen_qty = new BigDecimal(0); - // 变动后库存数量 - BigDecimal after_ivt_qty = new BigDecimal(0); - // 变动后待入数量 - BigDecimal after_warehousing_qty = new BigDecimal(0); - // 变动后待检数量 - BigDecimal after_qc_qty = new BigDecimal(0); - - // 判断是否减为0 - boolean is_sub0 = false; - switch (changeType.getIndex()) { - case 11: // 扣减可用重量和数量 - // 变动后可用数量 - after_canuse_qty = NumberUtil.sub(before_canuse_qty, change_qty); - if (after_canuse_qty.doubleValue() < 0) { - throw new BadRequestException("可用数量不足，无法操作!"); - } - stackIvtObj.put("canuse_qty", after_canuse_qty); - break; - case 12:// 12-增加可用重量和数量; - // 变动后可用数量 - after_canuse_qty = NumberUtil.add(before_canuse_qty, change_qty); - stackIvtObj.put("canuse_qty", after_canuse_qty); - break; - case 13:// 刷新可用数量和重量 - // 语句 - break; - case 21:// 减库存 - // 变动后库存数量 - after_ivt_qty = NumberUtil.sub(before_ivt_qty, change_qty); - if (after_ivt_qty.doubleValue() < 0) { - throw new BadRequestException("可用数量不足，无法操作!"); - } - if (after_ivt_qty.doubleValue() <= 0) { - is_sub0 = true; - } - stackIvtObj.put("ivt_qty", after_ivt_qty); - break; - case 33:// 减库存 - after_ivt_qty = NumberUtil.sub(before_ivt_qty, change_qty); - if (after_ivt_qty.doubleValue() < 0) { - throw new BadRequestException("库存数量不足，无法操作!"); - } - if (after_ivt_qty.doubleValue() <= 0) { - is_sub0 = true; - } - stackIvtObj.put("ivt_qty", after_ivt_qty); - break; - case 22:// 加库存重量和数量 - // 变动后库存数量 - after_ivt_qty = NumberUtil.add(before_ivt_qty, change_qty); - stackIvtObj.put("ivt_qty", after_ivt_qty); - break; - case 23:// 同时加(可用和库存) - // 变动后可用数量 - after_canuse_qty = NumberUtil.add(before_canuse_qty, change_qty); - stackIvtObj.put("canuse_qty", after_canuse_qty); - - // 变动后库存数量 - after_ivt_qty = NumberUtil.add(before_ivt_qty, change_qty); - stackIvtObj.put("ivt_qty", after_ivt_qty); - // 语句 - break; - case 24:// 同时减(库存和数量) - // 变动后可用数量 - after_canuse_qty = NumberUtil.sub(before_canuse_qty, change_qty); - if (after_canuse_qty.doubleValue() < 0) { - throw new BadRequestException("可用数量不足，无法操作!"); - } - stackIvtObj.put("canuse_qty", after_canuse_qty); - - // 变动后库存数量 - after_ivt_qty = NumberUtil.sub(before_ivt_qty, change_qty); - if (after_ivt_qty.doubleValue() < 0) { - throw new BadRequestException("可用数量不足，无法操作!"); - } - if (after_ivt_qty.doubleValue() <= 0) { - is_sub0 = true; - } - stackIvtObj.put("ivt_qty", after_ivt_qty); - // 语句 - - break; - case 31:// 加待入 - // 语句 - break; - case 32:// 减待入 - // 语句 - break; - default: // 可选 - throw new BadRequestException("变动类型不正确!"); - } - - - // 库存减为0，删除该记录 - if (is_sub0) { - // 出完货以后更新载具号为空 - JSONObject structObj = new JSONObject(); - structObj.put("storagevehicle_code", ""); - structObj.put("struct_id", stackIvtObj.getString("struct_id")); - stackIvtTab.delete(whereArgs); - - } else {//更新 - stackIvtObj.put("vehicle_code", vehicle_code); - stackIvtTab.update(stackIvtObj, whereArgs); - } - - } - - } -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/SectattrController.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/SectattrController.java deleted file mode 100644 index e55d4a3..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/SectattrController.java +++ /dev/null @@ -1,84 +0,0 @@ - -package org.nl.wms.basedata.st.rest; - - -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.modules.logging.annotation.Log; -import org.nl.wms.basedata.st.service.SectattrService; -import org.nl.wms.basedata.st.service.dto.SectattrDto; -import org.springframework.data.domain.Pageable; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.Map; - -/** -* @author zhouz -* @date 2021-12-09 -**/ -@RestController -@RequiredArgsConstructor -@Api(tags = "库区管理") -@RequestMapping("/api/sectattr") -@Slf4j -public class SectattrController { - - private final SectattrService sectattrService; - - @GetMapping - @Log("查询库区") - @ApiOperation("查询库区") - //@SaCheckPermission("sectattr:list") - public ResponseEntity query(@RequestParam Map whereJson, Pageable page){ - return new ResponseEntity<>(sectattrService.queryAll(whereJson,page),HttpStatus.OK); - } - - @PostMapping - @Log("新增库区") - @ApiOperation("新增库区") - //@SaCheckPermission("sectattr:add") - public ResponseEntity create(@Validated @RequestBody SectattrDto dto){ - sectattrService.create(dto); - return new ResponseEntity<>(HttpStatus.CREATED); - } - - @PutMapping - @Log("修改库区") - @ApiOperation("修改库区") - //@SaCheckPermission("sectattr:edit") - public ResponseEntity update(@Validated @RequestBody SectattrDto dto){ - sectattrService.update(dto); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } - - @Log("删除库区") - @ApiOperation("删除库区") - //@SaCheckPermission("sectattr:del") - @DeleteMapping - public ResponseEntity delete(@RequestBody Long[] ids) { - sectattrService.deleteAll(ids); - return new ResponseEntity<>(HttpStatus.OK); - } - - @GetMapping("/getSect") - @Log("查询库区下拉框") - @ApiOperation("查询库区下拉框") - //@SaCheckPermission("materialtype:list") - public ResponseEntity querySect(@RequestParam Map whereJson) { - return new ResponseEntity<>(sectattrService.getSect(whereJson), HttpStatus.OK); - } - - @PutMapping("/changeActive") - @Log("修改库区状态") - @ApiOperation("修改库区状态") - public ResponseEntity update(@RequestBody JSONObject json) { - sectattrService.changeActive(json); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/StorattrController.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/StorattrController.java deleted file mode 100644 index ae825d3..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/StorattrController.java +++ /dev/null @@ -1,84 +0,0 @@ - -package org.nl.wms.basedata.st.rest; - - -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.modules.logging.annotation.Log; -import org.nl.wms.basedata.st.service.StorattrService; -import org.nl.wms.basedata.st.service.dto.StorattrDto; -import org.springframework.data.domain.Pageable; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.Map; - -/** -* @author zhouz -* @date 2021-12-08 -**/ -@RestController -@RequiredArgsConstructor -@Api(tags = "仓库管理") -@RequestMapping("/api/Storattr") -@Slf4j -public class StorattrController { - - private final StorattrService storattrService; - - @GetMapping - @Log("查询仓库") - @ApiOperation("查询仓库") - //@SaCheckPermission("Storattr:list") - public ResponseEntity query(@RequestParam Map whereJson, Pageable page){ - return new ResponseEntity<>(storattrService.queryAll(whereJson,page),HttpStatus.OK); - } - - @PostMapping - @Log("新增仓库") - @ApiOperation("新增仓库") - //@SaCheckPermission("Storattr:addgetStor") - public ResponseEntity create(@Validated @RequestBody StorattrDto dto){ - storattrService.create(dto); - return new ResponseEntity<>(HttpStatus.CREATED); - } - - @PutMapping - @Log("修改仓库") - @ApiOperation("修改仓库") - //@SaCheckPermission("Storattr:edit") - public ResponseEntity update(@Validated @RequestBody StorattrDto dto){ - storattrService.update(dto); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } - - @Log("删除仓库") - @ApiOperation("删除仓库") - //@SaCheckPermission("Storattr:del") - @DeleteMapping - public ResponseEntity delete(@RequestBody Long[] ids) { - storattrService.deleteAll(ids); - return new ResponseEntity<>(HttpStatus.OK); - } - - @GetMapping("/getStor") - @Log("查询仓库下拉框") - @ApiOperation("查询仓库下拉框") - //@SaCheckPermission("materialtype:list") - public ResponseEntity queryStor(@RequestParam Map whereJson) { - return new ResponseEntity<>(storattrService.getStor(whereJson), HttpStatus.OK); - } - - @PutMapping("/changeActive") - @Log("修改仓库管理状态") - @ApiOperation("修改仓库管理状态") - public ResponseEntity update(@RequestBody JSONObject json) { - storattrService.changeActive(json); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/StructattrController.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/StructattrController.java deleted file mode 100644 index 0b481f9..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/StructattrController.java +++ /dev/null @@ -1,76 +0,0 @@ - -package org.nl.wms.basedata.st.rest; - - -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.modules.logging.annotation.Log; -import org.nl.wms.basedata.st.service.StructattrService; -import org.nl.wms.basedata.st.service.dto.StructattrDto; -import org.springframework.data.domain.Pageable; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.Map; - -/** -* @author zhouz -* @date 2021-12-09 -**/ -@RestController -@RequiredArgsConstructor -@Api(tags = "仓位管理") -@RequestMapping("/api/structattr") -@Slf4j -public class StructattrController { - - private final StructattrService structattrService; - - @GetMapping - @Log("查询仓位") - @ApiOperation("查询仓位") - //@SaCheckPermission("structattr:list") - public ResponseEntity query(@RequestParam Map whereJson, Pageable page){ - return new ResponseEntity<>(structattrService.queryAll(whereJson,page),HttpStatus.OK); - } - - @PostMapping - @Log("新增仓位") - @ApiOperation("新增仓位") - //@SaCheckPermission("structattr:add") - public ResponseEntity create(@Validated @RequestBody StructattrDto dto){ - structattrService.create(dto); - return new ResponseEntity<>(HttpStatus.CREATED); - } - - @PutMapping - @Log("修改仓位") - @ApiOperation("修改仓位") - //@SaCheckPermission("structattr:edit") - public ResponseEntity update(@Validated @RequestBody StructattrDto dto){ - structattrService.update(dto); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } - - @Log("删除仓位") - @ApiOperation("删除仓位") - //@SaCheckPermission("structattr:del") - @DeleteMapping - public ResponseEntity delete(@RequestBody Long[] ids) { - structattrService.deleteAll(ids); - return new ResponseEntity<>(HttpStatus.OK); - } - - @PutMapping("/changeActive") - @Log("修改仓位状态") - @ApiOperation("修改仓位状态") - public ResponseEntity update(@RequestBody JSONObject json) { - structattrService.changeActive(json); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/StructivtController.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/StructivtController.java deleted file mode 100644 index f518354..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/StructivtController.java +++ /dev/null @@ -1,93 +0,0 @@ - -package org.nl.wms.basedata.st.rest; - - -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.modules.logging.annotation.Log; -import org.nl.wms.basedata.st.service.StructivtService; -import org.nl.wms.basedata.st.service.dto.StructivtDto; -import org.springframework.data.domain.Pageable; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.Map; - -/** -* @author geng by -* @date 2022-06-02 -**/ -@RestController -@RequiredArgsConstructor -@Api(tags = "库存管理管理") -@RequestMapping("/api/structivt") -@Slf4j -public class StructivtController { - - private final StructivtService structivtService; - - @GetMapping - @Log("查询库存管理") - @ApiOperation("查询库存管理") - //@SaCheckPermission("structivt:list") - public ResponseEntity query(@RequestParam Map whereJson, Pageable page){ - return new ResponseEntity<>(structivtService.queryAll(whereJson,page),HttpStatus.OK); - } - - @PostMapping - @Log("新增库存管理") - @ApiOperation("新增库存管理") - //@SaCheckPermission("structivt:add") - public ResponseEntity create(@Validated @RequestBody StructivtDto dto){ - structivtService.create(dto); - return new ResponseEntity<>(HttpStatus.CREATED); - } - - @PutMapping - @Log("修改库存管理") - @ApiOperation("修改库存管理") - //@SaCheckPermission("structivt:edit") - public ResponseEntity update(@Validated @RequestBody StructivtDto dto){ - structivtService.update(dto); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } - - @Log("删除库存管理") - @ApiOperation("删除库存管理") - //@SaCheckPermission("structivt:del") - @DeleteMapping - public ResponseEntity delete(@RequestBody Long[] ids) { - structivtService.deleteAll(ids); - return new ResponseEntity<>(HttpStatus.OK); - } - - @GetMapping("/getStruct") - @Log("查询仓位下拉") - @ApiOperation("查询仓位下拉") - //@SaCheckPermission("structivt:list") - public ResponseEntity getStruct(){ - return new ResponseEntity<>(structivtService.getStruct(),HttpStatus.OK); - } - - @PostMapping("/getStructById") - @Log("根据仓位id查询仓位信息") - @ApiOperation("根据仓位id查询仓位信息") - //@SaCheckPermission("structivt:list") - public ResponseEntity getStructById(@RequestBody JSONObject param){ - return new ResponseEntity<>(structivtService.getStructById(param),HttpStatus.OK); - } - - @GetMapping("/getUnits") - @Log("查询计量单位下拉") - @ApiOperation("查询计量单位下拉") - //@SaCheckPermission("structivt:list") - public ResponseEntity getUnits(){ - return new ResponseEntity<>(structivtService.getUnits(),HttpStatus.OK); - } - -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/StructrelamaterialController.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/StructrelamaterialController.java deleted file mode 100644 index 3767052..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/StructrelamaterialController.java +++ /dev/null @@ -1,85 +0,0 @@ - -package org.nl.wms.basedata.st.rest; - - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.modules.logging.annotation.Log; -import org.nl.wms.basedata.st.service.StructrelamaterialService; -import org.nl.wms.basedata.st.service.dto.StructrelamaterialDto; -import org.springframework.data.domain.Pageable; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.Map; - -/** -* @author zhouz -* @date 2021-12-09 -**/ -@RestController -@RequiredArgsConstructor -@Api(tags = "物料存放设置管理") -@RequestMapping("/api/structrelamaterial") -@Slf4j -public class StructrelamaterialController { - - private final StructrelamaterialService structrelamaterialService; - - @GetMapping - @Log("查询物料存放设置") - @ApiOperation("查询物料存放设置") - //@SaCheckPermission("structrelamaterial:list") - public ResponseEntity query(@RequestParam Map whereJson, Pageable page){ - return new ResponseEntity<>(structrelamaterialService.queryAll(whereJson,page),HttpStatus.OK); - } - - @PostMapping - @Log("新增物料存放设置") - @ApiOperation("新增物料存放设置") - //@SaCheckPermission("structrelamaterial:add") - public ResponseEntity create(@Validated @RequestBody StructrelamaterialDto dto){ - structrelamaterialService.create(dto); - return new ResponseEntity<>(HttpStatus.CREATED); - } - - @PutMapping - @Log("修改物料存放设置") - @ApiOperation("修改物料存放设置") - //@SaCheckPermission("structrelamaterial:edit") - public ResponseEntity update(@Validated @RequestBody StructrelamaterialDto dto){ - structrelamaterialService.update(dto); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } - - @Log("删除物料存放设置") - @ApiOperation("删除物料存放设置") - //@SaCheckPermission("structrelamaterial:del") - @DeleteMapping - public ResponseEntity delete(@RequestBody Long[] ids) { - structrelamaterialService.deleteAll(ids); - return new ResponseEntity<>(HttpStatus.OK); - } - - @PostMapping("/insertSet") - @Log("插入物料存放设置") - @ApiOperation("插入物料存放设置") - //@SaCheckPermission("structrelamaterial:edit") - public ResponseEntity insertSet(@RequestBody Map whereJson){ - structrelamaterialService.insertSet(whereJson); - return new ResponseEntity<>(HttpStatus.CREATED); - } - - @PostMapping("/delSet") - @Log("删除物料存放设置") - @ApiOperation("删除物料存放设置") - //@SaCheckPermission("structrelamaterial:edit") - public ResponseEntity delSet(@RequestBody Map whereJson){ - structrelamaterialService.delSet(whereJson); - return new ResponseEntity<>(HttpStatus.OK); - } -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/SectattrService.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/SectattrService.java deleted file mode 100644 index 7e6bd97..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/SectattrService.java +++ /dev/null @@ -1,74 +0,0 @@ - -package org.nl.wms.basedata.st.service; - -import com.alibaba.fastjson.JSONObject; -import org.nl.wms.basedata.st.service.dto.SectattrDto; -import org.springframework.data.domain.Pageable; - -import java.util.List; -import java.util.Map; - -/** -* @description 服务接口 -* @author zhouz -* @date 2021-12-09 -**/ -public interface SectattrService { - - /** - * 查询数据分页 - * @param whereJson 条件 - * @param page 分页参数 - * @return Map - */ - Map queryAll(Map whereJson, Pageable page); - - /** - * 查询所有数据不分页 - * @param whereJson 条件参数 - * @return List - */ - List queryAll(Map whereJson); - - /** - * 根据ID查询 - * @param sect_id ID - * @return Sectattr - */ - SectattrDto findById(Long sect_id); - - /** - * 根据编码查询 - * @param code code - * @return Sectattr - */ - SectattrDto findByCode(String code); - - - /** - * 创建 - * @param dto / - */ - void create(SectattrDto dto); - - /** - * 编辑 - * @param dto / - */ - void update(SectattrDto dto); - - /** - * 多选删除 - * @param ids / - */ - void deleteAll(Long[] ids); - - JSONObject getSect(Map whereJson); - - /** - * 改变启用状态 - * @param json - */ - void changeActive(JSONObject json); - -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/StorattrService.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/StorattrService.java deleted file mode 100644 index b095b5c..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/StorattrService.java +++ /dev/null @@ -1,74 +0,0 @@ - -package org.nl.wms.basedata.st.service; - -import com.alibaba.fastjson.JSONObject; -import org.nl.wms.basedata.st.service.dto.StorattrDto; -import org.springframework.data.domain.Pageable; - -import java.util.List; -import java.util.Map; - -/** -* @description 服务接口 -* @author zhouz -* @date 2021-12-08 -**/ -public interface StorattrService { - - /** - * 查询数据分页 - * @param whereJson 条件 - * @param page 分页参数 - * @return Map - */ - Map queryAll(Map whereJson, Pageable page); - - /** - * 查询所有数据不分页 - * @param whereJson 条件参数 - * @return List - */ - List queryAll(Map whereJson); - - /** - * 根据ID查询 - * @param stor_id ID - * @return Storattr - */ - StorattrDto findById(Long stor_id); - - /** - * 根据编码查询 - * @param code code - * @return Storattr - */ - StorattrDto findByCode(String code); - - - /** - * 创建 - * @param dto / - */ - void create(StorattrDto dto); - - /** - * 编辑 - * @param dto / - */ - void update(StorattrDto dto); - - /** - * 多选删除 - * @param ids / - */ - void deleteAll(Long[] ids); - - JSONObject getStor(Map whereJson); - - /** - * 改变启用状态 - * @param json - */ - void changeActive(JSONObject json); - -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/StructattrService.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/StructattrService.java deleted file mode 100644 index b316562..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/StructattrService.java +++ /dev/null @@ -1,72 +0,0 @@ - -package org.nl.wms.basedata.st.service; - -import com.alibaba.fastjson.JSONObject; -import org.nl.wms.basedata.st.service.dto.StructattrDto; -import org.springframework.data.domain.Pageable; - -import java.util.List; -import java.util.Map; - -/** -* @description 服务接口 -* @author zhouz -* @date 2021-12-09 -**/ -public interface StructattrService { - - /** - * 查询数据分页 - * @param whereJson 条件 - * @param page 分页参数 - * @return Map - */ - Map queryAll(Map whereJson, Pageable page); - - /** - * 查询所有数据不分页 - * @param whereJson 条件参数 - * @return List - */ - List queryAll(Map whereJson); - - /** - * 根据ID查询 - * @param struct_id ID - * @return Structattr - */ - StructattrDto findById(Long struct_id); - - /** - * 根据编码查询 - * @param code code - * @return Structattr - */ - StructattrDto findByCode(String code); - - - /** - * 创建 - * @param dto / - */ - void create(StructattrDto dto); - - /** - * 编辑 - * @param dto / - */ - void update(StructattrDto dto); - - /** - * 多选删除 - * @param ids / - */ - void deleteAll(Long[] ids); - - /** - * 改变启用状态 - * @param json - */ - void changeActive(JSONObject json); - -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/StructivtService.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/StructivtService.java deleted file mode 100644 index 70a5989..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/StructivtService.java +++ /dev/null @@ -1,72 +0,0 @@ - -package org.nl.wms.basedata.st.service; - -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import org.nl.wms.basedata.st.service.dto.StructivtDto; -import org.springframework.data.domain.Pageable; - -import java.util.List; -import java.util.Map; - -/** -* @description 服务接口 -* @author geng by -* @date 2022-06-02 -**/ -public interface StructivtService { - - /** - * 查询数据分页 - * @param whereJson 条件 - * @param page 分页参数 - * @return Map - */ - Map queryAll(Map whereJson, Pageable page); - - /** - * 查询所有数据不分页 - * @param whereJson 条件参数 - * @return List - */ - List queryAll(Map whereJson); - - /** - * 根据ID查询 - * @param stockrecord_id ID - * @return Structivt - */ - StructivtDto findById(Long stockrecord_id); - - /** - * 根据编码查询 - * @param code code - * @return Structivt - */ - StructivtDto findByCode(String code); - - - /** - * 创建 - * @param dto / - */ - void create(StructivtDto dto); - - /** - * 编辑 - * @param dto / - */ - void update(StructivtDto dto); - - /** - * 多选删除 - * @param ids / - */ - void deleteAll(Long[] ids); - - JSONArray getStruct(); - - JSONObject getStructById(JSONObject param); - - JSONArray getUnits(); -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/StructrelamaterialService.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/StructrelamaterialService.java deleted file mode 100644 index ca3b70d..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/StructrelamaterialService.java +++ /dev/null @@ -1,69 +0,0 @@ - -package org.nl.wms.basedata.st.service; - -import org.nl.wms.basedata.st.service.dto.StructrelamaterialDto; -import org.springframework.data.domain.Pageable; - -import java.util.List; -import java.util.Map; - -/** -* @description 服务接口 -* @author zhouz -* @date 2021-12-09 -**/ -public interface StructrelamaterialService { - - /** - * 查询数据分页 - * @param whereJson 条件 - * @param page 分页参数 - * @return Map - */ - Map queryAll(Map whereJson, Pageable page); - - /** - * 查询所有数据不分页 - * @param whereJson 条件参数 - * @return List - */ - List queryAll(Map whereJson); - - /** - * 根据ID查询 - * @param material_type_id ID - * @return Structrelamaterial - */ - StructrelamaterialDto findById(Long material_type_id); - - /** - * 根据编码查询 - * @param code code - * @return Structrelamaterial - */ - StructrelamaterialDto findByCode(String code); - - - /** - * 创建 - * @param dto / - */ - void create(StructrelamaterialDto dto); - - /** - * 编辑 - * @param dto / - */ - void update(StructrelamaterialDto dto); - - /** - * 多选删除 - * @param ids / - */ - void deleteAll(Long[] ids); - - void insertSet(Map whereJson); - - void delSet(Map whereJson); - -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/dto/MaterialsafeivtDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/dto/MaterialsafeivtDto.java deleted file mode 100644 index 861caff..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/dto/MaterialsafeivtDto.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.nl.wms.basedata.st.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-10 -**/ -@Data -public class MaterialsafeivtDto implements Serializable { - - /** 防止精度丢失 */ - @JsonSerialize(using= ToStringSerializer.class) - private Long stor_id; - - /** 防止精度丢失 */ - @JsonSerialize(using= ToStringSerializer.class) - private Long material_id; - - private BigDecimal safe_ivt_down; - - private BigDecimal safe_ivt_up; - - private Long qty_unit_id; - - private String qty_unit_name; - - private Long set_id; - - private String set_name; - - private String set_time; -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/dto/SectattrDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/dto/SectattrDto.java deleted file mode 100644 index be57048..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/dto/SectattrDto.java +++ /dev/null @@ -1,115 +0,0 @@ -package org.nl.wms.basedata.st.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-09 -**/ -@Data -public class SectattrDto implements Serializable { - - /** 库区标识 */ - /** 防止精度丢失 */ - @JsonSerialize(using= ToStringSerializer.class) - private Long sect_id; - - /** 库区编码 */ - private String sect_code; - - /** 库区名称 */ - private String sect_name; - - /** 库区简称 */ - private String simple_name; - - /** 库区类型 */ - private String sect_type_attr; - - /** 仓库标识 */ - private Long stor_id; - - /** 仓库名称 */ - private String stor_name; - - /** 仓库类型 */ - private String stor_type; - - /** 容量 */ - private BigDecimal capacity; - - /** 宽度 */ - private BigDecimal width; - - /** 高度 */ - private BigDecimal height; - - /** 深度 */ - private BigDecimal zdepth; - - /** 起始X坐标 */ - private BigDecimal xqty; - - /** 起始Y坐标 */ - private BigDecimal yqty; - - /** 起始Z坐标 */ - private BigDecimal zqty; - - /** 负责人 */ - private String sect_manager_name; - - /** 负责人电话 */ - private String mobile_no; - - /** 备注 */ - private String remark; - - /** 创建人 */ - private Long create_id; - - /** 创建人姓名 */ - private String create_name; - - /** 创建时间 */ - private String create_time; - - /** 修改人 */ - private Long update_optid; - - /** 修改人姓名 */ - private String update_optname; - - /** 修改时间 */ - private String update_time; - - /** 是否删除 */ - private String is_delete; - - /** 背景色 */ - private String back_ground_color; - - /** 前景色 */ - private String front_ground_color; - - /** 背景图片 */ - private String back_ground_pic; - - /** 字体显示方向 */ - private String font_direction_scode; - - /** 所在楼层 */ - private BigDecimal floor_no; - - /** 是否启用 */ - private String is_used; - - /** 外部标识 */ - private String ext_id; -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/dto/StorattrDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/dto/StorattrDto.java deleted file mode 100644 index fb16efe..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/dto/StorattrDto.java +++ /dev/null @@ -1,106 +0,0 @@ -package org.nl.wms.basedata.st.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-08 -**/ -@Data -public class StorattrDto implements Serializable { - - /** 防止精度丢失 */ - @JsonSerialize(using= ToStringSerializer.class) - private Long stor_id; - - /** 仓库编码 */ - private String stor_code; - - /** 仓库名称 */ - private String stor_name; - - /** 简称 */ - private String simple_name; - - /** 容量 */ - private BigDecimal stor_capacity; - - /** 总面积(㎡) */ - private BigDecimal total_area; - - /** 仓库性质 */ - private String stor_type_scode; - - private String is_virtualstore; - - private String is_semi_finished; - - private String is_materialstore; - - private String is_productstore; - - private String is_reversed; - - private String is_mvout_auto_cfm; - - private String is_mvin_auto_cfm; - - private String area; - - /** 地址 */ - private String storea_ddress; - - /** 负责人 */ - private String principal; - - /** 联系电话 */ - private String office_phone; - - private String mobile_no; - - /** 备注 */ - private String remark; - - private BigDecimal order_index; - - private String whstate_scode; - - /** 是否启用 */ - private String is_used; - - private String base_class_id; - - private Long create_id; - - private String create_name; - - private String create_time; - - private Long update_optid; - - private String update_optname; - - private String update_time; - - private Long sysownerid; - - private Long sysdeptid; - - private Long syscompanyid; - - private String is_delete; - - private String ext_id; - - private String depart_name; - - private String company_name; - - private String is_attachment; -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/dto/StructattrDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/dto/StructattrDto.java deleted file mode 100644 index 6b4fb95..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/dto/StructattrDto.java +++ /dev/null @@ -1,145 +0,0 @@ -package org.nl.wms.basedata.st.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-09 -**/ -@Data -public class StructattrDto implements Serializable { - - /** 仓位标识 */ - /** 防止精度丢失 */ - @JsonSerialize(using= ToStringSerializer.class) - private Long struct_id; - - /** 仓位编码 */ - private String struct_code; - - /** 仓位名称 */ - private String struct_name; - - /** 仓位简称 */ - private String simple_name; - - /** 库区标识 */ - private Long sect_id; - - /** 库区编码 */ - private String sect_code; - - /** 库区名称 */ - private String sect_name; - - /** 仓库标识 */ - private Long stor_id; - - /** 仓库编码 */ - private String stor_code; - - /** 仓库名称 */ - private String stor_name; - - /** 仓库类型 */ - private String stor_type; - - /** 容量 */ - private BigDecimal capacity; - - /** 宽度 */ - private BigDecimal width; - - /** 高度 */ - private BigDecimal height; - - /** 深度 */ - private BigDecimal zdepth; - - /** 承受重量 */ - private BigDecimal weight; - - /** 起始X坐标 */ - private BigDecimal xqty; - - /** 起始Y坐标 */ - private BigDecimal yqty; - - /** 起始Z坐标 */ - private BigDecimal zqty; - - /** 是否临时仓位 */ - private String is_tempstruct; - - /** 创建人 */ - private Long create_id; - - /** 创建人姓名 */ - private String create_name; - - /** 创建时间 */ - private String create_time; - - /** 修改人 */ - private Long update_optid; - - /** 修改人姓名 */ - private String update_optname; - - /** 修改时间 */ - private String update_time; - - /** 是否删除 */ - private String is_delete; - - /** 背景色 */ - private String back_ground_color; - - /** 前景色 */ - private String front_ground_color; - - /** 背景图片 */ - private String back_ground_pic; - - /** 字体显示方向 */ - private String font_direction_scode; - - /** 是否启用 */ - private String is_used; - - /** 是否判断高度 */ - private String is_zdepth; - - /** 存储载具标识 */ - private Long storagevehicle_id; - - /** 存储载具号 */ - private String storagevehicle_code; - - /** 存储载具类型 */ - private String storagevehicle_type; - - /** 是否空载具 */ - private String is_emptyvehicle; - - /** 载具数量 */ - private BigDecimal storagevehicle_qty; - - /** 锁定类型 */ - private String lock_type; - - /** 物料高度类型 */ - private String material_height_type; - - /** 外部标识 */ - private String ext_id; - - /** 备注 */ - private String remark; -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/dto/StructivtDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/dto/StructivtDto.java deleted file mode 100644 index cc9fdef..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/dto/StructivtDto.java +++ /dev/null @@ -1,64 +0,0 @@ -package org.nl.wms.basedata.st.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 geng by -* @date 2022-06-02 -**/ -@Data -public class StructivtDto implements Serializable { - - /** 库存记录标识 */ - /** 防止精度丢失 */ - @JsonSerialize(using= ToStringSerializer.class) - private Long stockrecord_id; - - /** 仓位标识 */ - private Long struct_id; - - /** 仓位编码 */ - private String struct_code; - - /** 仓位名称 */ - private String struct_name; - - /** 工序标识 */ - private Long workprocedure_id; - - /** 物料标识 */ - private Long material_id; - - /** 品质类型 */ - private String quality_scode; - - /** 批次 */ - private String pcsn; - - /** 可用数 */ - private BigDecimal canuse_qty; - - /** 冻结数 */ - private BigDecimal frozen_qty; - - /** 库存数 */ - private BigDecimal ivt_qty; - - /** 待入数 */ - private BigDecimal warehousing_qty; - - /** 计量单位标识 */ - private Long qty_unit_id; - - /** 入库时间 */ - private String instorage_time; - - /** 销售单标识 */ - private Long sale_id; -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/dto/StructrelamaterialDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/dto/StructrelamaterialDto.java deleted file mode 100644 index 42e1027..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/dto/StructrelamaterialDto.java +++ /dev/null @@ -1,30 +0,0 @@ -package org.nl.wms.basedata.st.service.dto; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import lombok.Data; - -import java.io.Serializable; - -/** -* @description / -* @author zhouz -* @date 2021-12-09 -**/ -@Data -public class StructrelamaterialDto implements Serializable { - - /** 防止精度丢失 */ - @JsonSerialize(using= ToStringSerializer.class) - private Long sect_id; - - /** 防止精度丢失 */ - @JsonSerialize(using= ToStringSerializer.class) - private Long material_type_id; - - private Long set_id; - - private String set_name; - - private String set_time; -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/SectattrServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/SectattrServiceImpl.java deleted file mode 100644 index c13a641..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/SectattrServiceImpl.java +++ /dev/null @@ -1,251 +0,0 @@ - -package org.nl.wms.basedata.st.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 lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.modules.common.exception.BadRequestException; -import org.nl.modules.common.utils.SecurityUtils; -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.st.service.SectattrService; -import org.nl.wms.basedata.st.service.StorattrService; -import org.nl.wms.basedata.st.service.dto.SectattrDto; -import org.nl.wms.basedata.st.service.dto.StorattrDto; -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.HashMap; -import java.util.List; -import java.util.Map; - -/** - * @author zhouz - * @description 服务实现 - * @date 2021-12-09 - **/ -@Service -@RequiredArgsConstructor -@Slf4j -public class SectattrServiceImpl implements SectattrService { - - @Autowired - private StorattrService storattrService; - - @Override - public Map queryAll(Map whereJson, Pageable page) { - String search = (String) whereJson.get("search"); - HashMap map = new HashMap<>(); - if (!StrUtil.isEmpty(search)) { - map.put("search", "%" + search + "%"); - } - map.put("flag", "1"); - map.put("stor_id", (String) whereJson.get("stor_id")); - JSONObject jo = WQL.getWO("QST_SECT_ATTR").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "update_time desc"); - return jo; - } - - @Override - public List queryAll(Map whereJson) { - WQLObject wo = WQLObject.getWQLObject("st_ivt_sectattr"); - JSONArray arr = wo.query().getResultJSONArray(0); - List list = arr.toJavaList(SectattrDto.class); - return list; - } - - @Override - public SectattrDto findById(Long sect_id) { - WQLObject wo = WQLObject.getWQLObject("st_ivt_sectattr"); - JSONObject json = wo.query("sect_id =" + sect_id + "").uniqueResult(0); - if (ObjectUtil.isEmpty(json)) return null; - final SectattrDto obj = json.toJavaObject(SectattrDto.class); - return obj; - } - - @Override - public SectattrDto findByCode(String code) { - WQLObject wo = WQLObject.getWQLObject("st_ivt_sectattr"); - JSONObject json = wo.query("sect_code ='" + code + "'").uniqueResult(0); - if (ObjectUtil.isEmpty(json)) return null; - final SectattrDto obj = json.toJavaObject(SectattrDto.class); - return obj; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void create(SectattrDto dto) { - String sect_code = dto.getSect_code(); - SectattrDto sectattrDto = this.findByCode(sect_code); - if (sectattrDto != null && sectattrDto.getIs_delete().equals("0")) { - throw new BadRequestException("存在相同的库区编号"); - } - Long currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - String now = DateUtil.now(); - - dto.setSect_id(IdUtil.getSnowflake(1, 1).nextId()); - dto.setCreate_id(currentUserId); - dto.setCreate_name(nickName); - dto.setUpdate_optid(currentUserId); - dto.setUpdate_optname(nickName); - dto.setUpdate_time(now); - dto.setCreate_time(now); - StorattrDto storattrDto = storattrService.findById(dto.getStor_id()); - dto.setStor_name(storattrDto.getStor_name()); - - WQLObject wo = WQLObject.getWQLObject("st_ivt_sectattr"); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - wo.insert(json); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(SectattrDto dto) { - SectattrDto entity = this.findById(dto.getSect_id()); - if (entity == null) { - throw new BadRequestException("被删除或无权限，操作失败!"); - } - - String sect_code = dto.getSect_code(); - SectattrDto sectattrDto = this.findByCode(sect_code); - if (sectattrDto != null && !dto.getSect_id().equals(sectattrDto.getSect_id()) && sectattrDto.getIs_delete().equals("0")) { - throw new BadRequestException("存在相同的库区编号"); - } - - Long currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - - String now = DateUtil.now(); - dto.setUpdate_time(now); - dto.setUpdate_optid(currentUserId); - dto.setUpdate_optname(nickName); - StorattrDto storattrDto = storattrService.findById(dto.getStor_id()); - dto.setStor_name(storattrDto.getStor_name()); - - WQLObject wo = WQLObject.getWQLObject("st_ivt_sectattr"); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - wo.update(json); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void deleteAll(Long[] ids) { - Long currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - String now = DateUtil.now(); - - WQLObject wo = WQLObject.getWQLObject("st_ivt_sectattr"); - for (Long sect_id : ids) { - JSONObject param = new JSONObject(); - param.put("sect_id", String.valueOf(sect_id)); - param.put("is_delete", "1"); - param.put("update_optid", currentUserId); - param.put("update_optname", nickName); - param.put("update_time", now); - wo.update(param); - } - } - - @Override - public JSONObject getSect(Map whereJson) { - JSONArray new_ja = new JSONArray(); - HashMap stor_map = new HashMap<>(); - stor_map.put("flag", "2"); - String is_materialstore = (String) whereJson.get("is_materialstore"); - String is_virtualstore = (String) whereJson.get("is_virtualstore"); - String is_semi_finished = (String) whereJson.get("is_semi_finished"); - String is_productstore = (String) whereJson.get("is_productstore"); - String is_attachment = (String) whereJson.get("is_attachment"); - String is_reversed = (String) whereJson.get("is_reversed"); - if (!StrUtil.isEmpty(is_materialstore)) { - stor_map.put("is_materialstore", is_materialstore); - } - if (!StrUtil.isEmpty(is_virtualstore)) { - stor_map.put("is_virtualstore", is_virtualstore); - } - if (!StrUtil.isEmpty(is_semi_finished)) { - stor_map.put("is_semi_finished", is_semi_finished); - } - if (!StrUtil.isEmpty(is_productstore)) { - stor_map.put("is_productstore", is_productstore); - } - if (!StrUtil.isEmpty(is_attachment)) { - stor_map.put("is_attachment", is_attachment); - } - if (!StrUtil.isEmpty(is_reversed)) { - stor_map.put("is_reversed", is_reversed); - } - JSONArray stor_ja = WQL.getWO("QST_STOR_ATTR").addParamMap(stor_map).process().getResultJSONArray(0); - for (int i = 0; i < stor_ja.size(); i++) { - JSONObject stor_jo = stor_ja.getJSONObject(i); - JSONObject stor_cas = new JSONObject(); - stor_cas.put("value", stor_jo.getString("stor_id")); - stor_cas.put("label", stor_jo.getString("stor_name")); - HashMap map = new HashMap<>(); - map.put("flag", "2"); - map.put("stor_id", stor_jo.getString("stor_id")); - map.put("sect_type_attr", (String) whereJson.get("sect_type_attr")); - JSONArray ja = WQL.getWO("QST_SECT_ATTR").addParamMap(map).process().getResultJSONArray(0); - if (ja.size() > 0) { - JSONArray sect_ja = new JSONArray(); - for (int j = 0; j < ja.size(); j++) { - JSONObject sect_jo = ja.getJSONObject(j); - JSONObject sect_cas = new JSONObject(); - sect_cas.put("value", sect_jo.getString("sect_id")); - sect_cas.put("label", sect_jo.getString("sect_name")); - sect_ja.add(sect_cas); - } - stor_cas.put("children", sect_ja); - } - new_ja.add(stor_cas); - } - JSONObject jo = new JSONObject(); - jo.put("content", new_ja); - return jo; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void changeActive(JSONObject json) { - - String stor_id = json.getString("stor_id"); - JSONObject st_ivt_bsRealStorAttr = WQLObject.getWQLObject("ST_IVT_BSRealStorAttr").query(" stor_id = '" + stor_id + "' and is_used = '1'").uniqueResult(0); - if (ObjectUtil.isEmpty(st_ivt_bsRealStorAttr)){ - throw new BadRequestException("该库区所属的仓库已禁用，请先启用该仓库!"); - } - - Long currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - String now = DateUtil.now(); - - String is_used = "1"; - if (StrUtil.equals("1", json.getString("is_used"))) { - is_used = "0"; - } - json.put("is_used", is_used); - json.put("update_optid", currentUserId); - json.put("update_optname", nickName); - json.put("update_time", now); - WQLObject.getWQLObject("st_ivt_sectattr").update(json); - - String sect_id = json.getString("sect_id"); - json = new JSONObject(); - json.put("sect_id",sect_id); - json.put("is_used", is_used); - json.put("update_optid", currentUserId); - json.put("update_optname", nickName); - json.put("update_time", now); - WQLObject.getWQLObject("st_ivt_structattr").update(json," sect_id = '" + sect_id + "'"); - } - -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StorattrServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StorattrServiceImpl.java deleted file mode 100644 index b27d281..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StorattrServiceImpl.java +++ /dev/null @@ -1,219 +0,0 @@ - -package org.nl.wms.basedata.st.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 lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.modules.common.exception.BadRequestException; -import org.nl.modules.common.utils.SecurityUtils; -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.st.service.StorattrService; -import org.nl.wms.basedata.st.service.dto.StorattrDto; -import org.springframework.data.domain.Pageable; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * @author zhouz - * @description 服务实现 - * @date 2021-12-08 - **/ -@Service -@RequiredArgsConstructor -@Slf4j -public class StorattrServiceImpl implements StorattrService { - - @Override - public Map queryAll(Map whereJson, Pageable page) { - String search = (String) whereJson.get("search"); - HashMap map = new HashMap<>(); - if (!StrUtil.isEmpty(search)) { - map.put("search", "%" + search + "%"); - } - map.put("flag", "1"); - JSONObject jo = WQL.getWO("QST_STOR_ATTR").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "update_time desc"); - return jo; - } - - @Override - public List queryAll(Map whereJson) { - WQLObject wo = WQLObject.getWQLObject("st_ivt_bsrealstorattr"); - JSONArray arr = wo.query().getResultJSONArray(0); - List list = arr.toJavaList(StorattrDto.class); - return list; - } - - @Override - public StorattrDto findById(Long stor_id) { - WQLObject wo = WQLObject.getWQLObject("st_ivt_bsrealstorattr"); - JSONObject json = wo.query("stor_id =" + stor_id + "").uniqueResult(0); - if (ObjectUtil.isEmpty(json)) return null; - final StorattrDto obj = json.toJavaObject(StorattrDto.class); - return obj; - } - - @Override - public StorattrDto findByCode(String code) { - WQLObject wo = WQLObject.getWQLObject("st_ivt_bsrealstorattr"); - JSONObject json = wo.query("stor_code ='" + code + "'").uniqueResult(0); - if (ObjectUtil.isEmpty(json)) return null; - final StorattrDto obj = json.toJavaObject(StorattrDto.class); - return obj; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void create(StorattrDto dto) { - String stor_code = dto.getStor_code(); - StorattrDto storattrDto = this.findByCode(stor_code); - if (storattrDto != null && storattrDto.getIs_delete().equals("0")) { - throw new BadRequestException("存在相同的仓库编号"); - } - Long currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - String now = DateUtil.now(); - - dto.setStor_id(IdUtil.getSnowflake(1, 1).nextId()); - dto.setCreate_id(currentUserId); - dto.setCreate_name(nickName); - dto.setUpdate_optid(currentUserId); - dto.setUpdate_optname(nickName); - dto.setUpdate_time(now); - dto.setCreate_time(now); - - //TODO - dto.setSyscompanyid(18L); - - WQLObject wo = WQLObject.getWQLObject("st_ivt_bsrealstorattr"); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - wo.insert(json); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(StorattrDto dto) { - StorattrDto entity = this.findById(dto.getStor_id()); - if (entity == null) { - throw new BadRequestException("被删除或无权限，操作失败!"); - } - - String stor_code = dto.getStor_code(); - StorattrDto storattrDto = this.findByCode(stor_code); - if (storattrDto != null && !dto.getStor_id().equals(storattrDto.getStor_id()) && storattrDto.getIs_delete().equals("0")) { - throw new BadRequestException("存在相同的供应商编号"); - } - - Long currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - - String now = DateUtil.now(); - dto.setUpdate_time(now); - dto.setUpdate_optid(currentUserId); - dto.setUpdate_optname(nickName); - dto.setSyscompanyid(dto.getSysdeptid()); - - WQLObject wo = WQLObject.getWQLObject("st_ivt_bsrealstorattr"); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - wo.update(json); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void deleteAll(Long[] ids) { - Long currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - String now = DateUtil.now(); - - WQLObject wo = WQLObject.getWQLObject("st_ivt_bsrealstorattr"); - for (Long stor_id : ids) { - JSONObject param = new JSONObject(); - param.put("stor_id", String.valueOf(stor_id)); - param.put("is_delete", "1"); - param.put("update_optid", currentUserId); - param.put("update_optname", nickName); - param.put("update_time", now); - wo.update(param); - } - } - - @Override - public JSONObject getStor(Map whereJson) { - String is_materialstore = (String) whereJson.get("is_materialstore"); - String is_virtualstore = (String) whereJson.get("is_virtualstore"); - String is_semi_finished = (String) whereJson.get("is_semi_finished"); - String is_productstore = (String) whereJson.get("is_productstore"); - String is_attachment = (String) whereJson.get("is_attachment"); - String is_reversed = (String) whereJson.get("is_reversed"); - HashMap map = new HashMap<>(); - map.put("flag", "2"); - if (!StrUtil.isEmpty(is_materialstore)) { - map.put("is_materialstore", is_materialstore); - } - if (!StrUtil.isEmpty(is_virtualstore)) { - map.put("is_virtualstore", is_virtualstore); - } - if (!StrUtil.isEmpty(is_semi_finished)) { - map.put("is_semi_finished", is_semi_finished); - } - if (!StrUtil.isEmpty(is_productstore)) { - map.put("is_productstore", is_productstore); - } - if (!StrUtil.isEmpty(is_attachment)) { - map.put("is_attachment", is_attachment); - } - if (!StrUtil.isEmpty(is_reversed)) { - map.put("is_reversed", is_reversed); - } - JSONArray ja = WQL.getWO("QST_STOR_ATTR").addParamMap(map).process().getResultJSONArray(0); - JSONObject jo = new JSONObject(); - jo.put("content", ja); - return jo; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void changeActive(JSONObject json) { - Long currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - String now = DateUtil.now(); - - String is_used = "1"; - if (StrUtil.equals("1", json.getString("is_used"))) { - is_used = "0"; - } - json.put("is_used", is_used); - json.put("update_optid", currentUserId); - json.put("update_optname", nickName); - json.put("update_time", now); - WQLObject.getWQLObject("ST_IVT_BSRealStorAttr").update(json); - - //同时修改该stor_id仓库下仓位和库区的启用状态 - String stor_id = json.getString("stor_id"); - json = new JSONObject(); - json.put("is_used", is_used); - json.put("update_optid", currentUserId); - json.put("update_optname", nickName); - json.put("update_time", now); - WQLObject.getWQLObject("st_ivt_structattr").update(json, "stor_id = '" + stor_id + "'"); - - json = new JSONObject(); - json.put("is_used", is_used); - json.put("update_optid", currentUserId); - json.put("update_optname", nickName); - json.put("update_time", now); - WQLObject.getWQLObject("st_ivt_sectattr").update(json, "stor_id = '" + stor_id + "'"); - } -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructattrServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructattrServiceImpl.java deleted file mode 100644 index 6c55e91..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructattrServiceImpl.java +++ /dev/null @@ -1,248 +0,0 @@ - -package org.nl.wms.basedata.st.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 lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.modules.common.exception.BadRequestException; -import org.nl.modules.common.utils.SecurityUtils; -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.st.service.SectattrService; -import org.nl.wms.basedata.st.service.StorattrService; -import org.nl.wms.basedata.st.service.StructattrService; -import org.nl.wms.basedata.st.service.dto.SectattrDto; -import org.nl.wms.basedata.st.service.dto.StorattrDto; -import org.nl.wms.basedata.st.service.dto.StructattrDto; - -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.HashMap; -import java.util.List; -import java.util.Map; - -/** - * @author zhouz - * @description 服务实现 - * @date 2021-12-09 - **/ -@Service -@RequiredArgsConstructor -@Slf4j -public class StructattrServiceImpl implements StructattrService { - - @Autowired - private SectattrService sectattrService; - @Autowired - private StorattrService storattrService; - - @Override - public Map queryAll(Map whereJson, Pageable page) { - String search = (String) whereJson.get("search"); - HashMap map = new HashMap<>(); - if (StrUtil.isNotEmpty(search)) { - map.put("search", "%" + search + "%"); - } - map.put("flag", "1"); - map.put("stor_id", (String) whereJson.get("stor_id")); - map.put("sect_id", (String) whereJson.get("sect_id")); - map.put("lock_type", (String) whereJson.get("lock_type")); - JSONObject jo = WQL.getWO("QST_STRUCT_ATTR").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "struct_code asc"); - return jo; - } - - @Override - public List queryAll(Map whereJson) { - WQLObject wo = WQLObject.getWQLObject("st_ivt_structattr"); - JSONArray arr = wo.query().getResultJSONArray(0); - List list = arr.toJavaList(StructattrDto.class); - return list; - } - - @Override - public StructattrDto findById(Long struct_id) { - WQLObject wo = WQLObject.getWQLObject("st_ivt_structattr"); - JSONObject json = wo.query("struct_id =" + struct_id + "").uniqueResult(0); - if (ObjectUtil.isEmpty(json)) return null; - final StructattrDto obj = json.toJavaObject(StructattrDto.class); - return obj; - } - - @Override - public StructattrDto findByCode(String code) { - WQLObject wo = WQLObject.getWQLObject("st_ivt_structattr"); - JSONObject json = wo.query("struct_code ='" + code + "'").uniqueResult(0); - if (ObjectUtil.isEmpty(json)) return null; - final StructattrDto obj = json.toJavaObject(StructattrDto.class); - return obj; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void create(StructattrDto dto) { - String struct_code = dto.getStruct_code(); - StructattrDto structattrDto = this.findByCode(struct_code); - if (structattrDto != null && structattrDto.getIs_delete().equals("0")) { - throw new BadRequestException("存在相同的库区编号"); - } - Long currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - String now = DateUtil.now(); - - dto.setStruct_id(IdUtil.getSnowflake(1, 1).nextId()); - dto.setCreate_id(currentUserId); - dto.setCreate_name(nickName); - dto.setUpdate_optid(currentUserId); - dto.setUpdate_optname(nickName); - dto.setUpdate_time(now); - dto.setCreate_time(now); - SectattrDto sectattrDto = sectattrService.findById(dto.getSect_id()); - StorattrDto storattrDto = storattrService.findById(sectattrDto.getStor_id()); - dto.setSect_code(sectattrDto.getSect_code()); - dto.setSect_name(sectattrDto.getSect_name()); - dto.setStor_id(storattrDto.getStor_id()); - dto.setStor_code(storattrDto.getStor_code()); - dto.setStor_name(storattrDto.getStor_name()); - - String storagevehicle_code = dto.getStoragevehicle_code(); - if (ObjectUtil.isNotEmpty(storagevehicle_code)) { - WQLObject vehicleTab = WQLObject.getWQLObject("md_pb_storagevehicleinfo"); - JSONObject obj = vehicleTab.query("storagevehicle_code = '" + storagevehicle_code + "'").uniqueResult(0); - if (ObjectUtil.isEmpty(obj)) throw new BadRequestException("未发现载具号为【" + storagevehicle_code + "】的载具信息"); - - dto.setStoragevehicle_id(obj.getLong - ("storagevehicle_id")); - dto.setStoragevehicle_type(obj.getString("storagevehicle_type")); - } - - - WQLObject wo = WQLObject.getWQLObject("st_ivt_structattr"); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - wo.insert(json); - - //根据仓位更新点位载具和锁定信息 - // 点位基础表【SCH_BASE_Point】 -/* JSONObject param = new JSONObject(); - param.put("is_used", dto.getIs_used()); - param.put("vehicle_code", dto.getStoragevehicle_code()); - param.put("lock_type", dto.getLock_type()); - WQLObject.getWQLObject("SCH_BASE_Point").update(param, "point_code = '" + dto.getStruct_code() + "'");*/ - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(StructattrDto dto) { - StructattrDto entity = this.findById(dto.getStruct_id()); - if (entity == null) { - throw new BadRequestException("被删除或无权限，操作失败!"); - } - - String struct_code = dto.getStruct_code(); - StructattrDto structattrDto = this.findByCode(struct_code); - if (structattrDto != null && !dto.getStruct_id().equals(structattrDto.getStruct_id()) && structattrDto.getIs_delete().equals("0")) { - throw new BadRequestException("存在相同的库区编号"); - } - - Long currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - - String now = DateUtil.now(); - dto.setUpdate_time(now); - dto.setUpdate_optid(currentUserId); - dto.setUpdate_optname(nickName); - SectattrDto sectattrDto = sectattrService.findById(dto.getSect_id()); - StorattrDto storattrDto = storattrService.findById(sectattrDto.getStor_id()); - dto.setSect_code(sectattrDto.getSect_code()); - dto.setSect_name(sectattrDto.getSect_name()); - dto.setStor_id(storattrDto.getStor_id()); - dto.setStor_code(storattrDto.getStor_code()); - dto.setStor_name(storattrDto.getStor_name()); - - String storagevehicle_code = dto.getStoragevehicle_code(); - if (ObjectUtil.isNotEmpty(storagevehicle_code)) { - WQLObject vehicleTab = WQLObject.getWQLObject("md_pb_storagevehicleinfo"); - JSONObject obj = vehicleTab.query("storagevehicle_code = '" + storagevehicle_code + "'").uniqueResult(0); - if (ObjectUtil.isEmpty(obj)) throw new BadRequestException("未发现载具号为【" + storagevehicle_code + "】的载具信息"); - - dto.setStoragevehicle_id(obj.getLong - ("storagevehicle_id")); - dto.setStoragevehicle_type(obj.getString("storagevehicle_type")); - } - - - WQLObject wo = WQLObject.getWQLObject("st_ivt_structattr"); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - wo.update(json); - -/* //根据仓位更新点位载具和锁定信息 - // 点位基础表【SCH_BASE_Point】 - JSONObject param = new JSONObject(); - param.put("is_used", dto.getIs_used()); - param.put("vehicle_code", dto.getStoragevehicle_code()); - param.put("lock_type", dto.getLock_type()); - WQLObject.getWQLObject("SCH_BASE_Point").update(param, "point_code = '" + dto.getStruct_code() + "'");*/ - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void deleteAll(Long[] ids) { - Long currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - String now = DateUtil.now(); - - WQLObject wo = WQLObject.getWQLObject("st_ivt_structattr"); - for (Long struct_id : ids) { - JSONObject param = new JSONObject(); - param.put("struct_id", String.valueOf(struct_id)); - param.put("is_delete", "1"); - param.put("update_optid", currentUserId); - param.put("update_optname", nickName); - param.put("update_time", now); - wo.update(param); - } - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void changeActive(JSONObject json) { - - String sect_id = json.getString("sect_id"); - JSONObject st_ivt_bsRealStorAttr = WQLObject.getWQLObject("ST_IVT_SectAttr").query(" sect_id = '" + sect_id + "' and is_used = '1'").uniqueResult(0); - if (ObjectUtil.isEmpty(st_ivt_bsRealStorAttr)){ - throw new BadRequestException("该仓位所属的库区已禁用，请先启用该库区!"); - } - Long currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - String struct_id = json.getString("struct_id"); - String now = DateUtil.now(); - - String is_used = "1"; - if (StrUtil.equals("1", json.getString("is_used"))) { - is_used = "0"; - } - json.put("is_used", is_used); - json.put("update_optid", currentUserId); - json.put("update_optname", nickName); - json.put("update_time", now); - WQLObject.getWQLObject("st_ivt_structattr").update(json); - - json = new JSONObject(); - json.put("is_used", is_used); - json.put("update_optid", currentUserId); - json.put("update_optname", nickName); - json.put("update_time", now); - WQLObject.getWQLObject("sch_base_point").update(json, " point_id = '" + struct_id + "'"); - } - -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java deleted file mode 100644 index c0877b9..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java +++ /dev/null @@ -1,151 +0,0 @@ - -package org.nl.wms.basedata.st.service.impl; - - -import cn.hutool.core.date.DateUtil; -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 lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; - - -import org.nl.modules.common.exception.BadRequestException; -import org.nl.modules.common.utils.SecurityUtils; -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.service.ClassstandardService; -import org.nl.wms.basedata.st.service.StructivtService; -import org.nl.wms.basedata.st.service.dto.StructivtDto; - -import org.springframework.data.domain.Pageable; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; -import java.util.Map; - -/** -* @description 服务实现 -* @author geng by -* @date 2022-06-02 -**/ -@Service -@RequiredArgsConstructor -@Slf4j -public class StructivtServiceImpl implements StructivtService { - private final ClassstandardService classstandardService; - - @Override - public Map queryAll(Map whereJson, Pageable page){ - String material = MapUtil.getStr(whereJson, "material"); - String struct = MapUtil.getStr(whereJson, "struct"); - String region_id = MapUtil.getStr(whereJson, "region_id"); - JSONObject map = new JSONObject(); - map.put("flag", "1"); - map.put("region_id", region_id); - if (StrUtil.isNotEmpty(material)) { - map.put("material", "%" + material + "%"); - } - if (StrUtil.isNotEmpty(struct)) { - map.put("struct", "%" + struct + "%"); - } - JSONObject jsonObject = WQL.getWO("QST_STRUCTIVT001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "ivt.instorage_time desc"); - return jsonObject; - } - - @Override - public List queryAll(Map whereJson){ - WQLObject wo = WQLObject.getWQLObject("st_ivt_structivt"); - JSONArray arr = wo.query().getResultJSONArray(0); - if (ObjectUtil.isNotEmpty(arr)) return arr.toJavaList(StructivtDto.class); - return null; - } - - @Override - public StructivtDto findById(Long stockrecord_id) { - WQLObject wo = WQLObject.getWQLObject("st_ivt_structivt"); - JSONObject json = wo.query("stockrecord_id = '" + stockrecord_id + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(json)){ - return json.toJavaObject( StructivtDto.class); - } - return null; - } - - @Override - public StructivtDto findByCode(String code) { - WQLObject wo = WQLObject.getWQLObject("st_ivt_structivt"); - JSONObject json = wo.query("code ='" + code + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(json)){ - return json.toJavaObject( StructivtDto.class); - } - return null; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void create(StructivtDto dto) { - String now = DateUtil.now(); - dto.setStockrecord_id(IdUtil.getSnowflake(1, 1).nextId()); - dto.setInstorage_time(now); - WQLObject wo = WQLObject.getWQLObject("st_ivt_structivt"); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - wo.insert(json); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(StructivtDto dto) { - StructivtDto entity = this.findById(dto.getStockrecord_id()); - if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!"); - WQLObject wo = WQLObject.getWQLObject("st_ivt_structivt"); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - wo.update(json); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void deleteAll(Long[] ids) { - Long currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - String now = DateUtil.now(); - - WQLObject wo = WQLObject.getWQLObject("st_ivt_structivt"); - for (Long stockrecord_id: ids) { - JSONObject param = new JSONObject(); - param.put("stockrecord_id", String.valueOf(stockrecord_id)); - param.put("is_delete", "1"); - param.put("update_optid", currentUserId); - param.put("update_optname", nickName); - param.put("update_time", now); - wo.update(param); - } - } - - @Override - public JSONArray getStruct() { - WQLObject wo = WQLObject.getWQLObject("st_ivt_structattr"); - final JSONArray resultJSONArray = wo.query("is_delete = '0'").getResultJSONArray(0); - return resultJSONArray; - } - - @Override - public JSONObject getStructById(JSONObject param) { - WQLObject wo = WQLObject.getWQLObject("st_ivt_structattr"); - final JSONObject jsonObject = wo.query("is_delete = '0' and struct_id = '" + param.getString("struct_id") + "'").uniqueResult(0); - return jsonObject; - } - - @Override - public JSONArray getUnits() { - WQLObject wo = WQLObject.getWQLObject("md_pb_measureunit"); - final JSONArray resultJSONArray = wo.query("is_delete = '0'").getResultJSONArray(0); - return resultJSONArray; - } - -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructrelamaterialServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructrelamaterialServiceImpl.java deleted file mode 100644 index dbe3f2f..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructrelamaterialServiceImpl.java +++ /dev/null @@ -1,179 +0,0 @@ - -package org.nl.wms.basedata.st.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 lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; - - -import org.nl.modules.common.exception.BadRequestException; -import org.nl.modules.common.utils.SecurityUtils; -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.service.ClassstandardService; -import org.nl.wms.basedata.st.service.StructrelamaterialService; -import org.nl.wms.basedata.st.service.dto.StructrelamaterialDto; - -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; - -/** - * @author zhouz - * @description 服务实现 - * @date 2021-12-09 - **/ -@Service -@RequiredArgsConstructor -@Slf4j -public class StructrelamaterialServiceImpl implements StructrelamaterialService { - private final ClassstandardService classstandardService; - - @Override - public Map queryAll(Map whereJson, Pageable page) { - String search = (String) whereJson.get("search"); - HashMap map = new HashMap<>(); - if (!StrUtil.isEmpty(search)) { - map.put("search", "%" + search + "%"); - } - map.put("flag", "1"); - map.put("stor_id", (String) whereJson.get("stor_id")); - map.put("sect_id", (String) whereJson.get("sect_id")); - String material_type_id = (String) whereJson.get("material_type_id"); - String class_idStr = (String) whereJson.get("class_idStr"); - //处理物料当前节点的所有子节点 - if (!StrUtil.isEmpty(material_type_id)) { - map.put("material_type_id", material_type_id); - String classIds = classstandardService.getChildIdStr(material_type_id); - map.put("classIds", classIds); - } else if (ObjectUtil.isNotEmpty(class_idStr)) { - String classIds = classstandardService.getAllChildIdStr(class_idStr); - map.put("classIds", classIds); - } - JSONObject jo = WQL.getWO("QST_IVT_MATERIALSET").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "set_time desc"); - return jo; - } - - @Override - public List queryAll(Map whereJson) { - WQLObject wo = WQLObject.getWQLObject("st_ivt_structrelamaterial"); - JSONArray arr = wo.query().getResultJSONArray(0); - List list = arr.toJavaList(StructrelamaterialDto.class); - return list; - } - - @Override - public StructrelamaterialDto findById(Long material_type_id) { - WQLObject wo = WQLObject.getWQLObject("st_ivt_structrelamaterial"); - JSONObject json = wo.query("material_type_id =" + material_type_id + "").uniqueResult(0); - final StructrelamaterialDto obj = json.toJavaObject(StructrelamaterialDto.class); - return obj; - } - - @Override - public StructrelamaterialDto findByCode(String code) { - WQLObject wo = WQLObject.getWQLObject("st_ivt_structrelamaterial"); - JSONObject json = wo.query("code ='" + code + "'").uniqueResult(0); - final StructrelamaterialDto obj = json.toJavaObject(StructrelamaterialDto.class); - return obj; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void create(StructrelamaterialDto dto) { - Long currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - String now = DateUtil.now(); - - dto.setMaterial_type_id(IdUtil.getSnowflake(1, 1).nextId()); - dto.setSet_name(nickName); - dto.setSet_time(now); - - WQLObject wo = WQLObject.getWQLObject("st_ivt_structrelamaterial"); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - wo.insert(json); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(StructrelamaterialDto dto) { - StructrelamaterialDto entity = this.findById(dto.getMaterial_type_id()); - if (entity == null) { - throw new BadRequestException("被删除或无权限，操作失败!"); - } - - WQLObject wo = WQLObject.getWQLObject("st_ivt_structrelamaterial"); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - wo.update(json); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void deleteAll(Long[] ids) { - Long currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - String now = DateUtil.now(); - - WQLObject wo = WQLObject.getWQLObject("st_ivt_structrelamaterial"); - for (Long material_type_id : ids) { - JSONObject param = new JSONObject(); - param.put("material_type_id", String.valueOf(material_type_id)); - param.put("is_delete", "1"); - param.put("update_optid", currentUserId); - param.put("update_optname", nickName); - param.put("update_time", now); - wo.update(param); - } - } - - @Override - public void insertSet(Map whereJson) { - Long currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - String now = DateUtil.now(); - WQLObject mater = WQLObject.getWQLObject("ST_IVT_StructRelaMaterial"); - String sect_id = (String) whereJson.get("sect_id"); - ArrayList class_rows = (ArrayList) whereJson.get("class_rows"); - for (int i = 0; i < class_rows.size(); i++) { - HashMap class_row = class_rows.get(i); - JSONObject material_set = mater.query("sect_id = '" + sect_id + "' AND material_type_id = '" + class_row.get("class_id") + "'") - .uniqueResult(0); - if (material_set != null) { - HashMap update_map = new HashMap<>(); - update_map.put("set_id", currentUserId + ""); - update_map.put("set_name", nickName); - update_map.put("set_time", now); - mater.update(update_map, "sect_id = '" + sect_id + "' AND material_type_id = '" + class_row.get("class_id") + "'"); - } else { - JSONObject jo = new JSONObject(); - jo.put("sect_id", sect_id); - jo.put("material_type_id", class_row.get("class_id")); - jo.put("set_id", currentUserId + ""); - jo.put("set_name", nickName); - jo.put("set_time", now); - mater.insert(jo); - } - } - } - - @Override - public void delSet(Map whereJson) { - String sect_id = (String) whereJson.get("sect_id"); - String material_type_id = (String) whereJson.get("material_type_id"); - WQLObject.getWQLObject("ST_IVT_StructRelaMaterial").delete("sect_id = '" + sect_id + "' AND material_type_id = '" + material_type_id + "'"); - } - -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QLK01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QLK01.wql deleted file mode 100644 index 2ba88da..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QLK01.wql +++ /dev/null @@ -1,226 +0,0 @@ -[交易说明] - 交易名： 将海亮的物料导入mysql - 所属模块： - 功能简述： - 版权所有： - 表引用： - 版本经历： - -[数据库] - --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库 - -[IO定义] - ################################################# - ## 表字段对应输入参数 - ################################################# - 输入.flag TYPEAS s_string - 输入.material_code TYPEAS s_string - 输入.processroute_uuid TYPEAS s_string - -[临时表] - --这边列出来的临时表就会在运行期动态创建 - -[临时变量] - --所有中间过程变量均可在此处定义 - -[业务过程] - - ########################################## - # 1、输入输出检查 # - ########################################## - - - ########################################## - # 2、主过程前处理 # - ########################################## - - - ########################################## - # 3、业务主过程 # - ########################################## - - IF 输入.flag = "1" - QUERY - SELECT - * - FROM - MD_PB_BaseData_ClassInfo classinfot - LEFT JOIN MD_PB_BaseData_ClassStandard standard ON classinfot.class_uuid = standard.class_uuid - LEFT JOIN MD_ME_MaterialBase material ON material.material_uuid = classinfot.base_data_uuid - left join MD_ME_MaterialExt ext on ext.material_uuid = material.material_uuid - - ENDSELECT - ENDQUERY - ENDIF - - IF 输入.flag = "2" - QUERY - SELECT - * - FROM - MD_PB_BaseData_ClassStandard class - ENDSELECT - ENDQUERY - ENDIF - - IF 输入.flag = "3" - QUERY - SELECT - * - FROM - ST_IVT_BSREALSTORATTR - ENDSELECT - ENDQUERY - ENDIF - - IF 输入.flag = "4" - QUERY - SELECT - * - FROM - ST_IVT_SECTATTR - ENDSELECT - ENDQUERY - ENDIF - - IF 输入.flag = "5" - QUERY - SELECT - * - FROM - ST_IVT_STRUCTATTR - ENDSELECT - ENDQUERY - ENDIF - - IF 输入.flag = "6" - QUERY - SELECT - * - FROM - ST_IVT_StorageVehicleInfo - ENDSELECT - ENDQUERY - ENDIF - - IF 输入.flag = "7" - QUERY - SELECT - * - FROM - wdk_sysparam - ENDSELECT - ENDQUERY - ENDIF - - IF 输入.flag = "8" - QUERY - SELECT - * - FROM - IF_CacheLine_Position - ENDSELECT - ENDQUERY - ENDIF - - IF 输入.flag = "9" - QUERY - SELECT - * - FROM - st_cacheline_position - ENDSELECT - ENDQUERY - ENDIF - -IF 输入.flag = "10" - QUERY - SELECT - mb.*, - class.class_code, - class.class_name - FROM - md_me_materialbase mb - LEFT JOIN MD_PB_ClassStandard class ON class.class_id = mb.material_type_id - WHERE - mb.is_delete = '0' - AND 1 = 1 - AND class.class_id IN ( '1528555445302726656', '1528555443906023424', '1528555445080428544' ) - ENDSELECT - ENDQUERY -ENDIF - -IF 输入.flag = "11" - QUERY - SELECT - mb.*, - class.class_code, - class.class_name - FROM - md_me_materialbase mb - LEFT JOIN MD_PB_ClassStandard class ON class.class_id = mb.material_type_id - WHERE - mb.is_delete = '0' - AND 1 = 1 - AND class.class_id IN ( '1528555444031852544', '1528555444778438656', '1528555444291899392' ) - ENDSELECT - ENDQUERY -ENDIF - - -IF 输入.flag = "12" - QUERY - SELECT - * - FROM - PDM_BI_WorkshopMaterialCorr - ENDSELECT - ENDQUERY -ENDIF - -IF 输入.flag = "13" - QUERY - SELECT - * - FROM - PDM_BI_SemiMaterialCorr - ENDSELECT - ENDQUERY -ENDIF - -IF 输入.flag = "14" - QUERY - SELECT - * - FROM - PDM_BI_WorkshopMaterialCorr corr - LEFT JOIN PF_PB_SysDicInfo sys ON sys.sysdic_code = corr.materialprocess_series - AND sys.sysdic_type = 'IF_WCS_DEVICESERIES' - ENDSELECT - ENDQUERY -ENDIF - - - -IF 输入.flag = "15" - QUERY - SELECT - * - FROM - PDM_BI_ProduceProcessRoute route - ENDSELECT - ENDQUERY -ENDIF - -IF 输入.flag = "16" - QUERY - SELECT - * - FROM - PDM_BI_ProduceProcessRoute route - LEFT JOIN PDM_BI_ProduceProcessRouteDtl dtl ON route.processroute_uuid = dtl.processroute_uuid - route.processroute_uuid = 输入.processroute_uuid - order by workprocedure_number - ENDSELECT - ENDQUERY -ENDIF \ No newline at end of file diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_IVT_MATERIALSET.wql b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_IVT_MATERIALSET.wql deleted file mode 100644 index 3eff3c7..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_IVT_MATERIALSET.wql +++ /dev/null @@ -1,78 +0,0 @@ -[交易说明] - 交易名： 基础点位分页查询 - 所属模块： - 功能简述： - 版权所有： - 表引用： - 版本经历： - -[数据库] - --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库 - -[IO定义] - ################################################# - ## 表字段对应输入参数 - ################################################# - 输入.flag TYPEAS s_string - 输入.search TYPEAS s_string - 输入.stor_id TYPEAS s_string - 输入.sect_id TYPEAS s_string - 输入.classIds TYPEAS f_string - - -[临时表] - --这边列出来的临时表就会在运行期动态创建 - -[临时变量] - --所有中间过程变量均可在此处定义 - -[业务过程] - - ########################################## - # 1、输入输出检查 # - ########################################## - - - ########################################## - # 2、主过程前处理 # - ########################################## - - - ########################################## - # 3、业务主过程 # - ########################################## - - IF 输入.flag = "1" - PAGEQUERY - SELECT - se.sect_code, - se.sect_name, - class.class_code, - class.class_name, - sm.* - FROM - st_ivt_structrelamaterial sm - INNER JOIN st_ivt_sectattr se ON se.sect_id = sm.sect_id - INNER JOIN md_pb_classstandard class ON class.class_id = sm.material_type_id - OPTION 输入.search <> "" - ( - class.class_code like 输入.search - OR - class.class_name like 输入.search - ) - ENDOPTION - OPTION 输入.stor_id <> "" - se.stor_id = 输入.stor_id - ENDOPTION - OPTION 输入.sect_id <> "" - se.sect_id = 输入.sect_id - ENDOPTION - OPTION 输入.classIds <> "" - class.class_id in 输入.classIds - ENDOPTION - ENDSELECT - ENDPAGEQUERY - ENDIF - - - diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_SECT_ATTR.wql b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_SECT_ATTR.wql deleted file mode 100644 index cae0762..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_SECT_ATTR.wql +++ /dev/null @@ -1,90 +0,0 @@ -[交易说明] - 交易名： 基础点位分页查询 - 所属模块： - 功能简述： - 版权所有： - 表引用： - 版本经历： - -[数据库] - --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库 - -[IO定义] - ################################################# - ## 表字段对应输入参数 - ################################################# - 输入.flag TYPEAS s_string - 输入.search TYPEAS s_string - 输入.stor_id TYPEAS s_string - 输入.sect_type_attr TYPEAS s_string - - -[临时表] - --这边列出来的临时表就会在运行期动态创建 - -[临时变量] - --所有中间过程变量均可在此处定义 - -[业务过程] - - ########################################## - # 1、输入输出检查 # - ########################################## - - - ########################################## - # 2、主过程前处理 # - ########################################## - - - ########################################## - # 3、业务主过程 # - ########################################## - - IF 输入.flag = "1" - PAGEQUERY - SELECT - sect.*, - stor.stor_name - FROM - ST_IVT_SectAttr sect - left join ST_IVT_BSRealStorAttr stor on sect.stor_id = stor.stor_id - WHERE - sect.is_delete = '0' - OPTION 输入.search <> "" - ( - sect.sect_code like 输入.search - OR - sect.sect_name like 输入.search - ) - ENDOPTION - OPTION 输入.stor_id <> "" - sect.stor_id = 输入.stor_id - ENDOPTION - ENDSELECT - ENDPAGEQUERY - ENDIF - - IF 输入.flag = "2" - QUERY - SELECT - sect.sect_id, - sect.sect_name - FROM - st_ivt_sectattr sect - WHERE - sect.is_delete = '0' - AND - sect.is_used = '1' - OPTION 输入.stor_id <> "" - sect.stor_id = 输入.stor_id - ENDOPTION - OPTION 输入.sect_type_attr <> "" - sect.sect_type_attr = 输入.sect_type_attr - ENDOPTION - ENDSELECT - ENDQUERY - ENDIF - - - diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STOR_ATTR.wql b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STOR_ATTR.wql deleted file mode 100644 index 088b2ef..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STOR_ATTR.wql +++ /dev/null @@ -1,104 +0,0 @@ -[交易说明] - 交易名： 基础点位分页查询 - 所属模块： - 功能简述： - 版权所有： - 表引用： - 版本经历： - -[数据库] - --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库 - -[IO定义] - ################################################# - ## 表字段对应输入参数 - ################################################# - 输入.flag TYPEAS s_string - 输入.search TYPEAS s_string - 输入.is_materialstore TYPEAS s_string - 输入.is_virtualstore TYPEAS s_string - 输入.is_semi_finished TYPEAS s_string - 输入.is_productstore TYPEAS s_string - 输入.is_attachment TYPEAS s_string - 输入.is_reversed TYPEAS s_string - - -[临时表] - --这边列出来的临时表就会在运行期动态创建 - -[临时变量] - --所有中间过程变量均可在此处定义 - -[业务过程] - - ########################################## - # 1、输入输出检查 # - ########################################## - - - ########################################## - # 2、主过程前处理 # - ########################################## - - - ########################################## - # 3、业务主过程 # - ########################################## - - IF 输入.flag = "1" - PAGEQUERY - SELECT - stor.*, - detail.label - FROM - st_ivt_bsrealstorattr stor - LEFT JOIN sys_dict_detail detail ON detail.value = stor.stor_type_scode AND detail.dict_id = '30' - WHERE - stor.is_delete = '0' - OPTION 输入.search <> "" - ( - stor.stor_code like 输入.search - OR - stor.stor_name like 输入.search - ) - ENDOPTION - ENDSELECT - ENDPAGEQUERY - ENDIF - - IF 输入.flag = "2" - QUERY - SELECT - stor.stor_id, - stor.stor_code, - stor.stor_name - FROM - st_ivt_bsrealstorattr stor - WHERE - stor.is_delete = '0' - AND - stor.is_used = '1' - OPTION 输入.is_virtualstore <> "" - stor.is_virtualstore = 输入.is_virtualstore - ENDOPTION - OPTION 输入.is_semi_finished <> "" - stor.is_semi_finished = 输入.is_semi_finished - ENDOPTION - OPTION 输入.is_materialstore <> "" - stor.is_materialstore = 输入.is_materialstore - ENDOPTION - OPTION 输入.is_productstore <> "" - stor.is_productstore = 输入.is_productstore - ENDOPTION - OPTION 输入.is_attachment <> "" - stor.is_attachment = 输入.is_attachment - ENDOPTION - OPTION 输入.is_reversed <> "" - stor.is_reversed = 输入.is_reversed - ENDOPTION - ENDSELECT - ENDQUERY - ENDIF - - - diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql deleted file mode 100644 index e23ba05..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql +++ /dev/null @@ -1,83 +0,0 @@ -[交易说明] - 交易名： 基础点位分页查询 - 所属模块： - 功能简述： - 版权所有： - 表引用： - 版本经历： - -[数据库] - --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库 - -[IO定义] - ################################################# - ## 表字段对应输入参数 - ################################################# - 输入.flag TYPEAS s_string - 输入.struct TYPEAS s_string - 输入.material TYPEAS s_string - 输入.region_id TYPEAS f_string - -[临时表] - --这边列出来的临时表就会在运行期动态创建 - -[临时变量] - --所有中间过程变量均可在此处定义 - -[业务过程] - - ########################################## - # 1、输入输出检查 # - ########################################## - - - ########################################## - # 2、主过程前处理 # - ########################################## - - - ########################################## - # 3、业务主过程 # - ########################################## - - IF 输入.flag = "1" - PAGEQUERY - SELECT - ivt.*, - point.point_code, - point.point_name, - mater.material_code, - mater.material_name, - unit.unit_name, - region.region_name - FROM - ST_IVT_StructIvt ivt - LEFT JOIN sch_base_point point ON ivt.struct_id = point.point_id - LEFT JOIN md_me_materialbase mater ON mater.material_id = ivt.material_id - LEFT JOIN md_pb_measureunit unit ON unit.measure_unit_id = ivt.qty_unit_id - LEFT JOIN SCH_BASE_Region region ON region.region_id = ivt.region_id - WHERE - 1 = 1 - - OPTION 输入.struct <> "" - ( - ivt.struct_code like 输入.struct or - ivt.struct_name like 输入.struct - ) - ENDOPTION - OPTION 输入.material <> "" - ( - mater.material_code like 输入.material or - mater.material_name like 输入.material - ) - ENDOPTION - - OPTION 输入.region_id <> "" - ivt.region_id = 输入.region_id - ENDOPTION - ENDSELECT - ENDPAGEQUERY - ENDIF - - - diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCT_ATTR.wql b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCT_ATTR.wql deleted file mode 100644 index 2f75599..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCT_ATTR.wql +++ /dev/null @@ -1,79 +0,0 @@ -[交易说明] - 交易名： 基础点位分页查询 - 所属模块： - 功能简述： - 版权所有： - 表引用： - 版本经历： - -[数据库] - --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库 - -[IO定义] - ################################################# - ## 表字段对应输入参数 - ################################################# - 输入.flag TYPEAS s_string - 输入.search TYPEAS s_string - 输入.stor_id TYPEAS s_string - 输入.sect_id TYPEAS s_string - 输入.lock_type TYPEAS s_string - 输入.storagevehicle_type TYPEAS s_string - 输入.is_used TYPEAS s_string - 输入.is_delete TYPEAS s_string - -[临时表] - --这边列出来的临时表就会在运行期动态创建 - -[临时变量] - --所有中间过程变量均可在此处定义 - -[业务过程] - - ########################################## - # 1、输入输出检查 # - ########################################## - - - ########################################## - # 2、主过程前处理 # - ########################################## - - - ########################################## - # 3、业务主过程 # - ########################################## - - IF 输入.flag = "1" - PAGEQUERY - SELECT - struct.* - FROM - st_ivt_structattr struct - WHERE - struct.is_delete = '0' - OPTION 输入.search <> "" - ( - struct.struct_code like 输入.search - OR - struct.struct_name like 输入.search - ) - ENDOPTION - OPTION 输入.stor_id <> "" - struct.stor_id = 输入.stor_id - ENDOPTION - OPTION 输入.sect_id <> "" - struct.sect_id = 输入.sect_id - ENDOPTION - OPTION 输入.lock_type <> "" - struct.lock_type = 输入.lock_type - ENDOPTION - OPTION 输入.lock_type = "00" - (struct.storagevehicle_code is null or struct.storagevehicle_code = '') - ENDOPTION - ENDSELECT - ENDPAGEQUERY - ENDIF - - - diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls deleted file mode 100644 index c224a55..0000000 Binary files a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls and /dev/null differ diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_ME_MATERIAL.wql b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/QMD_ME_MATERIAL.wql similarity index 100% rename from lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_ME_MATERIAL.wql rename to lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/QMD_ME_MATERIAL.wql diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_ME_material_param01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/QMD_ME_material_param01.wql similarity index 100% rename from lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_ME_material_param01.wql rename to lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/QMD_ME_material_param01.wql diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_PB_CLASSBASE.wql b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/QMD_PB_CLASSBASE.wql similarity index 100% rename from lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_PB_CLASSBASE.wql rename to lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/QMD_PB_CLASSBASE.wql diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_PB_STORAGEVEHICLEEXT.wql b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/QMD_PB_STORAGEVEHICLEEXT.wql similarity index 86% rename from lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_PB_STORAGEVEHICLEEXT.wql rename to lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/QMD_PB_STORAGEVEHICLEEXT.wql index 24bcbf2..88af8e8 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_PB_STORAGEVEHICLEEXT.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/QMD_PB_STORAGEVEHICLEEXT.wql @@ -14,8 +14,8 @@ ## 表字段对应输入参数 ################################################# 输入.flag TYPEAS s_string - 输入.storagevehicle_code_begin TYPEAS s_string - 输入.storagevehicle_code_end TYPEAS s_string + 输入.ehicle_code_begin TYPEAS s_string + 输入.ehicle_code_end TYPEAS s_string 输入.storagevehicle_type TYPEAS s_string @@ -68,19 +68,19 @@ LEFT JOIN sys_dict_detail d ON info.storagevehicle_type = d.value and d.name = 'storagevehicle_type' LEFT JOIN MD_ME_MaterialBase mdb ON ext.material_id = mdb.material_id LEFT JOIN MD_ME_ProducMaterialExt mdp ON mdb.material_id = mdp.material_id - LEFT JOIN sch_base_point point ON info.storagevehicle_code = point.vehicle_code + LEFT JOIN sch_base_point point ON info.ehicle_code = point.vehicle_code LEFT JOIN EM_BI_DeviceInfo device ON device.device_id = ext.device_uuid WHERE info.is_delete = '0' AND info.storagevehicle_type in (30,31,32,33) ENDOPTION - OPTION 输入.storagevehicle_code_begin <> "" - info.storagevehicle_code >= 输入.storagevehicle_code_begin + OPTION 输入.ehicle_code_begin <> "" + info.ehicle_code >= 输入.ehicle_code_begin ENDOPTION ENDOPTION - OPTION 输入.storagevehicle_code_end <> "" - info.storagevehicle_code <= 输入.storagevehicle_code_end + OPTION 输入.ehicle_code_end <> "" + info.ehicle_code <= 输入.ehicle_code_end ENDOPTION ENDOPTION diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_PB_STORAGEVEHICLEINFO.wql b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/QMD_PB_STORAGEVEHICLEINFO.wql similarity index 82% rename from lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_PB_STORAGEVEHICLEINFO.wql rename to lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/QMD_PB_STORAGEVEHICLEINFO.wql index 4081d66..36ac5f7 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_PB_STORAGEVEHICLEINFO.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/QMD_PB_STORAGEVEHICLEINFO.wql @@ -14,8 +14,8 @@ ## 表字段对应输入参数 ################################################# 输入.flag TYPEAS s_string - 输入.storagevehicle_code_begin TYPEAS s_string - 输入.storagevehicle_code_end TYPEAS s_string + 输入.ehicle_code_begin TYPEAS s_string + 输入.ehicle_code_end TYPEAS s_string 输入.storagevehicle_type TYPEAS s_string @@ -53,19 +53,19 @@ FROM md_pb_storagevehicleinfo s LEFT JOIN sys_dict_detail d ON s.storagevehicle_type = d.value and d.dict_id = '32' - LEFT JOIN sch_base_point point ON point.vehicle_code = s.storagevehicle_code + LEFT JOIN sch_base_point point ON point.vehicle_code = s.ehicle_code LEFT JOIN ST_IVT_StructIvt ivt ON point.source_id = ivt.struct_id LEFT JOIN md_me_materialbase mater ON mater.material_id = ivt.material_id WHERE s.is_delete = '0' ENDOPTION - OPTION 输入.storagevehicle_code_begin <> "" - s.storagevehicle_code >= 输入.storagevehicle_code_begin + OPTION 输入.ehicle_code_begin <> "" + s.ehicle_code >= 输入.ehicle_code_begin ENDOPTION ENDOPTION - OPTION 输入.storagevehicle_code_end <> "" - s.storagevehicle_code <= 输入.storagevehicle_code_end + OPTION 输入.ehicle_code_end <> "" + s.ehicle_code <= 输入.ehicle_code_end ENDOPTION ENDOPTION diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_PB_STORAGEVEHICLEPOINT.wql b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/QMD_PB_STORAGEVEHICLEPOINT.wql similarity index 98% rename from lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_PB_STORAGEVEHICLEPOINT.wql rename to lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/QMD_PB_STORAGEVEHICLEPOINT.wql index a6009e2..0705563 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_PB_STORAGEVEHICLEPOINT.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/QMD_PB_STORAGEVEHICLEPOINT.wql @@ -46,7 +46,7 @@ point.*, svp.storagevehiclepoint_id, svp.storagevehicle_id, - svp.storagevehicle_code, + svp.ehicle_code, svp.set_type, d.label AS set_type_name FROM diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_STORAGEVEHICLECLEANING.wql b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/QMD_STORAGEVEHICLECLEANING.wql similarity index 93% rename from lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_STORAGEVEHICLECLEANING.wql rename to lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/QMD_STORAGEVEHICLECLEANING.wql index 15c96e7..311805c 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_STORAGEVEHICLECLEANING.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/QMD_STORAGEVEHICLECLEANING.wql @@ -16,7 +16,7 @@ 输入.flag TYPEAS s_string 输入.point_code TYPEAS s_string 输入.storagevehicle_type TYPEAS s_string - 输入.storagevehicle_code TYPEAS s_string + 输入.ehicle_code TYPEAS s_string [临时表] @@ -69,8 +69,8 @@ info.storagevehicle_type = 输入.storagevehicle_type ENDOPTION - OPTION 输入.storagevehicle_code <> "" - info.storagevehicle_code like "%" 输入.storagevehicle_code "%" + OPTION 输入.ehicle_code <> "" + info.ehicle_code like "%" 输入.ehicle_code "%" ENDOPTION ENDSELECT diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMT_MATERIALPARAMETERS_001.wql b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/QMT_MATERIALPARAMETERS_001.wql similarity index 100% rename from lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMT_MATERIALPARAMETERS_001.wql rename to lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/QMT_MATERIALPARAMETERS_001.wql diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdcs.xls b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/mdcs.xls similarity index 100% rename from lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdcs.xls rename to lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/mdcs.xls diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdme.xls b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/mdme.xls similarity index 100% rename from lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdme.xls rename to lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/mdme.xls diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdpb.xls b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/mdpb.xls similarity index 91% rename from lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdpb.xls rename to lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/mdpb.xls index 1ff4b09..98f928b 100644 Binary files a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdpb.xls and b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/mdpb.xls differ diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index 279fe48..2196901 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -370,7 +370,6 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { jsonTask.put("task_status", "05"); taskTab.update(jsonTask); // 更新载具对应数量表 - jsonVeQty.put("is_task", "1"); // veQtyTab.update(jsonVeQty); } else { throw new BadRequestException(jsonObject.getString("message")); @@ -506,7 +505,6 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { resuft.put("create_mode", jsonRegion.getString("create_mode")); return resuft; } - @LokiLog(type = LokiLogType.ACS_TO_LMS) @Transactional(rollbackFor = Exception.class) public JSONObject outCreateRegion(JSONObject json) { String next_point_code = json.getString("next_point_code"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/emptyandqty/service/impl/EmptyAndQtyServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/emptyandqty/service/impl/EmptyAndQtyServiceImpl.java index 61837c6..7cbbdf3 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/emptyandqty/service/impl/EmptyAndQtyServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/emptyandqty/service/impl/EmptyAndQtyServiceImpl.java @@ -10,8 +10,8 @@ import org.nl.modules.common.utils.SecurityUtils; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.SpringContextHolder; -import org.nl.wms.basedata.master.service.StoragevehicleinfoService; -import org.nl.wms.basedata.master.service.dto.StoragevehicleinfoDto; +import org.nl.wms.basedata.service.StoragevehicleinfoService; +import org.nl.wms.basedata.service.dto.VehicleDto; import org.nl.wms.pda.emptyandqty.service.EmptyAndQtyService; import org.springframework.stereotype.Service; @@ -29,7 +29,7 @@ public class EmptyAndQtyServiceImpl implements EmptyAndQtyService { String qty = whereJson.getString("qty"); WQLObject vqTab = WQLObject.getWQLObject("PDM_BI_vehicleQty"); - StoragevehicleinfoDto byCode = SpringContextHolder.getBean(StoragevehicleinfoService.class).findByCode(vehicle_code); + VehicleDto byCode = SpringContextHolder.getBean(StoragevehicleinfoService.class).findByCode(vehicle_code); // 插入记录 JSONObject json = new JSONObject(); @@ -37,7 +37,6 @@ public class EmptyAndQtyServiceImpl implements EmptyAndQtyService { json.put("vehicle_id", byCode.getStoragevehicle_id()); json.put("vehicle_code", vehicle_code); json.put("qty", qty); - json.put("is_task", "0"); json.put("create_id", SecurityUtils.getCurrentUserId()); json.put("create_name", SecurityUtils.getCurrentNickName()); json.put("create_time", DateUtil.now()); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DeviceServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DeviceServiceImpl.java index f21826a..80bedff 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DeviceServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DeviceServiceImpl.java @@ -123,10 +123,8 @@ public class DeviceServiceImpl implements DeviceService { @Transactional(rollbackFor = Exception.class) public void deleteAll(Long[] ids) { WQLObject wo = WQLObject.getWQLObject("pdm_bi_device"); - WQLObject wo_value = WQLObject.getWQLObject("PDM_BI_DeviceItemValue"); for (Long device_id : ids) { wo.delete("device_id = '" + device_id + "'"); - wo_value.delete("device_id = '" + device_id + "'"); } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProduceshiftorderServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProduceshiftorderServiceImpl.java index 9e44b78..a42ade9 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProduceshiftorderServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProduceshiftorderServiceImpl.java @@ -21,7 +21,7 @@ import org.nl.modules.system.util.CodeUtil; 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.service.ClassstandardService; +import org.nl.wms.basedata.service.ClassstandardService; import org.nl.wms.ext.acs.service.WmsToAcsService; import org.nl.wms.pdm.service.ProduceshiftorderService; import org.nl.wms.pdm.service.dto.ProduceshiftorderDto; @@ -118,7 +118,7 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService { CurrentUser currentUser = SecurityUtils.getCurrentUser(); Long deptId = currentUser.getUser().getDeptId(); String newCode = CodeUtil.getNewCode("PDM_SHIFTORDER"); - dto.setProduceorder_id(IdUtil.getSnowflake(1, 1).nextId()); + dto.setWorkorder_id(IdUtil.getSnowflake(1, 1).nextId()); dto.setProduceorder_code(newCode); dto.setProducedeviceorder_code(newCode); dto.setOrder_status("00"); @@ -138,7 +138,7 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService { @Override @Transactional(rollbackFor = Exception.class) public void update(ProduceshiftorderDto dto) { - ProduceshiftorderDto entity = this.findById(dto.getProduceorder_id()); + ProduceshiftorderDto entity = this.findById(dto.getWorkorder_id()); if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!"); Long currentUserId = SecurityUtils.getCurrentUserId(); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls index 94526fb..d028a31 100644 Binary files a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls and b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls differ diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallMaterialTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallMaterialTask.java index 81d0064..0e21aa6 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallMaterialTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallMaterialTask.java @@ -15,8 +15,6 @@ import org.nl.modules.system.util.CodeUtil; import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.SpringContextHolder; -import org.nl.wms.basedata.st.IvtChangeTypeEnum; -import org.nl.wms.basedata.st.StoreIvtServiceImpl; import org.nl.wms.common.StructFindUtil; import org.nl.wms.sch.manage.AbstractAcsTask; import org.nl.wms.sch.manage.TaskStatusEnum; @@ -73,38 +71,8 @@ public class CallMaterialTask extends AbstractAcsTask { ///审核单据 增加库存 改变出入库表的状态 WQLObject mstTab = WQLObject.getWQLObject("SCH_IVT_regionIO"); JSONObject mstObj = mstTab.query("task_id='" + task_id + "' and is_delete='0'").uniqueResult(0); - //审核 加库存可和用数量 - StoreIvtServiceImpl ivtService = new StoreIvtServiceImpl(); - mstObj.put("bill_status", "50"); - mstObj.put("confirm_optid", SecurityUtils.getCurrentUserId()); - mstObj.put("confirm_optname", SecurityUtils.getCurrentNickName()); - mstObj.put("confirm_time", DateUtil.now()); - mstTab.update(mstObj); - - String iostorinv_id = mstObj.getString("iostorinv_id"); - String next_point_code = mstObj.getString("end_point_code"); - String start_point_code = mstObj.getString("start_point_code"); - JSONObject param = new JSONObject(); - param.put("material_id", mstObj.getString("material_id")); - param.put("bill_id", iostorinv_id); - param.put("qty_unit_id", mstObj.getString("qty_unit_id")); - param.put("pcsn", mstObj.getString("pcsn")); - param.put("change_qty", mstObj.getString("qty")); - param.put("vehicle_code", mstObj.getString("vehicle_code")); - PointServiceImpl pointService = SpringContextHolder.getBean(PointServiceImpl.class); - PointDto nextPointDto = pointService.findByCode(next_point_code); - if (ObjectUtil.isNull(nextPointDto)) { - throw new BadRequestException("未找到可用点位:" + next_point_code); - } - PointDto startPointDto = pointService.findByCode(start_point_code); - if (ObjectUtil.isNull(startPointDto)) { - throw new BadRequestException("未找到可用点位:" + start_point_code); - } - param.put("struct_id", startPointDto.getPoint_id()); - ivtService.addIvtFlow(param, IvtChangeTypeEnum.SUB_IVT); //解锁仓位，托盘信息，回写到点位上去 - String vehicle_code = jsonTask.getString("vehicle_code"); WQLObject pointTab = WQLObject.getWQLObject("sch_base_point"); JSONObject startPointObj = pointTab.query("point_code='" + jsonTask.getString("start_point_code") + "'").uniqueResult(0); @@ -228,17 +196,6 @@ public class CallMaterialTask extends AbstractAcsTask { startPointObj.put("lock_type", "01"); pointTable.update(startPointObj); - //减少库存可用数量 - StoreIvtServiceImpl ivtService = new StoreIvtServiceImpl(); - JSONObject param = new JSONObject(); - param.put("material_id", material_id); - param.put("bill_id", iostorinv_id); - param.put("qty_unit_id", qty_unit_id); - param.put("change_qty", qty); - param.put("struct_id", startPoint.getPoint_id()); - param.put("vehicle_code", startPoint.getVehicle_code()); - - ivtService.addIvtFlow(param, IvtChangeTypeEnum.SUB_CAN_USE); JSONObject taskObj = new JSONObject(); taskObj.put("task_id", task_id); taskObj.put("taskdtl_id", task_id); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendEmpVehicleTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendEmpVehicleTask.java index bceeff2..e5c7718 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendEmpVehicleTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendEmpVehicleTask.java @@ -18,8 +18,8 @@ import org.nl.modules.system.util.CodeUtil; import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.SpringContextHolder; -import org.nl.wms.basedata.master.service.StoragevehicleinfoService; -import org.nl.wms.basedata.master.service.dto.StoragevehicleinfoDto; +import org.nl.wms.basedata.service.StoragevehicleinfoService; +import org.nl.wms.basedata.service.dto.VehicleDto; import org.nl.wms.pdm.service.DeviceService; import org.nl.wms.pdm.service.dto.DeviceDto; import org.nl.wms.sch.manage.AbstractAcsTask; @@ -239,7 +239,7 @@ public class SendEmpVehicleTask extends AbstractAcsTask { // 如果说明是货梯业务：则判断载具号是否为空 if (ObjectUtil.isEmpty(vehicle_code)) throw new BadRequestException("起点点位错误"); // 根据载具号找对应的载具类型 - StoragevehicleinfoDto vehicleDto = SpringContextHolder.getBean(StoragevehicleinfoService.class).findByCode(vehicle_code); + VehicleDto vehicleDto = SpringContextHolder.getBean(StoragevehicleinfoService.class).findByCode(vehicle_code); if (ObjectUtil.isEmpty(vehicleDto)) throw new BadRequestException("载具不存在"); vehicle_type = vehicleDto.getStoragevehicle_type(); } else { diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendMaterialTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendMaterialTask.java index 7ab73e7..9b35edd 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendMaterialTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendMaterialTask.java @@ -8,27 +8,18 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; - import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.common.utils.SecurityUtils; import org.nl.modules.system.util.CodeUtil; - - import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.SpringContextHolder; -import org.nl.wms.basedata.st.IvtChangeTypeEnum; -import org.nl.wms.basedata.st.StoreIvtServiceImpl; import org.nl.wms.common.StructFindUtil; 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.service.impl.PointServiceImpl; - - - import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -51,9 +42,9 @@ public class SendMaterialTask extends AbstractAcsTask { WQLObject taskTab = WQLObject.getWQLObject("sch_base_task"); JSONObject jsonTask = taskTab.query("task_id='" + task_id + "'").uniqueResult(0); - if (StrUtil.equals(status,"0")) { + if (StrUtil.equals(status, "0")) { // 取消删除任务 - taskTab.delete("task_id = '"+task_id+"'"); + taskTab.delete("task_id = '" + task_id + "'"); } if (TaskStatusEnum.EXECUTING.getCode().equals(status)) { @@ -80,7 +71,6 @@ public class SendMaterialTask extends AbstractAcsTask { WQLObject mstTab = WQLObject.getWQLObject("SCH_IVT_regionIO"); JSONObject mstObj = mstTab.query("task_id='" + task_id + "' and is_delete='0'").uniqueResult(0); //审核 加库存可和用数量 - StoreIvtServiceImpl ivtService = new StoreIvtServiceImpl(); mstObj.put("bill_status", "50"); mstObj.put("confirm_optid", SecurityUtils.getCurrentUserId()); mstObj.put("confirm_optname", SecurityUtils.getCurrentNickName()); @@ -89,23 +79,10 @@ public class SendMaterialTask extends AbstractAcsTask { String iostorinv_id = mstObj.getString("iostorinv_id"); String bill_code = mstObj.getString("bill_code"); - String bill_type_scode =mstObj.getString("bill_type"); + String bill_type_scode = mstObj.getString("bill_type"); String next_point_code = mstObj.getString("end_point_code"); String start_point_code = mstObj.getString("start_point_code"); - JSONObject param = new JSONObject(); - param.put("material_id", mstObj.getString("material_id")); - param.put("bill_code", bill_code); - param.put("bill_type_scode", bill_type_scode); - param.put("bill_id", iostorinv_id); - param.put("qty_unit_id", mstObj.getString("qty_unit_id")); - param.put("pcsn", mstObj.getString("pcsn")); - param.put("change_qty", mstObj.getString("qty")); - param.put("vehicle_code", mstObj.getString("vehicle_code")); - param.put("region_id", mstObj.getString("start_region_id")); - param.put("is_full", mstObj.getString("is_full")); - param.put("stewing_time", mstObj.getString("stewing_time")); - param.put("producetask_id", mstObj.getString("producetask_id")); - param.put("io_type", mstObj.getString("io_type")); + PointServiceImpl pointService = SpringContextHolder.getBean(PointServiceImpl.class); PointDto nextPointDto = pointService.findByCode(next_point_code); @@ -116,8 +93,6 @@ public class SendMaterialTask extends AbstractAcsTask { if (ObjectUtil.isNull(startPointDto)) { throw new BadRequestException("未找到可用点位:" + start_point_code); } - param.put("struct_id", nextPointDto.getPoint_id()); - ivtService.addIvtFlow(param, IvtChangeTypeEnum.ADD_IVT_AND_CAN_USE); // 解锁点位 String vehicle_code = jsonTask.getString("vehicle_code"); WQLObject pointTab = WQLObject.getWQLObject("sch_base_point"); @@ -214,7 +189,7 @@ public class SendMaterialTask extends AbstractAcsTask { if (StrUtil.isEmpty(next_point_code)) { // 终点为空需要找终点 JSONObject param = new JSONObject(); - param.put("start_point_code",start_point_code); + param.put("start_point_code", start_point_code); JSONObject endPoint = this.findEndPoint(param); next_point_code = endPoint.getString("next_point_code"); } @@ -291,7 +266,7 @@ public class SendMaterialTask extends AbstractAcsTask { * 2.豪凯线 --> 成品区 */ String next_point_code = ""; - if (StrUtil.equals(jsonStartRegion.getString("region_code"),RegionTypeEnum.GJQY.getCode())) { + if (StrUtil.equals(jsonStartRegion.getString("region_code"), RegionTypeEnum.GJQY.getCode())) { JSONObject map = new JSONObject(); map.put("flag", "2"); map.put("region_code", RegionTypeEnum.YSQA.getCode()); @@ -299,7 +274,7 @@ public class SendMaterialTask extends AbstractAcsTask { if (ObjectUtil.isEmpty(jsonEndPoint)) throw new BadRequestException("仓位不足"); next_point_code = jsonEndPoint.getString("point_code"); - } else if (StrUtil.equals(jsonStartRegion.getString("region_code"),RegionTypeEnum.HKQY.getCode())) { + } else if (StrUtil.equals(jsonStartRegion.getString("region_code"), RegionTypeEnum.HKQY.getCode())) { JSONObject map = new JSONObject(); map.put("flag", "2"); map.put("region_code", RegionTypeEnum.CPQYA.getCode()); @@ -310,7 +285,7 @@ public class SendMaterialTask extends AbstractAcsTask { } JSONObject resuft = new JSONObject(); - resuft.put("next_point_code",next_point_code); + resuft.put("next_point_code", next_point_code); return resuft; } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/sch.xls b/lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/sch.xls index defda70..98e7d8b 100644 Binary files a/lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/sch.xls and b/lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/sch.xls differ diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RegionioInServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RegionioInServiceImpl.java index 7ac04a6..8dda6fd 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RegionioInServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RegionioInServiceImpl.java @@ -113,7 +113,7 @@ public class RegionioInServiceImpl implements RegionioInService { JSONObject jsonMater = materTab.query("material_id = '" + dto.getMaterial_id() + "'").uniqueResult(0); if (ObjectUtil.isNotEmpty(dto.getVehicle_code())) { - JSONObject jsonVehicle = vehicleTab.query("storagevehicle_code = '" + dto.getVehicle_code() + "' and is_delete = '0' and is_used= '1'").uniqueResult(0); + JSONObject jsonVehicle = vehicleTab.query("ehicle_code = '" + dto.getVehicle_code() + "' and is_delete = '0' and is_used= '1'").uniqueResult(0); if (ObjectUtil.isEmpty(jsonVehicle)) { throw new BadRequestException("载具不存在"); } @@ -153,7 +153,7 @@ public class RegionioInServiceImpl implements RegionioInService { JSONObject jsonMater = materTab.query("material_id = '" + dto.getMaterial_id() + "'").uniqueResult(0); if (ObjectUtil.isNotEmpty(dto.getVehicle_code())) { - JSONObject jsonVehicle = vehicleTab.query("storagevehicle_code = '" + dto.getVehicle_code() + "' and is_delete = '0' and is_used= '1'").uniqueResult(0); + JSONObject jsonVehicle = vehicleTab.query("ehicle_code = '" + dto.getVehicle_code() + "' and is_delete = '0' and is_used= '1'").uniqueResult(0); if (ObjectUtil.isEmpty(jsonVehicle)) { throw new BadRequestException("载具不存在"); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/RegionioOutServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/RegionioOutServiceImpl.java index 33b2154..0599fd1 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/RegionioOutServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/RegionioOutServiceImpl.java @@ -104,7 +104,7 @@ public class RegionioOutServiceImpl implements RegionioOutService { JSONObject jsonMater = materTab.query("material_id = '" + dto.getMaterial_id() + "'").uniqueResult(0); if (ObjectUtil.isNotEmpty(dto.getVehicle_code())) { - JSONObject jsonVehicle = vehicleTab.query("storagevehicle_code = '" + dto.getVehicle_code() + "' and is_delete = '0' and is_used= '1'").uniqueResult(0); + JSONObject jsonVehicle = vehicleTab.query("ehicle_code = '" + dto.getVehicle_code() + "' and is_delete = '0' and is_used= '1'").uniqueResult(0); if (ObjectUtil.isEmpty(jsonVehicle)) { throw new BadRequestException("载具不存在"); } @@ -144,7 +144,7 @@ public class RegionioOutServiceImpl implements RegionioOutService { JSONObject jsonMater = materTab.query("material_id = '" + dto.getMaterial_id() + "'").uniqueResult(0); if (ObjectUtil.isNotEmpty(dto.getVehicle_code())) { - JSONObject jsonVehicle = vehicleTab.query("storagevehicle_code = '" + dto.getVehicle_code() + "' and is_delete = '0' and is_used= '1'").uniqueResult(0); + JSONObject jsonVehicle = vehicleTab.query("ehicle_code = '" + dto.getVehicle_code() + "' and is_delete = '0' and is_used= '1'").uniqueResult(0); if (ObjectUtil.isEmpty(jsonVehicle)) { throw new BadRequestException("载具不存在"); } diff --git a/lms/nladmin-ui/src/api/wms/basedata/master/classstandard.js b/lms/nladmin-ui/src/api/wms/basedata/classstandard.js similarity index 100% rename from lms/nladmin-ui/src/api/wms/basedata/master/classstandard.js rename to lms/nladmin-ui/src/api/wms/basedata/classstandard.js diff --git a/lms/nladmin-ui/src/api/wms/basedata/master/customerbase.js b/lms/nladmin-ui/src/api/wms/basedata/customerbase.js similarity index 100% rename from lms/nladmin-ui/src/api/wms/basedata/master/customerbase.js rename to lms/nladmin-ui/src/api/wms/basedata/customerbase.js diff --git a/lms/nladmin-ui/src/api/wms/basedata/master/businesstypematerial.js b/lms/nladmin-ui/src/api/wms/basedata/master/businesstypematerial.js deleted file mode 100644 index 4e5cc2b..0000000 --- a/lms/nladmin-ui/src/api/wms/basedata/master/businesstypematerial.js +++ /dev/null @@ -1,34 +0,0 @@ -import request from '@/utils/request' - -export function add(data) { - return request({ - url: 'api/businesstypematerial', - method: 'post', - data - }) -} - -export function del(ids) { - return request({ - url: 'api/businesstypematerial/', - method: 'delete', - data: ids - }) -} - -export function edit(data) { - return request({ - url: 'api/businesstypematerial', - method: 'put', - data - }) -} - -export function getTypeCode() { - return request({ - url: 'api/businesstypematerial/getTypeCode', - method: 'get' - }) -} - -export default { add, edit, del, getTypeCode } diff --git a/lms/nladmin-ui/src/api/wms/basedata/master/materialparameters.js b/lms/nladmin-ui/src/api/wms/basedata/master/materialparameters.js deleted file mode 100644 index 8e83f55..0000000 --- a/lms/nladmin-ui/src/api/wms/basedata/master/materialparameters.js +++ /dev/null @@ -1,50 +0,0 @@ -import request from '@/utils/request' - -export function add(data) { - return request({ - url: 'api/MaterialParameters', - method: 'post', - data - }) -} - -export function del(ids) { - return request({ - url: 'api/MaterialParameters/', - method: 'delete', - data: ids - }) -} - -export function edit(data) { - return request({ - url: 'api/MaterialParameters', - method: 'put', - data - }) -} - -export function save(data) { - return request({ - url: 'api/MaterialParameters/save', - method: 'put', - data - }) -} - -export function queryMaterialParam(data) { - return request({ - url: 'api/MaterialParameters/materialParam', - method: 'post', - data - }) -} - -export function getSeries() { - return request({ - url: 'api/MaterialParameters/getSeries', - method: 'get' - }) -} - -export default { add, edit, del, save, queryMaterialParam, getSeries } diff --git a/lms/nladmin-ui/src/api/wms/basedata/master/materialbase.js b/lms/nladmin-ui/src/api/wms/basedata/materialbase.js similarity index 100% rename from lms/nladmin-ui/src/api/wms/basedata/master/materialbase.js rename to lms/nladmin-ui/src/api/wms/basedata/materialbase.js diff --git a/lms/nladmin-ui/src/api/wms/basedata/master/mdPbMeasureunit.js b/lms/nladmin-ui/src/api/wms/basedata/mdPbMeasureunit.js similarity index 100% rename from lms/nladmin-ui/src/api/wms/basedata/master/mdPbMeasureunit.js rename to lms/nladmin-ui/src/api/wms/basedata/mdPbMeasureunit.js diff --git a/lms/nladmin-ui/src/api/wms/basedata/pdm/workProcedure.js b/lms/nladmin-ui/src/api/wms/basedata/pdm/workProcedure.js deleted file mode 100644 index 3cc498f..0000000 --- a/lms/nladmin-ui/src/api/wms/basedata/pdm/workProcedure.js +++ /dev/null @@ -1,33 +0,0 @@ -import request from '@/utils/request' - -export function add(data) { - return request({ - url: 'api/workProcedure', - method: 'post', - data - }) -} - -export function del(ids) { - return request({ - url: 'api/workProcedure/', - method: 'delete', - data: ids - }) -} - -export function edit(data) { - return request({ - url: 'api/workProcedure', - method: 'put', - data - }) -} - -export function downSelect() { - return request({ - url: 'api/workProcedure/downSelect' - }) -} - -export default { add, edit, del, downSelect } diff --git a/lms/nladmin-ui/src/api/wms/basedata/st/sectattr.js b/lms/nladmin-ui/src/api/wms/basedata/st/sectattr.js deleted file mode 100644 index 18b511a..0000000 --- a/lms/nladmin-ui/src/api/wms/basedata/st/sectattr.js +++ /dev/null @@ -1,43 +0,0 @@ -import request from '@/utils/request' - -export function add(data) { - return request({ - url: 'api/sectattr', - method: 'post', - data - }) -} - -export function del(ids) { - return request({ - url: 'api/sectattr/', - method: 'delete', - data: ids - }) -} - -export function edit(data) { - return request({ - url: 'api/sectattr', - method: 'put', - data - }) -} - -export function getSect(params) { - return request({ - url: 'api/sectattr/getSect', - method: 'get', - params - }) -} - -export function changeActive(data) { - return request({ - url: 'api/sectattr/changeActive', - method: 'put', - data - }) -} - -export default { add, edit, del, getSect, changeActive } diff --git a/lms/nladmin-ui/src/api/wms/basedata/st/storattr.js b/lms/nladmin-ui/src/api/wms/basedata/st/storattr.js deleted file mode 100644 index 747d12b..0000000 --- a/lms/nladmin-ui/src/api/wms/basedata/st/storattr.js +++ /dev/null @@ -1,43 +0,0 @@ -import request from '@/utils/request' - -export function add(data) { - return request({ - url: 'api/Storattr', - method: 'post', - data - }) -} - -export function del(ids) { - return request({ - url: 'api/Storattr/', - method: 'delete', - data: ids - }) -} - -export function edit(data) { - return request({ - url: 'api/Storattr', - method: 'put', - data - }) -} - -export function getStor(params) { - return request({ - url: 'api/Storattr/getStor', - method: 'get', - params - }) -} - -export function changeActive(data) { - return request({ - url: 'api/Storattr/changeActive', - method: 'put', - data - }) -} - -export default { add, edit, del, getStor, changeActive } diff --git a/lms/nladmin-ui/src/api/wms/basedata/st/structattr.js b/lms/nladmin-ui/src/api/wms/basedata/st/structattr.js deleted file mode 100644 index fbcd30c..0000000 --- a/lms/nladmin-ui/src/api/wms/basedata/st/structattr.js +++ /dev/null @@ -1,35 +0,0 @@ -import request from '@/utils/request' - -export function add(data) { - return request({ - url: 'api/structattr', - method: 'post', - data - }) -} - -export function del(ids) { - return request({ - url: 'api/structattr/', - method: 'delete', - data: ids - }) -} - -export function edit(data) { - return request({ - url: 'api/structattr', - method: 'put', - data - }) -} - -export function changeActive(data) { - return request({ - url: 'api/structattr/changeActive', - method: 'put', - data - }) -} - -export default { add, edit, del, changeActive } diff --git a/lms/nladmin-ui/src/api/wms/basedata/st/structivt.js b/lms/nladmin-ui/src/api/wms/basedata/st/structivt.js deleted file mode 100644 index 2e3f029..0000000 --- a/lms/nladmin-ui/src/api/wms/basedata/st/structivt.js +++ /dev/null @@ -1,49 +0,0 @@ -import request from '@/utils/request' - -export function add(data) { - return request({ - url: 'api/structivt', - method: 'post', - data - }) -} - -export function del(ids) { - return request({ - url: 'api/structivt/', - method: 'delete', - data: ids - }) -} - -export function edit(data) { - return request({ - url: 'api/structivt', - method: 'put', - data - }) -} - -export function getStruct() { - return request({ - url: 'api/structivt/getStruct', - method: 'get' - }) -} - -export function getStructById(data) { - return request({ - url: 'api/structivt/getStructById', - method: 'post', - data - }) -} - -export function getUnits() { - return request({ - url: 'api/structivt/getUnits', - method: 'get' - }) -} - -export default { add, edit, del, getStruct, getStructById, getUnits } diff --git a/lms/nladmin-ui/src/api/wms/basedata/master/supplierbase.js b/lms/nladmin-ui/src/api/wms/basedata/supplierbase.js similarity index 100% rename from lms/nladmin-ui/src/api/wms/basedata/master/supplierbase.js rename to lms/nladmin-ui/src/api/wms/basedata/supplierbase.js diff --git a/lms/nladmin-ui/src/api/wms/basedata/master/storagevehicleinfo.js b/lms/nladmin-ui/src/api/wms/basedata/vehicle.js similarity index 100% rename from lms/nladmin-ui/src/api/wms/basedata/master/storagevehicleinfo.js rename to lms/nladmin-ui/src/api/wms/basedata/vehicle.js diff --git a/lms/nladmin-ui/src/views/monitor/online/index.vue b/lms/nladmin-ui/src/views/monitor/online/index.vue index ccafe3e..3a104a5 100644 --- a/lms/nladmin-ui/src/views/monitor/online/index.vue +++ b/lms/nladmin-ui/src/views/monitor/online/index.vue @@ -29,7 +29,7 @@ - + diff --git a/lms/nladmin-ui/src/views/system/dict/dictDetail.vue b/lms/nladmin-ui/src/views/system/dict/dictDetail.vue index b6e2554..6dce71d 100644 --- a/lms/nladmin-ui/src/views/system/dict/dictDetail.vue +++ b/lms/nladmin-ui/src/views/system/dict/dictDetail.vue @@ -35,7 +35,7 @@ {{ query.dictName }} - + diff --git a/lms/nladmin-ui/src/views/wms/basedata/master/class/index.vue b/lms/nladmin-ui/src/views/wms/basedata/class/index.vue similarity index 99% rename from lms/nladmin-ui/src/views/wms/basedata/master/class/index.vue rename to lms/nladmin-ui/src/views/wms/basedata/class/index.vue index 29f8498..1fe5a33 100644 --- a/lms/nladmin-ui/src/views/wms/basedata/master/class/index.vue +++ b/lms/nladmin-ui/src/views/wms/basedata/class/index.vue @@ -131,7 +131,7 @@ - - diff --git a/lms/nladmin-ui/src/views/wms/basedata/st/sect/index.vue b/lms/nladmin-ui/src/views/wms/basedata/st/sect/index.vue deleted file mode 100644 index 693f658..0000000 --- a/lms/nladmin-ui/src/views/wms/basedata/st/sect/index.vue +++ /dev/null @@ -1,324 +0,0 @@ - - - - - diff --git a/lms/nladmin-ui/src/views/wms/basedata/st/stor/index.vue b/lms/nladmin-ui/src/views/wms/basedata/st/stor/index.vue deleted file mode 100644 index d8285e4..0000000 --- a/lms/nladmin-ui/src/views/wms/basedata/st/stor/index.vue +++ /dev/null @@ -1,400 +0,0 @@ - - - - - diff --git a/lms/nladmin-ui/src/views/wms/basedata/st/struct/index.vue b/lms/nladmin-ui/src/views/wms/basedata/st/struct/index.vue deleted file mode 100644 index 1e48205..0000000 --- a/lms/nladmin-ui/src/views/wms/basedata/st/struct/index.vue +++ /dev/null @@ -1,457 +0,0 @@ - - - - - diff --git a/lms/nladmin-ui/src/views/wms/basedata/master/supp/index.vue b/lms/nladmin-ui/src/views/wms/basedata/supp/index.vue similarity index 98% rename from lms/nladmin-ui/src/views/wms/basedata/master/supp/index.vue rename to lms/nladmin-ui/src/views/wms/basedata/supp/index.vue index 16fb7f4..487f0bd 100644 --- a/lms/nladmin-ui/src/views/wms/basedata/master/supp/index.vue +++ b/lms/nladmin-ui/src/views/wms/basedata/supp/index.vue @@ -173,13 +173,13 @@