From f1309ba76faf95953682f628bd8bb024a9299c38 Mon Sep 17 00:00:00 2001 From: zds <2388969634@qq.com> Date: Fri, 18 Oct 2024 10:14:45 +0800 Subject: [PATCH] =?UTF-8?q?opt:=E5=88=A0=E9=99=A4wql=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/IInterfaceBackService.java | 3 - .../impl/InterfaceBackServiceImpl.java | 4 - .../master/rest/ClassstandardController.java | 136 --- .../master/rest/InterfacebackController.java | 64 -- .../rest/TransportationbaseController.java | 71 -- .../master/service/InterfacebackService.java | 70 -- .../service/TransportationbaseService.java | 76 -- .../master/service/dto/InterfacebackDto.java | 53 -- .../service/dto/TransportationbaseDto.java | 163 ---- .../impl/InterfacebackServiceImpl.java | 132 --- .../impl/TransportationbaseServiceImpl.java | 159 ---- .../service/ITransportationBaseService.java | 2 - .../impl/TransportationBaseServiceImpl.java | 3 - .../basedata/st/rest/SectattrController.java | 93 -- .../basedata/st/rest/StorattrController.java | 85 -- .../st/rest/StructattrController.java | 143 --- .../basedata/st/service/SectattrService.java | 103 -- .../basedata/st/service/StorattrService.java | 101 -- .../st/service/StructattrService.java | 189 ---- .../basedata/st/service/dto/SectattrDto.java | 179 ---- .../basedata/st/service/dto/StorattrDto.java | 130 --- .../st/service/dto/StructattrDto.java | 234 ----- .../st/service/impl/SectattrServiceImpl.java | 287 ------ .../st/service/impl/StorattrServiceImpl.java | 228 ----- .../service/impl/StructattrServiceImpl.java | 901 ------------------ .../controller/HandMoveStorController.java | 3 +- .../movestor/service/HandMoveStorService.java | 6 +- .../service/dao/mapper/MoveStorDtlMapper.java | 15 +- .../service/dao/mapper/MoveStorDtlMapper.xml | 59 ++ .../movestor/service/dto/MoveStorDtlDto.java | 79 ++ .../service/dto/MoveStorDtlQuery.java | 20 + .../service/impl/HandMoveStorServiceImpl.java | 28 +- .../instor/service/impl/CheckServiceImpl.java | 2 +- .../st/instor/wql/QST_IVT_HANDMOVESTOR.wql | 76 +- .../basedata/master/class/classstandard.js | 25 +- .../wms/st/inStor/moveStor/AddDialog.vue | 2 + .../wms/st/inStor/productscrap/AddDtl.vue | 2 +- 37 files changed, 215 insertions(+), 3711 deletions(-) delete mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/ClassstandardController.java delete mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/InterfacebackController.java delete mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/TransportationbaseController.java delete mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/InterfacebackService.java delete mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/TransportationbaseService.java delete mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/InterfacebackDto.java delete mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/TransportationbaseDto.java delete mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/InterfacebackServiceImpl.java delete mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/TransportationbaseServiceImpl.java delete mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/SectattrController.java delete mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/StorattrController.java delete mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/StructattrController.java delete mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/SectattrService.java delete mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/StorattrService.java delete mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/StructattrService.java delete mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/dto/SectattrDto.java delete mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/dto/StorattrDto.java delete mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/dto/StructattrDto.java delete mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/SectattrServiceImpl.java delete mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StorattrServiceImpl.java delete mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructattrServiceImpl.java create mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/st/instor/movestor/service/dto/MoveStorDtlDto.java create mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/st/instor/movestor/service/dto/MoveStorDtlQuery.java diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/interfaceback/service/IInterfaceBackService.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/interfaceback/service/IInterfaceBackService.java index 5f58e86..cc0d6c0 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/interfaceback/service/IInterfaceBackService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/interfaceback/service/IInterfaceBackService.java @@ -4,10 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import org.nl.common.domain.query.PageQuery; import org.nl.wms.basedata.master.interfaceback.service.dao.InterfaceBack; -import org.nl.wms.basedata.master.service.dto.InterfacebackDto; -import org.springframework.data.domain.Pageable; -import java.util.List; import java.util.Map; /** diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/interfaceback/service/impl/InterfaceBackServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/interfaceback/service/impl/InterfaceBackServiceImpl.java index 05c0084..a060ee0 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/interfaceback/service/impl/InterfaceBackServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/interfaceback/service/impl/InterfaceBackServiceImpl.java @@ -13,14 +13,10 @@ import org.nl.modules.common.exception.BadRequestException; import org.nl.wms.basedata.master.interfaceback.service.IInterfaceBackService; import org.nl.wms.basedata.master.interfaceback.service.dao.InterfaceBack; import org.nl.wms.basedata.master.interfaceback.service.dao.mapper.InterfaceBackMapper; -import org.nl.wms.basedata.master.service.dto.InterfacebackDto; -import org.nl.wms.basedata.master.standard.service.dao.ClassStandard; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import java.util.Arrays; -import java.util.List; import java.util.Map; /** 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/master/rest/ClassstandardController.java deleted file mode 100644 index e685862..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/ClassstandardController.java +++ /dev/null @@ -1,136 +0,0 @@ -package org.nl.wms.basedata.master.rest; - - -import cn.hutool.core.map.MapUtil; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -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.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-07 - **/ -@RestController -@RequiredArgsConstructor - -@RequestMapping("/api/Classstandard2") -@Slf4j -public class ClassstandardController { - - private final ClassstandardService ClassstandardService; - - @GetMapping - @Log("查询基础类别") - - //@PreAuthorize("@el.check('Classstandard:list')") - public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { - return new ResponseEntity<>(ClassstandardService.queryAll(whereJson, page), HttpStatus.OK); - } - - @PostMapping - @Log("新增基础类别") - - //@PreAuthorize("@el.check('Classstandard:add')") - public ResponseEntity create(@Validated @RequestBody ClassstandardDto dto) { - ClassstandardService.create(dto); - return new ResponseEntity<>(HttpStatus.CREATED); - } - - @PutMapping - @Log("修改基础类别") - - //@PreAuthorize("@el.check('Classstandard:edit')") - public ResponseEntity update(@Validated @RequestBody ClassstandardDto dto) { - ClassstandardService.update(dto); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } - - @Log("删除基础类别") - - //@PreAuthorize("@el.check('Classstandard:del')") - @DeleteMapping - public ResponseEntity delete(@RequestBody Long[] ids) { - ClassstandardService.deleteAll(ids); - return new ResponseEntity<>(HttpStatus.OK); - } - - @GetMapping("/loadClass") - @Log("查询基础类型") - - //@PreAuthorize("@el.check('materialtype:list')") - public ResponseEntity query(@RequestParam Map whereJson) { - return new ResponseEntity<>(ClassstandardService.loadClass(whereJson), HttpStatus.OK); - } - - @GetMapping("/getClass") - @Log("查询基础类型") - - //@PreAuthorize("@el.check('materialtype:list')") - public ResponseEntity queryClassBycode(@RequestParam Map whereJson) { - return new ResponseEntity<>(ClassstandardService.queryClassBycode(whereJson), HttpStatus.OK); - } - - - @GetMapping("/queryClassById") - @Log("查询分类基础列表") - - //@PreAuthorize("@el.check('materialtype:list')") - public ResponseEntity queryClassById(@RequestParam Map whereJson) { - return new ResponseEntity<>(ClassstandardService.queryClassById(whereJson), HttpStatus.OK); - } - - @GetMapping("/getClassTable") - @Log("查询物料基础类型") - - //@PreAuthorize("@el.check('materialtype:list')") - public ResponseEntity queryClassTable(@RequestParam Map whereJson, Pageable page) { - return new ResponseEntity<>(ClassstandardService.queryClassTable(whereJson, page), HttpStatus.OK); - } - - - @PostMapping("/superior") - //@PreAuthorize("@el.check('user:list','dept:list')") - public ResponseEntity getSuperior(@RequestBody Long id) { - JSONObject jo = WQLObject.getWQLObject("MD_PB_ClassStandard").query("class_id = '" + id + "'").uniqueResult(0); - JSONArray maters = ClassstandardService.getSuperior(jo, new JSONArray()); - return new ResponseEntity<>(ClassstandardService.buildTree(maters), HttpStatus.OK); - } - - @GetMapping("/getType") - @Log("获取分类类型") - - //@PreAuthorize("@el.check('materialtype:list')") - public ResponseEntity getType(@RequestParam Map whereJson) { - String type_id = MapUtil.getStr(whereJson, "type_id"); - int level = MapUtil.getInt(whereJson, "level"); - return new ResponseEntity<>(ClassstandardService.getType(type_id, level), HttpStatus.OK); - } - - @GetMapping("/getClassName") - @Log("获取分类名称下拉框") - - public ResponseEntity getClassName() { - return new ResponseEntity<>(ClassstandardService.getClassName(), HttpStatus.OK); - } - - @PostMapping("/getCasClass") - @Log("获取对应下拉框-多级下拉框") - - public ResponseEntity getSect(@RequestBody JSONObject whereJson) { - return new ResponseEntity<>(ClassstandardService.getCasClass(whereJson), HttpStatus.OK); - } - - -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/InterfacebackController.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/InterfacebackController.java deleted file mode 100644 index 1b9fe3c..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/InterfacebackController.java +++ /dev/null @@ -1,64 +0,0 @@ -package org.nl.wms.basedata.master.rest; - - -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.modules.logging.annotation.Log; -import org.nl.wms.basedata.master.service.InterfacebackService; -import org.nl.wms.basedata.master.service.dto.InterfacebackDto; -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 liuxy - * @date 2022-12-09 - **/ -@RestController -@RequiredArgsConstructor - -@RequestMapping("/api/interfaceback2") -@Slf4j -public class InterfacebackController { - - private final InterfacebackService interfacebackService; - - @GetMapping - @Log("查询接口回传设置") - - //@SaCheckPermission("@el.check('interfaceback:list')") - public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { - return new ResponseEntity<>(interfacebackService.queryAll(whereJson, page), HttpStatus.OK); - } - - @PostMapping - @Log("新增接口回传设置") - - //@SaCheckPermission("@el.check('interfaceback:add')") - public ResponseEntity create(@Validated @RequestBody InterfacebackDto dto) { - interfacebackService.create(dto); - return new ResponseEntity<>(HttpStatus.CREATED); - } - - @PutMapping - @Log("修改接口回传设置") - - //@SaCheckPermission("@el.check('interfaceback:edit')") - public ResponseEntity update(@Validated @RequestBody InterfacebackDto dto) { - interfacebackService.update(dto); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } - - @Log("删除接口回传设置") - - //@SaCheckPermission("@el.check('interfaceback:del')") - @DeleteMapping - public ResponseEntity delete(@RequestBody Long[] ids) { - interfacebackService.deleteAll(ids); - return new ResponseEntity<>(HttpStatus.OK); - } -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/TransportationbaseController.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/TransportationbaseController.java deleted file mode 100644 index 3d6489e..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/TransportationbaseController.java +++ /dev/null @@ -1,71 +0,0 @@ -package org.nl.wms.basedata.master.rest; - - -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.modules.logging.annotation.Log; -import org.nl.wms.basedata.master.service.TransportationbaseService; -import org.nl.wms.basedata.master.service.dto.TransportationbaseDto; -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 Liuxy - * @date 2022-11-10 - **/ -@RestController -@RequiredArgsConstructor - -@RequestMapping("/api/transportationbase2") -@Slf4j -public class TransportationbaseController { - - private final TransportationbaseService transportationbaseService; - - @GetMapping - @Log("查询运输公司基本信息") - - //@SaCheckPermission("@el.check('transportationbase:list')") - public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { - return new ResponseEntity<>(transportationbaseService.queryAll(whereJson, page), HttpStatus.OK); - } - - @PostMapping - @Log("新增运输公司基本信息") - - //@SaCheckPermission("@el.check('transportationbase:add')") - public ResponseEntity create(@Validated @RequestBody TransportationbaseDto dto) { - transportationbaseService.create(dto); - return new ResponseEntity<>(HttpStatus.CREATED); - } - - @PutMapping - @Log("修改运输公司基本信息") - - //@SaCheckPermission("@el.check('transportationbase:edit')") - public ResponseEntity update(@Validated @RequestBody TransportationbaseDto dto) { - transportationbaseService.update(dto); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } - - @Log("删除运输公司基本信息") - - //@SaCheckPermission("@el.check('transportationbase:del')") - @DeleteMapping - public ResponseEntity delete(@RequestBody Long[] ids) { - transportationbaseService.deleteAll(ids); - return new ResponseEntity<>(HttpStatus.OK); - } - - @Log("删除运输公司基本信息") - - @PostMapping("/getTransporta") - public ResponseEntity getTransporta() { - return new ResponseEntity<>(transportationbaseService.getTransporta(), HttpStatus.OK); - } -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/InterfacebackService.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/InterfacebackService.java deleted file mode 100644 index e8a5d5d..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/InterfacebackService.java +++ /dev/null @@ -1,70 +0,0 @@ -package org.nl.wms.basedata.master.service; - -import org.nl.wms.basedata.master.service.dto.InterfacebackDto; -import org.springframework.data.domain.Pageable; - -import java.util.List; -import java.util.Map; - -/** - * @author liuxy - * @description 服务接口 - * @date 2022-12-09 - **/ -public interface InterfacebackService { - - /** - * 查询数据分页 - * - * @param whereJson 条件 - * @param page 分页参数 - * @return Map - */ - Map queryAll(Map whereJson, Pageable page); - - /** - * 查询所有数据不分页 - * - * @param whereJson 条件参数 - * @return List - */ - List queryAll(Map whereJson); - - /** - * 根据ID查询 - * - * @param interface_id ID - * @return Interfaceback - */ - InterfacebackDto findById(Long interface_id); - - /** - * 根据编码查询 - * - * @param code code - * @return Interfaceback - */ - InterfacebackDto findByCode(String code); - - - /** - * 创建 - * - * @param dto / - */ - void create(InterfacebackDto dto); - - /** - * 编辑 - * - * @param dto / - */ - void update(InterfacebackDto dto); - - /** - * 多选删除 - * - * @param ids / - */ - void deleteAll(Long[] ids); -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/TransportationbaseService.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/TransportationbaseService.java deleted file mode 100644 index 230d2e2..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/TransportationbaseService.java +++ /dev/null @@ -1,76 +0,0 @@ -package org.nl.wms.basedata.master.service; - -import com.alibaba.fastjson.JSONArray; -import org.nl.wms.basedata.master.service.dto.TransportationbaseDto; -import org.springframework.data.domain.Pageable; - -import java.util.List; -import java.util.Map; - -/** - * @author Liuxy - * @description 服务接口 - * @date 2022-11-10 - **/ -public interface TransportationbaseService { - - /** - * 查询数据分页 - * - * @param whereJson 条件 - * @param page 分页参数 - * @return Map - */ - Map queryAll(Map whereJson, Pageable page); - - /** - * 查询所有数据不分页 - * - * @param whereJson 条件参数 - * @return List - */ - List queryAll(Map whereJson); - - /** - * 根据ID查询 - * - * @param cust_id ID - * @return Transportationbase - */ - TransportationbaseDto findById(Long cust_id); - - /** - * 根据编码查询 - * - * @param code code - * @return Transportationbase - */ - TransportationbaseDto findByCode(String code); - - - /** - * 创建 - * - * @param dto / - */ - void create(TransportationbaseDto dto); - - /** - * 编辑 - * - * @param dto / - */ - void update(TransportationbaseDto dto); - - /** - * 多选删除 - * - * @param ids / - */ - void deleteAll(Long[] ids); - - /** - * 获取下拉框 - */ - JSONArray getTransporta(); -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/InterfacebackDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/InterfacebackDto.java deleted file mode 100644 index 7a3620e..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/InterfacebackDto.java +++ /dev/null @@ -1,53 +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; - -/** - * @author liuxy - * @description / - * @date 2022-12-09 - **/ -@Data -public class InterfacebackDto implements Serializable { - - /** 标识 */ - /** - * 防止精度丢失 - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long interface_id; - - /** - * 类型 - */ - private String interface_type; - - /** - * 接口名称 - */ - private String interface_name; - - /** - * 接口描述 - */ - private String remark; - - /** - * 是否回传 - */ - private String is_back; - - /** - * 业务说明 - */ - private String business_comment; - - /** - * 业务说明 - */ - private String[] product_area; -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/TransportationbaseDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/TransportationbaseDto.java deleted file mode 100644 index 0a638bf..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/TransportationbaseDto.java +++ /dev/null @@ -1,163 +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; - -/** - * @author Liuxy - * @description / - * @date 2022-11-10 - **/ -@Data -public class TransportationbaseDto implements Serializable { - - /** 物流公司标识 */ - /** - * 防止精度丢失 - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long cust_id; - - /** - * 物流公司编码 - */ - private String cust_code; - - /** - * 物流公司名称 - */ - private String cust_name; - - /** - * 物流公司简称 - */ - private String cust_simple_name; - - /** - * 国家 - */ - private String country; - - /** - * 省份 - */ - private String state; - - /** - * 城市 - */ - private String city; - - /** - * 传真 - */ - private String faxnumber; - - /** - * 邮箱 - */ - private String webSite; - - /** - * 法人代表 - */ - private String jurid_name; - - /** - * 税务登记号 - */ - private String tax_no; - - /** - * 工商注册号 - */ - private String register_no; - - /** - * 经营许可证号 - */ - private String manage_lice_no; - - /** - * 营业执照 - */ - private String busi_char_name; - - /** - * 行政区划 - */ - private Long area_id; - - /** - * 邮政编码 - */ - private String zip_code; - - /** - * 公司电话 - */ - private String corp_tele_no; - - /** - * 公司地址 - */ - private String corp_address; - - /** - * 创建人 - */ - private String create_id; - - /** - * 创建人姓名 - */ - private String create_name; - - /** - * 创建时间 - */ - private String create_time; - - /** - * 修改人 - */ - private String 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 remark; -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/InterfacebackServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/InterfacebackServiceImpl.java deleted file mode 100644 index c16f736..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/InterfacebackServiceImpl.java +++ /dev/null @@ -1,132 +0,0 @@ -package org.nl.wms.basedata.master.service.impl; - - -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.wql.WQL; -import org.nl.modules.wql.core.bean.WQLObject; -import org.nl.modules.wql.util.WqlUtil; -import org.nl.wms.basedata.master.service.InterfacebackService; -import org.nl.wms.basedata.master.service.dto.InterfacebackDto; -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; - -/** - * @author liuxy - * @description 服务实现 - * @date 2022-12-09 - **/ -@Service -@RequiredArgsConstructor -@Slf4j -public class InterfacebackServiceImpl implements InterfacebackService { - - @Override - public Map queryAll(Map whereJson, Pageable page) { - String interface_name = MapUtil.getStr(whereJson, "interface_name"); - - JSONObject map = new JSONObject(); - map.put("flag", "1"); - if (ObjectUtil.isNotEmpty(interface_name)) { - map.put("interface_name", "%" + interface_name + "%"); - } - - JSONObject json = WQL.getWO("QMD_PB_INTERFACEBACK").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "interface_type ASC"); - - JSONArray rows = json.getJSONArray("content"); - JSONArray content = new JSONArray(); - for (int i = 0; i < rows.size(); i++) { - JSONObject row = rows.getJSONObject(i); - String product_area = row.getString("product_area"); - if (StrUtil.isNotEmpty(product_area)) { - product_area = (product_area.replace("[", "").replace("]", "")).replaceAll("\\\"", ""); - String[] areas = product_area.split(","); - row.put("product_area", areas); - } - content.add(row); - } - json.put("content", content); - return json; - } - - @Override - public List queryAll(Map whereJson) { - WQLObject wo = WQLObject.getWQLObject("md_pb_interfaceback"); - JSONArray arr = wo.query().getResultJSONArray(0); - if (ObjectUtil.isNotEmpty(arr)) { - return arr.toJavaList(InterfacebackDto.class); - } - return null; - } - - @Override - public InterfacebackDto findById(Long interface_id) { - WQLObject wo = WQLObject.getWQLObject("md_pb_interfaceback"); - JSONObject json = wo.query("interface_id = '" + interface_id + "'").uniqueResult(0); - String product_area = json.getString("product_area"); - if (StrUtil.isNotEmpty(product_area)) { - product_area = (product_area.replace("[", "").replace("]", "")).replaceAll("\\\"", ""); - String[] areas = product_area.split(","); - json.put("product_area", areas); - } - if (ObjectUtil.isNotEmpty(json)) { - return json.toJavaObject(InterfacebackDto.class); - } - return null; - } - - @Override - public InterfacebackDto findByCode(String code) { - WQLObject wo = WQLObject.getWQLObject("md_pb_interfaceback"); - JSONObject json = wo.query("code ='" + code + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(json)) { - return json.toJavaObject(InterfacebackDto.class); - } - return null; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void create(InterfacebackDto dto) { - dto.setInterface_id(IdUtil.getSnowflake(1, 1).nextId()); - - WQLObject wo = WQLObject.getWQLObject("md_pb_interfaceback"); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - wo.insert(json); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(InterfacebackDto dto) { - InterfacebackDto entity = this.findById(dto.getInterface_id()); - if (entity == null) { - throw new BadRequestException("被删除或无权限，操作失败!"); - } - - WQLObject wo = WQLObject.getWQLObject("md_pb_interfaceback"); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - wo.update(json); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void deleteAll(Long[] ids) { - WQLObject wo = WQLObject.getWQLObject("md_pb_interfaceback"); - for (Long interface_id : ids) { - wo.delete("interface_id = '" + interface_id + "'"); - } - } - -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/TransportationbaseServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/TransportationbaseServiceImpl.java deleted file mode 100644 index ae99387..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/TransportationbaseServiceImpl.java +++ /dev/null @@ -1,159 +0,0 @@ -package org.nl.wms.basedata.master.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 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.common.utils.SecurityUtils; -import org.nl.modules.common.exception.BadRequestException; -import org.nl.modules.wql.WQL; -import org.nl.modules.wql.core.bean.WQLObject; -import org.nl.modules.wql.util.WqlUtil; -import org.nl.wms.basedata.master.service.TransportationbaseService; -import org.nl.wms.basedata.master.service.dto.TransportationbaseDto; -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; - -/** - * @author Liuxy - * @description 服务实现 - * @date 2022-11-10 - **/ -@Service -@RequiredArgsConstructor -@Slf4j -public class TransportationbaseServiceImpl implements TransportationbaseService { - - @Override - public Map queryAll(Map whereJson, Pageable page) { - - String cust_code = MapUtil.getStr(whereJson, "cust_code"); - String cust_name = MapUtil.getStr(whereJson, "cust_name"); - - JSONObject map = new JSONObject(); - map.put("flag", "1"); - map.put("is_used", MapUtil.getStr(whereJson, "is_used")); - if (ObjectUtil.isNotEmpty(cust_code)) { - map.put("cust_code", "%" + cust_code + "%"); - } - if (ObjectUtil.isNotEmpty(cust_name)) { - map.put("cust_name", "%" + cust_name + "%"); - } - JSONObject json = WQL.getWO("QMD_CS_TRANSPORAIONL").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "update_time ASC"); - return json; - } - - @Override - public List queryAll(Map whereJson) { - WQLObject wo = WQLObject.getWQLObject("md_cs_transportationbase"); - JSONArray arr = wo.query().getResultJSONArray(0); - if (ObjectUtil.isNotEmpty(arr)) { - return arr.toJavaList(TransportationbaseDto.class); - } - return null; - } - - @Override - public TransportationbaseDto findById(Long cust_id) { - WQLObject wo = WQLObject.getWQLObject("md_cs_transportationbase"); - JSONObject json = wo.query("cust_id = '" + cust_id + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(json)) { - return json.toJavaObject(TransportationbaseDto.class); - } - return null; - } - - @Override - public TransportationbaseDto findByCode(String code) { - WQLObject wo = WQLObject.getWQLObject("md_cs_transportationbase"); - JSONObject json = wo.query("code ='" + code + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(json)) { - return json.toJavaObject(TransportationbaseDto.class); - } - return null; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void create(TransportationbaseDto dto) { - WQLObject tab = WQLObject.getWQLObject("MD_CS_TransportationBase"); - - JSONObject jsonObject = tab.query("cust_code = '" + dto.getCust_code() + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(jsonObject)) { - throw new BadRequestException("此编码已存在"); - } - - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - String now = DateUtil.now(); - - dto.setCust_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); - - WQLObject wo = WQLObject.getWQLObject("md_cs_transportationbase"); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - wo.insert(json); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(TransportationbaseDto dto) { - TransportationbaseDto entity = this.findById(dto.getCust_id()); - if (entity == null) { - throw new BadRequestException("被删除或无权限，操作失败!"); - } - - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - - String now = DateUtil.now(); - dto.setUpdate_time(now); - dto.setUpdate_optid(currentUserId); - dto.setUpdate_optname(nickName); - - WQLObject wo = WQLObject.getWQLObject("md_cs_transportationbase"); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - wo.update(json); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void deleteAll(Long[] ids) { - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - String now = DateUtil.now(); - - WQLObject wo = WQLObject.getWQLObject("md_cs_transportationbase"); - for (Long cust_id : ids) { - JSONObject param = new JSONObject(); - param.put("cust_id", String.valueOf(cust_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 getTransporta() { - JSONArray resultJSONArray = WQL.getWO("QMD_CS_TRANSPORAIONL").addParam("flag", "2").process().getResultJSONArray(0); - return resultJSONArray; - } - -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/transport/service/ITransportationBaseService.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/transport/service/ITransportationBaseService.java index 647ac0a..dcc26f1 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/transport/service/ITransportationBaseService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/transport/service/ITransportationBaseService.java @@ -1,10 +1,8 @@ package org.nl.wms.basedata.master.transport.service; -import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import org.nl.common.domain.query.PageQuery; -import org.nl.wms.basedata.master.service.dto.TransportationbaseDto; import org.nl.wms.basedata.master.transport.service.dao.TransportationBase; import org.nl.wms.pda.common.SelectVo; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/transport/service/impl/TransportationBaseServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/transport/service/impl/TransportationBaseServiceImpl.java index 50dac79..3dd7472 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/transport/service/impl/TransportationBaseServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/transport/service/impl/TransportationBaseServiceImpl.java @@ -4,17 +4,14 @@ 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 com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.nl.common.domain.query.PageQuery; import org.nl.common.utils.SecurityUtils; import org.nl.modules.common.exception.BadRequestException; -import org.nl.wms.basedata.master.service.dto.TransportationbaseDto; import org.nl.wms.basedata.master.transport.service.ITransportationBaseService; import org.nl.wms.basedata.master.transport.service.dao.TransportationBase; import org.nl.wms.basedata.master.transport.service.dao.mapper.TransportationBaseMapper; 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 e529fc2..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/SectattrController.java +++ /dev/null @@ -1,93 +0,0 @@ -/* -package org.nl.wms.basedata.st.rest; - - -import com.alibaba.fastjson.JSONObject; -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 - -@RequestMapping("/api/sectattr") -@Slf4j -public class SectattrController { - - private final SectattrService sectattrService; - - @GetMapping - @Log("查询库区") - - //@PreAuthorize("@el.check('sectattr:list')") - public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { - return new ResponseEntity<>(sectattrService.queryAll(whereJson, page), HttpStatus.OK); - } - - @PostMapping - @Log("新增库区") - - //@PreAuthorize("@el.check('sectattr:add')") - public ResponseEntity create(@Validated @RequestBody SectattrDto dto) { - sectattrService.create(dto); - return new ResponseEntity<>(HttpStatus.CREATED); - } - - @PutMapping - @Log("修改库区") - - //@PreAuthorize("@el.check('sectattr:edit')") - public ResponseEntity update(@Validated @RequestBody SectattrDto dto) { - sectattrService.update(dto); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } - - @Log("删除库区") - - //@PreAuthorize("@el.check('sectattr:del')") - @DeleteMapping - public ResponseEntity delete(@RequestBody Long[] ids) { - sectattrService.deleteAll(ids); - return new ResponseEntity<>(HttpStatus.OK); - } - - @GetMapping("/getSect") - @Log("查询库区下拉框") - - //@PreAuthorize("@el.check('materialtype:list')") - public ResponseEntity querySect(@RequestParam Map whereJson) { - return new ResponseEntity<>(sectattrService.getSect(whereJson), HttpStatus.OK); - } - - @PostMapping("/getStorSect") - @Log("查询指定仓库库区") - - //@PreAuthorize("@el.check('materialtype:list')") - public ResponseEntity getStorSect(@RequestBody JSONObject whereJson) { - return new ResponseEntity<>(sectattrService.getStorSect(whereJson), HttpStatus.OK); - } - - @PutMapping("/changeActive") - @Log("修改库区状态") - - 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 9e14c71..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/StorattrController.java +++ /dev/null @@ -1,85 +0,0 @@ -/* -package org.nl.wms.basedata.st.rest; - - -import com.alibaba.fastjson.JSONObject; -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 - -@RequestMapping("/api/Storattr") -@Slf4j -public class StorattrController { - - private final StorattrService storattrService; - - @GetMapping - @Log("查询仓库") - - //@PreAuthorize("@el.check('Storattr:list')") - public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { - return new ResponseEntity<>(storattrService.queryAll(whereJson, page), HttpStatus.OK); - } - - @PostMapping - @Log("新增仓库") - - //@PreAuthorize("@el.check('Storattr:addgetStor')") - public ResponseEntity create(@Validated @RequestBody StorattrDto dto) { - storattrService.create(dto); - return new ResponseEntity<>(HttpStatus.CREATED); - } - - @PutMapping - @Log("修改仓库") - - //@PreAuthorize("@el.check('Storattr:edit')") - public ResponseEntity update(@Validated @RequestBody StorattrDto dto) { - storattrService.update(dto); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } - - @Log("删除仓库") - - //@PreAuthorize("@el.check('Storattr:del')") - @DeleteMapping - public ResponseEntity delete(@RequestBody Long[] ids) { - storattrService.deleteAll(ids); - return new ResponseEntity<>(HttpStatus.OK); - } - - @GetMapping("/getStor") - @Log("查询仓库下拉框") - - //@PreAuthorize("@el.check('materialtype:list')") - public ResponseEntity queryStor(@RequestParam Map whereJson) { - return new ResponseEntity<>(storattrService.getStor(whereJson), HttpStatus.OK); - } - - @PutMapping("/changeActive") - @Log("修改仓库管理状态") - - 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 4184574..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/StructattrController.java +++ /dev/null @@ -1,143 +0,0 @@ -/* -package org.nl.wms.basedata.st.rest; - - -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -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 - -@RequestMapping("/api/structattr") -@Slf4j -public class StructattrController { - - private final StructattrService structattrService; - - @GetMapping - @Log("查询仓位") - - //@PreAuthorize("@el.check('structattr:list')") - public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { - return new ResponseEntity<>(structattrService.queryAll(whereJson, page), HttpStatus.OK); - } - - @PostMapping - @Log("新增仓位") - - //@PreAuthorize("@el.check('structattr:add')") - public ResponseEntity create(@Validated @RequestBody StructattrDto dto) { - structattrService.create(dto); - return new ResponseEntity<>(HttpStatus.CREATED); - } - - @PutMapping - @Log("修改仓位") - - //@PreAuthorize("@el.check('structattr:edit')") - public ResponseEntity update(@Validated @RequestBody StructattrDto dto) { - structattrService.update(dto); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } - - @Log("删除仓位") - - //@PreAuthorize("@el.check('structattr:del')") - @DeleteMapping - public ResponseEntity delete(@RequestBody Long[] ids) { - structattrService.deleteAll(ids); - return new ResponseEntity<>(HttpStatus.OK); - } - - @PutMapping("/changeActive") - @Log("修改仓位状态") - - public ResponseEntity update(@RequestBody JSONObject json) { - structattrService.changeActive(json); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } - - @PostMapping("/getStructByCodes") - @Log("获取仓位信息") - - public ResponseEntity getStructByCodes(@RequestBody String json) { - JSONArray jsonArray = JSONArray.parseArray(json); - return new ResponseEntity<>(structattrService.getStructByCodes(jsonArray), HttpStatus.OK); - } - - @PostMapping("/getStructByCodesFs") - @Log("获取点位信息") - - public ResponseEntity getStructByCodesFs(@RequestBody String json) { - JSONArray jsonArray = JSONArray.parseArray(json); - return new ResponseEntity<>(structattrService.getStructByCodesFs(jsonArray), HttpStatus.OK); - } - - @PostMapping("/getStructByCodesFsTwo") - @Log("获取点位信息(二期)") - - public ResponseEntity getStructByCodesFsTwo(@RequestBody String json) { - JSONArray jsonArray = JSONArray.parseArray(json); - return new ResponseEntity<>(structattrService.getStructByCodesFsTwo(jsonArray), HttpStatus.OK); - } - - @PostMapping("/unLockPoint") - @Log("解锁点位") - - public ResponseEntity unLockPoint(@RequestBody JSONObject whereJson) { - return new ResponseEntity<>(structattrService.unLockPoint(whereJson), HttpStatus.OK); - } - - @PostMapping("/unLockPointTwo") - @Log("解锁点位（二期）") - - public ResponseEntity unLockPointTwo(@RequestBody JSONObject whereJson) { - return new ResponseEntity<>(structattrService.unLockPointTwo(whereJson), HttpStatus.OK); - } - - @PostMapping("/oneCreate") - @Log("一键生成货位") - public ResponseEntity oneCreate(@RequestBody JSONObject whereJson) { - structattrService.oneCreate(whereJson); - return new ResponseEntity<>( HttpStatus.OK); - } - - @PostMapping("/blurQuery") - @Log("校验前缀是否可用") - public ResponseEntity blurQuery(@RequestBody JSONObject whereJson) { - structattrService.blurQuery(whereJson); - return new ResponseEntity<>( HttpStatus.OK); - } - - @PostMapping("/tunConfirm") - @Log("二期禁用巷道") - public ResponseEntity tunConfirm(@RequestBody JSONObject json) { - structattrService.tunConfirm(json); - return new ResponseEntity<>(HttpStatus.OK); - } - - @GetMapping("/twoVehicleIvt") - @Log("查询二期空托盘库存") - public ResponseEntity twoVehicleIvt(@RequestParam Map whereJson, Pageable page) { - return new ResponseEntity<>(structattrService.twoVehicleIvt(whereJson, page), 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 bc0d302..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/SectattrService.java +++ /dev/null @@ -1,103 +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; - -*/ -/** - * @author zhouz - * @description 服务接口 - * @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); - - JSONObject getStorSect(JSONObject 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 f93b488..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/StorattrService.java +++ /dev/null @@ -1,101 +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; - -*/ -/** - * @author zhouz - * @description 服务接口 - * @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 02f2c6c..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/StructattrService.java +++ /dev/null @@ -1,189 +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.StructattrDto; -import org.springframework.data.domain.Pageable; - -import java.util.List; -import java.util.Map; - -*/ -/** - * @author zhouz - * @description 服务接口 - * @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); - - */ -/** - * 获取仓位信息 - * - * @return - *//* - - JSONArray getStructByCodes(JSONArray json); - - */ -/** - * 获取点位信息 - * - * @return - *//* - - JSONArray getStructByCodesFs(JSONArray json); - */ -/** - * 获取点位信息（二期） - *wo - * @return - *//* - - JSONArray getStructByCodesFsTwo(JSONArray json); - Map getStructByCodesFsAnNum(JSONArray json); - - */ -/** - * 解锁点位 - * - * @return - *//* - - JSONObject unLockPoint(JSONObject whereJson); - - */ -/** - * 一键生成货位 - * @param whereJson { - * stor_id: 仓库id - * sect_id: 库区id - * prefix: 仓位前缀 - * num: 生成数量 - * } - *//* - - void oneCreate(JSONObject whereJson); - - */ -/** - * 校验前缀是否可用 - * @param whereJson { - * prefix: 前缀 - * } - *//* - - void blurQuery(JSONObject whereJson); - - */ -/** - * 二期禁用巷道 - * @param json ：{ - * block_num： 巷道 - * is_used: 0-禁用，1-启用 - * } - *//* - - void tunConfirm(JSONObject json); - - */ -/** - * 点位解锁 - * @param whereJson：{点位信息} - * @return 、 - *//* - - JSONObject unLockPointTwo(JSONObject whereJson); - - */ -/** - * 查询二期空托盘库存数据分页 - * - * @param whereJson 条件 - * @param page 分页参数 - * @return Map - *//* - - Map twoVehicleIvt(Map whereJson, Pageable page); -} -*/ 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 93b3099..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/dto/SectattrDto.java +++ /dev/null @@ -1,179 +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; - -/** - * @author zhouz - * @description / - * @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 String create_id; - - /** - * 创建人姓名 - */ - private String create_name; - - /** - * 创建时间 - */ - private String create_time; - - /** - * 修改人 - */ - private String 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 d0f2cee..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/dto/StorattrDto.java +++ /dev/null @@ -1,130 +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; - -/** - * @author zhouz - * @description / - * @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 String create_id; - - private String create_name; - - private String create_time; - - private String 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 9d72c76..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/dto/StructattrDto.java +++ /dev/null @@ -1,234 +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; - -/** - * @author zhouz - * @description / - * @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 String create_id; - - /** - * 创建人姓名 - */ - private String create_name; - - /** - * 创建时间 - */ - private String create_time; - - /** - * 修改人 - */ - private String 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; - - /** - * 放置类型 - */ - private String placement_type; -} 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 197ef7c..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/SectattrServiceImpl.java +++ /dev/null @@ -1,287 +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.common.utils.SecurityUtils; -import org.nl.modules.common.exception.BadRequestException; -import org.nl.modules.wql.WQL; -import org.nl.modules.wql.core.bean.WQLObject; -import org.nl.modules.wql.util.WqlUtil; -import org.nl.wms.basedata.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")); - //获取人员对应的仓库 - UserStorServiceImpl userStorService = new UserStorServiceImpl(); - String in_stor_id = userStorService.getInStor(); - - if (ObjectUtil.isNotEmpty(in_stor_id)) { - map.put("in_stor_id", in_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(); - - WQLObject tab = WQLObject.getWQLObject("st_ivt_sectattr"); - JSONObject json2 = tab.query("sect_code = '" + sect_code + "' and stor_id = '" + dto.getStor_id() + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(json2)) { - throw new BadRequestException("存在相同仓库的库区编号"); - } - - String 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(); - - WQLObject tab = WQLObject.getWQLObject("st_ivt_sectattr"); - - String 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); - - JSONArray resultJSONArray = tab.query("sect_code = '" + sect_code + "' and stor_id = '" + dto.getStor_id() + "'").getResultJSONArray(0); - if (resultJSONArray.size() > 1) { - throw new BadRequestException("存在相同仓库的库区编号"); - } - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void deleteAll(Long[] ids) { - String 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 - public JSONObject getStorSect(JSONObject whereJson) { - JSONArray rows = WQLObject.getWQLObject("st_ivt_sectattr").query("stor_id = '1582991156504039424' AND sect_type_attr = '09'").getResultJSONArray(0); - JSONArray ja = new JSONArray(); - for (int i = 0; i < rows.size(); i++) { - JSONObject row = rows.getJSONObject(i); - JSONObject jo = new JSONObject(); - jo.put("value", row.getString("sect_id")); - jo.put("text", row.getString("sect_name")); - ja.add(jo); - } - JSONObject result = new JSONObject(); - result.put("data", ja); - return result; - } - - @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("该库区所属的仓库已禁用，请先启用该仓库!"); - } - - String 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 b2c3f3f..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StorattrServiceImpl.java +++ /dev/null @@ -1,228 +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.common.utils.SecurityUtils; -import org.nl.modules.common.exception.BadRequestException; -import org.nl.modules.wql.WQL; -import org.nl.modules.wql.core.bean.WQLObject; -import org.nl.modules.wql.util.WqlUtil; -import org.nl.wms.basedata.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 && "0".equals(storattrDto.getIs_delete())) { - throw new BadRequestException("存在相同的仓库编号"); - } - String 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(9L); - dto.setSysdeptid(9L); - dto.setSysownerid(9L); - - 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()) && "0".equals(storattrDto.getIs_delete())) { - throw new BadRequestException("存在相同的供应商编号"); - } - - String 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) { - String 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) { - String 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 5747077..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructattrServiceImpl.java +++ /dev/null @@ -1,901 +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 com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.b_lms.storage_manage.database.service.IBstIvtBoxlashboundService; -import org.nl.b_lms.storage_manage.database.service.dao.BstIvtBoxlashbound; -import org.nl.b_lms.storage_manage.database.service.dao.mapper.BstIvtBoxinfoMapper; -import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; -import org.nl.common.utils.MapOf; -import org.nl.common.utils.SecurityUtils; -import org.nl.modules.common.exception.BadRequestException; -import org.nl.modules.wql.WQL; -import org.nl.modules.wql.core.bean.WQLObject; -import org.nl.modules.wql.util.WqlUtil; -import org.nl.wms.basedata.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 javax.annotation.Resource; -import java.math.BigDecimal; -import java.util.*; -import java.util.function.BiConsumer; -import java.util.stream.Collectors; - -*/ -/** - * @author zhouz - * @description 服务实现 - * @date 2021-12-09 - **//* - -@Service -@RequiredArgsConstructor -@Slf4j -public class StructattrServiceImpl implements StructattrService { - - @Autowired - private SectattrService sectattrService; - @Autowired - private StorattrService storattrService; - - */ -/** - * 木箱绑定服务 - *//* - - @Autowired - private IBstIvtBoxlashboundService iBstIvtBoxlashboundService; - - */ -/** - * 木箱信息mapper - *//* - - @Resource - private BstIvtBoxinfoMapper bstIvtBoxinfoMapper; - - @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")); - map.put("layer_num", (String) whereJson.get("layer_num")); - map.put("is_used", (String) whereJson.get("is_used")); - map.put("is_have", (String) whereJson.get("is_have")); - - */ -/* // 如果是二期仓库则将层数删除 - if (ObjectUtil.isNotEmpty(whereJson.get("stor_id"))) { - if ( whereJson.get("stor_id").equals(IOSEnum.STOR_ID.code("二期"))) { - map.put("layer_num", ""); - } - }*//* - - //获取人员对应的仓库 - UserStorServiceImpl userStorService = new UserStorServiceImpl(); - String in_stor_id = userStorService.getInStor(); - - if (ObjectUtil.isNotEmpty(in_stor_id)) { - map.put("in_stor_id", in_stor_id); - } - - 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 && "0".equals(structattrDto.getIs_delete())) { - throw new BadRequestException("存在相同的库区编号"); - } - String 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()) && "0".equals(structattrDto.getIs_delete())) { - throw new BadRequestException("存在相同的库区编号"); - } - - String 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()); - - - 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) { - String 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("该仓位所属的库区已禁用，请先启用该库区!"); - } - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - String struct_code = json.getString("struct_code"); - 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_code = '" + struct_code + "'"); - } - - @Override - public JSONArray getStructByCodes(JSONArray jsonArray) { - */ -/** - * jsonArry: 所有组件的信息，包括组件本身的id以及仓位id，组件id是用来给前端做对应筛选使用，如果没有仓位id证明不是 - * 仓位组件，故不做处理，可以不用返回数据。 - *//* - - WQLObject attrTab = WQLObject.getWQLObject("st_ivt_structattr"); - JSONArray arr = new JSONArray(); - for (int i = 0; i < jsonArray.size(); i++) { - JSONObject obj = new JSONObject(); - JSONObject js = jsonArray.getJSONObject(i); - String struct_id = js.getString("struct_id"); - - if (ObjectUtil.isEmpty(struct_id)) { - continue; - } - - int struct_status = 2; - // 获取信息 1蓝色空载具 2黄色木箱 3绿色空位 4灰色禁用 - // 查找详细信息， 这里可能是有多条数据 - JSONArray array = WQL - .getWO("QST_STRUCTATTR") - .addParamMap(MapOf.of("struct_id", struct_id, "flag", "1")) - .process() - .getResultJSONArray(0); - // 计算合计 - JSONObject json = array.getJSONObject(0); - if (ObjectUtil.isNotEmpty(json.getString("net_weight"))) { - BigDecimal container_weight = array.stream().map(row -> ((JSONObject) row).getBigDecimal("net_weight")).reduce(BigDecimal.ZERO, BigDecimal::add); - - for (int j = 0; j < array.size(); j++) { - JSONObject jsonObject = array.getJSONObject(j); - jsonObject.put("container_weight", container_weight); - } - } - - // 获取仓位表中的信息 - JSONObject strInfo = attrTab - .query("struct_id = '" + struct_id + "'") - .uniqueResult(0); - if ("0".equals(strInfo.getString("is_used"))) { - // 被禁用 - struct_status = 4; - } else if ("PD01".equals(strInfo.getString("sect_code"))) { - // 盘点位 - struct_status = 5; - } else if (ObjectUtil.isEmpty(strInfo.getString("storagevehicle_code"))) { - // 空位 - struct_status = 3; - } else if (ObjectUtil.isNotEmpty(strInfo.getString("storagevehicle_code")) - && "KTP01".equals(strInfo.getString("sect_code"))) { - struct_status = 1; - } - // 剩余层数货位信息没统计，统计可以用obj.put(key, value)返给前端，前端在initStatus()就可以遍历去获取，给节点赋值 - obj.put("data", array); - obj.put("struct_status", struct_status); - obj.put("struct_id", strInfo.getString("struct_id")); - obj.put("struct_code", strInfo.getString("struct_code")); - obj.put("id", js.getString("id")); // 设备不存在就只保留id，方便前端查看 - arr.add(obj); - } - return arr; - } - - @Override - public JSONArray getStructByCodesFs(JSONArray jsonArray) { - WQLObject attrTab = WQLObject.getWQLObject("sch_base_point"); - JSONArray arr = new JSONArray(); - List list = new ArrayList<>(); - for (int i = 0; i < jsonArray.size(); i++) { - JSONObject js = jsonArray.getJSONObject(i); - String struct_id = js.getString("struct_id"); - if (ObjectUtil.isEmpty(struct_id)) { - continue; - } - list.add(struct_id); - } - String sql = "('" + list.stream().collect(Collectors.joining("','")) + "')"; - JSONArray array = WQL - .getWO("QST_STRUCTATTR") - .addParamMap(MapOf.of("struct_ids", sql, "flag", "3")) - .process() - .getResultJSONArray(0); - - Map pointMap = array.stream().collect(HashMap::new, (BiConsumer, Object>) (m, o) -> { - JSONObject item = (JSONObject) o; - m.put(item.getString("point_id"), item); - }, HashMap::putAll); - - JSONArray attrs = attrTab.query("point_id in " + sql).getResultJSONArray(0); - Map attrMap = attrs.stream().collect(HashMap::new, (BiConsumer, Object>) (m, o) -> { - JSONObject item = (JSONObject) o; - m.put(item.getString("point_id"), item); - }, HashMap::putAll); - - for (int i = 0; i < jsonArray.size(); i++) { - JSONObject obj = new JSONObject(); - JSONObject js = jsonArray.getJSONObject(i); - String struct_id = js.getString("struct_id"); - - if (ObjectUtil.isEmpty(struct_id)) { - continue; - } - int struct_status = 2; - // 获取信息 1蓝色空载具 2黄色木箱 3绿色空位 4灰色禁用 - // 计算子卷净重 - JSONObject json = pointMap.get(struct_id); - - List pointList = array.toJavaList(JSONObject.class).stream() - .filter(row -> row.getString("point_id").equals(struct_id)) - .collect(Collectors.toList()); - - if (ObjectUtil.isNotEmpty(json.getString("net_weight"))) { - - BigDecimal container_weight = pointList.stream().map(row -> row.getBigDecimal("net_weight")).reduce(BigDecimal.ZERO, BigDecimal::add); - - for (int j = 0; j < pointList.size(); j++) { - JSONObject jsonObject = pointList.get(j); - jsonObject.put("container_weight", container_weight); - } - } - - JSONObject strInfo = attrMap.get(struct_id); - if (strInfo !=null && ObjectUtil.isEmpty(strInfo.getString("vehicle_code"))) { - // 空位 - struct_status = 3; - } - - // 剩余层数货位信息没统计，统计可以用obj.put(key, value)返给前端，前端在initStatus()就可以遍历去获取，给节点赋值 - obj.put("data", pointList); - obj.put("struct_status", struct_status); - obj.put("struct_id", strInfo.getString("point_id")); - obj.put("struct_code", strInfo.getString("point_code")); - obj.put("id", js.getString("id")); // 设备不存在就只保留id，方便前端查看 - arr.add(obj); - } - return arr; - } - - @Override - public JSONArray getStructByCodesFsTwo(JSONArray jsonArray) { - WQLObject attrTab = WQLObject.getWQLObject("sch_base_point"); - JSONArray arr = new JSONArray(); - List list = new ArrayList<>(); - for (int i = 0; i < jsonArray.size(); i++) { - JSONObject js = jsonArray.getJSONObject(i); - String struct_id = js.getString("struct_id"); - if (ObjectUtil.isEmpty(struct_id)) { - continue; - } - list.add(struct_id); - } - String sql = "('" + list.stream().collect(Collectors.joining("','")) + "')"; - JSONArray array = WQL - .getWO("QST_STRUCTATTR") - .addParamMap(MapOf.of("struct_ids", sql, "flag", "3")) - .process() - .getResultJSONArray(0); - - Map pointMap = array.stream().collect(HashMap::new, (BiConsumer, Object>) (m, o) -> { - JSONObject item = (JSONObject) o; - m.put(item.getString("point_id"), item); - }, HashMap::putAll); - - JSONArray attrs = attrTab.query("point_id in " + sql).getResultJSONArray(0); - Map attrMap = attrs.stream().collect(HashMap::new, (BiConsumer, Object>) (m, o) -> { - JSONObject item = (JSONObject) o; - m.put(item.getString("point_id"), item); - }, HashMap::putAll); - - for (int i = 0; i < jsonArray.size(); i++) { - JSONObject obj = new JSONObject(); - JSONObject js = jsonArray.getJSONObject(i); - String struct_id = js.getString("struct_id"); - - if (ObjectUtil.isEmpty(struct_id)) { - continue; - } - int struct_status = 2; - // 获取信息 1蓝色空载具 2黄色木箱 3绿色空位 4灰色禁用 - // 计算子卷净重 - JSONObject json = pointMap.get(struct_id); - - List pointList = array.toJavaList(JSONObject.class).stream() - .filter(row -> row.getString("point_id").equals(struct_id)) - .collect(Collectors.toList()); - - if (ObjectUtil.isNotEmpty(json.getString("net_weight"))) { - - BigDecimal container_weight = pointList.stream().map(row -> row.getBigDecimal("net_weight")).reduce(BigDecimal.ZERO, BigDecimal::add); - - for (int j = 0; j < pointList.size(); j++) { - JSONObject jsonObject = pointList.get(j); - jsonObject.put("container_weight", container_weight); - } - } - - JSONObject strInfo = attrMap.get(struct_id); - if (strInfo !=null && ObjectUtil.isEmpty(strInfo.getString("vehicle_code"))) { - // 空位 - struct_status = 3; - } - - if (strInfo !=null && strInfo.getString("is_used").equals(IOSEnum.IS_NOTANDYES.code("否"))) { - // 未启用 - struct_status = 4; - } - - // 剩余层数货位信息没统计，统计可以用obj.put(key, value)返给前端，前端在initStatus()就可以遍历去获取，给节点赋值 - obj.put("data", pointList); - obj.put("struct_status", struct_status); - obj.put("struct_id", strInfo.getString("point_id")); - obj.put("struct_code", strInfo.getString("point_code")); - obj.put("id", js.getString("id")); // 设备不存在就只保留id，方便前端查看 - arr.add(obj); - } - return arr; - } - - @Override - public Map getStructByCodesFsAnNum(JSONArray jsonArray) { - WQLObject attrTab = WQLObject.getWQLObject("sch_base_point"); - JSONArray arr = new JSONArray(); - List list = new ArrayList<>(); - for (int i = 0; i < jsonArray.size(); i++) { - JSONObject js = jsonArray.getJSONObject(i); - String struct_id = js.getString("struct_id"); - if (ObjectUtil.isEmpty(struct_id)) { - continue; - } - list.add(struct_id); - } - String sql = "('" + list.stream().collect(Collectors.joining("','")) + "')"; - JSONArray array = WQL - .getWO("QST_STRUCTATTR") - .addParamMap(MapOf.of("struct_ids", sql, "flag", "3")) - .process() - .getResultJSONArray(0); - - Map pointMap = array.stream().collect(HashMap::new, (BiConsumer, Object>) (m, o) -> { - JSONObject item = (JSONObject) o; - m.put(item.getString("point_id"), item); - }, HashMap::putAll); - - JSONArray attrs = attrTab.query("point_id in " + sql).getResultJSONArray(0); - Map attrMap = attrs.stream().collect(HashMap::new, (BiConsumer, Object>) (m, o) -> { - JSONObject item = (JSONObject) o; - m.put(item.getString("point_id"), item); - }, HashMap::putAll); - - for (int i = 0; i < jsonArray.size(); i++) { - JSONObject obj = new JSONObject(); - JSONObject js = jsonArray.getJSONObject(i); - String struct_id = js.getString("struct_id"); - - if (ObjectUtil.isEmpty(struct_id)) { - continue; - } - int struct_status = 2; - // 获取信息 1蓝色空载具 2黄色木箱 3绿色空位 4灰色禁用 - // 计算子卷净重 - JSONObject json = pointMap.get(struct_id); - - List pointList = array.toJavaList(JSONObject.class).stream() - .filter(row -> row.getString("point_id").equals(struct_id)) - .collect(Collectors.toList()); - - if (ObjectUtil.isNotEmpty(json.getString("net_weight"))) { - - BigDecimal container_weight = pointList.stream().map(row -> row.getBigDecimal("net_weight")).reduce(BigDecimal.ZERO, BigDecimal::add); - - for (int j = 0; j < pointList.size(); j++) { - JSONObject jsonObject = pointList.get(j); - jsonObject.put("container_weight", container_weight); - } - } - - JSONObject strInfo = attrMap.get(struct_id); - if (strInfo !=null && ObjectUtil.isEmpty(strInfo.getString("vehicle_code"))) { - // 空位 - struct_status = 3; - } - - // 剩余层数货位信息没统计，统计可以用obj.put(key, value)返给前端，前端在initStatus()就可以遍历去获取，给节点赋值 - obj.put("data", pointList); - obj.put("struct_status", struct_status); - obj.put("struct_id", strInfo.getString("point_id")); - obj.put("struct_code", strInfo.getString("point_code")); - obj.put("id", js.getString("id")); // 设备不存在就只保留id，方便前端查看 - arr.add(obj); - } - return null; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public JSONObject unLockPoint(JSONObject whereJson) { - WQLObject schBasePointService = WQLObject.getWQLObject("sch_base_point"); - - String point_code = whereJson.getString("point_code"); - JSONObject jsonPoint = schBasePointService.query("point_code = '" + point_code + "'").uniqueResult(0); - - */ -/* - 判断点位是第几层 - 1层：解锁当前点位和2层点位 - 2层：直接解锁当前点位 - *//* - - - //查询对应的包装关系，如果为需要解绑删除的则删除包装关系 - JSONArray sub_rows = WQLObject.getWQLObject("pdm_bi_subpackagerelation").query("package_box_sn = '" + whereJson.getString("vehicle_code") + "'").getResultJSONArray(0); - for (int i = 0; i < sub_rows.size(); i++) { - JSONObject sub_row = sub_rows.getJSONObject(i); - if (StrUtil.isNotEmpty(sub_row.getString("need_delete")) && "1".equals(sub_row.getString("need_delete"))) { - WQLObject.getWQLObject("pdm_bi_subpackagerelation").delete(sub_row); - } - } - if (StrUtil.equals(jsonPoint.getString("layer_num"), "1")) { - JSONObject jsonPoint2 = schBasePointService.query("device_code = '" + jsonPoint.getString("device_code") + "' and layer_num = '2'").uniqueResult(0); - //查询对应的包装关系，如果为需要解绑删除的则删除包装关系 - JSONArray sub_rows2 = WQLObject.getWQLObject("pdm_bi_subpackagerelation").query("package_box_sn = '" + jsonPoint2.getString("vehicle_code") + "'").getResultJSONArray(0); - for (int i = 0; i < sub_rows2.size(); i++) { - JSONObject sub_row = sub_rows2.getJSONObject(i); - if (StrUtil.isNotEmpty(sub_row.getString("need_delete")) && "1".equals(sub_row.getString("need_delete"))) { - WQLObject.getWQLObject("pdm_bi_subpackagerelation").delete(sub_row); - } - } - jsonPoint2.put("point_status", "1"); - jsonPoint2.put("lock_type", "1"); - jsonPoint2.put("vehicle_code", ""); - schBasePointService.update(jsonPoint2); - } - - jsonPoint.put("point_status", "1"); - jsonPoint.put("lock_type", "1"); - jsonPoint.put("vehicle_code", ""); - schBasePointService.update(jsonPoint); - return null; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void oneCreate(JSONObject whereJson) { - // 仓位表 - WQLObject attrTab = WQLObject.getWQLObject("st_ivt_structattr"); - // 库区表 - WQLObject sectTab = WQLObject.getWQLObject("st_ivt_sectattr"); - // 点位表 - WQLObject pointTab = WQLObject.getWQLObject("sch_base_point"); - // 仓库表 - WQLObject storTab = WQLObject.getWQLObject("st_ivt_bsrealstorattr"); - - // 判断库区是否是虚拟区 - JSONObject jsonSect = sectTab.query("sect_id = '" + whereJson.getString("sect_id") + "'").uniqueResult(0); - - if (!jsonSect.getString("sect_type_attr").equals("09")) { - throw new BadRequestException("所选库区必须是虚拟区!"); - } - - */ -/* - * 判断此库区是否已经生成仓位 - *//* - - JSONObject jsonAttr = attrTab.query("sect_id = '" + whereJson.getString("sect_id") + "' order by struct_code DESC").uniqueResult(0); - - // 生成数量 - int createNum = whereJson.getIntValue("num"); - // 开始生成数 - int createNum_start = 1; - - // 前缀 - String prefix = ""; - - if (ObjectUtil.isNotEmpty(jsonAttr)) { - String struct_code = jsonAttr.getString("struct_code"); - - // 第一个-的位置 - int firstIndex = struct_code.indexOf("-"); - // 第二个-的位置 - int secondIndex = struct_code.substring(firstIndex + 1).indexOf("-") + firstIndex; - // 最大的仓位数 - String result = struct_code.substring(firstIndex + 1, secondIndex +1); - - createNum += Integer.parseInt(result); - - createNum_start += Integer.parseInt(result); - - prefix = struct_code.substring(0, firstIndex); - } else { - // 截取第一个 - 之前的数据集合 - - List attrList = WQL.getWO("QST_STRUCT_ATTR").addParam("flag", "2").process() - .getResultJSONArray(0).toJavaList(JSONObject.class); - - List subStringList = attrList.stream() - .filter(row -> row.getString("struct_code").contains("-")) - .map(row -> row.getString("struct_code").substring(0, row.getString("struct_code").indexOf("-"))) - .distinct() - .sorted() - .filter(row -> row.matches("-?\\d+(\\.\\d+)?")) - .collect(Collectors.toList()); - - prefix = String.valueOf(Integer.parseInt(subStringList.get(subStringList.size() - 1)) + 1); - } - - */ -/* - * 生成货位 - *//* - - String now = DateUtil.now(); - for (int i = createNum_start; i <= createNum; i++) { - - JSONObject json = new JSONObject(); - json.put("struct_id", IdUtil.getSnowflake(1,1).nextId()); - - if (i < 10) { - json.put("struct_code", prefix + "-"+"000"+i+"-01"); - json.put("struct_name", prefix + "排-"+"000"+i+"列-01层"); - - }else if (i >= 10 && i < 100) { - json.put("struct_code", prefix + "-"+"00"+i+"-01"); - json.put("struct_name", prefix + "排-"+"00"+i+"列-01层"); - }else if (i >= 100 && i < 1000) { - json.put("struct_code", prefix + "-"+"0"+i+"-01"); - json.put("struct_name", prefix + "排-"+"0"+i+"列-01层"); - } else { - json.put("struct_code", prefix + "-"+i+"-01"); - json.put("struct_name", prefix + "排-"+i+"列-01层"); - } - JSONObject jsonObject = storTab.query("stor_id = '"+whereJson.getString("stor_id")+"'").uniqueResult(0); - JSONObject jsonObjec2 = sectTab.query("stor_id = '"+whereJson.getString("stor_id")+"' and sect_id = '"+whereJson.getString("sect_id")+"'").uniqueResult(0); - - // 新增仓位 - json.put("simple_name", json.getString("struct_name")); - json.put("sect_id", jsonObjec2.getString("sect_id")); - json.put("sect_code", jsonObjec2.getString("sect_code")); - json.put("sect_name", jsonObjec2.getString("sect_name")); - json.put("stor_id", jsonObject.getString("stor_id")); - json.put("stor_code", jsonObject.getString("stor_code")); - json.put("stor_name", jsonObject.getString("stor_name")); - json.put("lock_type", "1"); - json.put("row_num", 1); - json.put("col_num", i); - json.put("layer_num", 1); - json.put("block_num", 1); - json.put("in_order_seq", i); - json.put("out_order_seq", i); - json.put("in_empty_seq", i); - json.put("out_empty_seq", i); - json.put("create_id", "1"); - json.put("create_name", "管理员"); - json.put("create_time", now); - json.put("material_height_type", 1); - attrTab.insert(json); - - // 新增点位 - JSONObject jsonPoint = new JSONObject(); - jsonPoint.put("point_id",IdUtil.getSnowflake(1,1).nextId()); - jsonPoint.put("point_code", json.getString("struct_code")); - jsonPoint.put("point_name", json.getString("struct_name")); - jsonPoint.put("region_id", json.getString("sect_id")); - jsonPoint.put("region_code", json.getString("sect_code")); - jsonPoint.put("region_name", json.getString("sect_name")); - jsonPoint.put("point_type", "2"); - jsonPoint.put("point_status", "1"); - jsonPoint.put("lock_type", "1"); - jsonPoint.put("vehicle_max_qty", 0); - jsonPoint.put("vehicle_qty", 0); - jsonPoint.put("block_num", 1); - jsonPoint.put("row_num", 1); - jsonPoint.put("col_num", 1); - jsonPoint.put("layer_num", 1); - jsonPoint.put("in_order_seq", 0); - jsonPoint.put("out_order_seq", 0); - jsonPoint.put("in_empty_seq", 0); - jsonPoint.put("out_empty_seq", 0); - jsonPoint.put("is_have_workder", "0"); - jsonPoint.put("is_used", "1"); - jsonPoint.put("source_id", json.get("struct_id")); - jsonPoint.put("is_delete", "0"); - jsonPoint.put("create_id", "1"); - jsonPoint.put("create_name", "管理员"); - jsonPoint.put("create_time", now); - pointTab.insert(jsonPoint); - } - - } - - @Override - public void blurQuery(JSONObject whereJson) { - // 仓位表 - WQLObject attrTab = WQLObject.getWQLObject("st_ivt_structattr"); - - */ -/* - * 判断前缀是否存在 - *//* - - List attrList = WQL.getWO("QST_STRUCT_ATTR").addParam("flag", "2").process() - .getResultJSONArray(0).toJavaList(JSONObject.class); - - // 截取第一个 - 之前的数据集合 - List subStringList = attrList.stream() - .filter(row -> row.getString("struct_code").contains("-")) - .map(row -> row.getString("struct_code").substring(0, row.getString("struct_code").indexOf("-"))) - .distinct() - .sorted() - .filter(row -> row.matches("-?\\d+(\\.\\d+)?")) - .collect(Collectors.toList()); - - // 判断是否有相同的前缀 - boolean is_like = subStringList.stream() - .anyMatch(row -> row.equals(whereJson.getString("prefix"))); - - if (is_like) { - throw new BadRequestException("此前缀已存在，请更换!"); - } - } - - @Override - public void tunConfirm(JSONObject json) { - WQLObject tab = WQLObject.getWQLObject("st_ivt_structattr"); - - // 将这一巷道的所有仓位都禁用 - JSONObject param = new JSONObject(); - param.put("is_used", json.getString("is_used")); - - tab.update(param,"sect_id = '"+IOSEnum.SECT_ID.code("二期主存区")+"' AND block_num = '"+json.getString("block_num")+"' AND is_delete = '0'"); - - } - - @Override - @Transactional(rollbackFor = Exception.class) - public JSONObject unLockPointTwo(JSONObject whereJson) { - // 点位表 - WQLObject schBasePointService = WQLObject.getWQLObject("sch_base_point"); - - String box_no = whereJson.getString("vehicle_code"); - if (ObjectUtil.isEmpty(box_no)) { - throw new BadRequestException("木箱不能为空"); - } - - BstIvtBoxlashbound boundDao = iBstIvtBoxlashboundService.getOne( - new QueryWrapper().lambda() - .eq(BstIvtBoxlashbound::getBox_no, box_no) - ); - - if (ObjectUtil.isEmpty(boundDao)) { - throw new BadRequestException("此木箱没有经过自动捆扎，请在【点位管理】页面手动解绑!"); - } - - // 查出所有捆绑在一起的木箱 - List boundDaoList = iBstIvtBoxlashboundService.list( - new QueryWrapper().lambda() - .eq(BstIvtBoxlashbound::getBound_id, boundDao.getBound_id()) - ); - - // 查询所在点位 - String box_in = boundDaoList.stream() - .map(BstIvtBoxlashbound::getBox_no) - .collect(Collectors.joining("','")); - - JSONObject jsonPoint = schBasePointService.query("vehicle_code IN ('" + box_in + "') and is_delete = '0' and is_used = '1' and point_type = '8'").uniqueResult(0); - - if (ObjectUtil.isEmpty(jsonPoint)) { - throw new BadRequestException("请输入正确的木箱或查看点位是否存在"); - } - - // 解锁点位 - jsonPoint.put("point_status", "1"); - jsonPoint.put("lock_type", "1"); - jsonPoint.put("vehicle_code", ""); - schBasePointService.update(jsonPoint); - - // 删除木箱绑定关系 - iBstIvtBoxlashboundService.remove( - new QueryWrapper().lambda() - .eq(BstIvtBoxlashbound::getBound_id, boundDaoList.get(0).getBound_id()) - ); - - return null; - } - - @Override - public Map twoVehicleIvt(Map whereJson, Pageable page) { - String storagevehicle_code = MapUtil.getStr(whereJson, "storagevehicle_code"); - String struct_code = MapUtil.getStr(whereJson, "struct_code"); - HashMap map = new HashMap<>(); - - if (ObjectUtil.isNotEmpty(storagevehicle_code)) { - map.put("storagevehicle_code", "%"+storagevehicle_code+"%"); - } - if (ObjectUtil.isNotEmpty(struct_code)) { - map.put("struct_code", "%"+struct_code+"%"); - } - map.put("storagevehicle_type", MapUtil.getStr(whereJson,"storagevehicle_type")); - map.put("flag", "3"); - - JSONObject jo = WQL.getWO("QST_STRUCT_ATTR").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "struct_code asc"); - return jo; - } - -} -*/ diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/movestor/controller/HandMoveStorController.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/movestor/controller/HandMoveStorController.java index 2b5c0f1..135d2b2 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/movestor/controller/HandMoveStorController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/movestor/controller/HandMoveStorController.java @@ -8,6 +8,7 @@ import org.nl.common.TableDataInfo; import org.nl.common.domain.query.PageQuery; import org.nl.modules.logging.annotation.Log; import org.nl.wms.st.instor.movestor.service.HandMoveStorService; +import org.nl.wms.st.instor.movestor.service.dto.MoveStorDtlQuery; import org.nl.wms.st.instor.movestor.service.dto.MoveStorQuery; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; @@ -31,7 +32,7 @@ public class HandMoveStorController { @GetMapping("/getOutBillDtl") @Log("查询移库单明细") - public ResponseEntity getOutBillDtl(@RequestParam Map whereJson) { + public ResponseEntity getOutBillDtl(MoveStorDtlQuery whereJson) { return new ResponseEntity<>(handMoveStorService.getOutBillDtl(whereJson), HttpStatus.OK); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/movestor/service/HandMoveStorService.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/movestor/service/HandMoveStorService.java index 3fbeede..0506998 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/movestor/service/HandMoveStorService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/movestor/service/HandMoveStorService.java @@ -6,8 +6,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import org.nl.common.domain.query.PageQuery; import org.nl.wms.st.instor.movestor.service.dao.MoveStor; +import org.nl.wms.st.instor.movestor.service.dto.MoveStorDtlDto; +import org.nl.wms.st.instor.movestor.service.dto.MoveStorDtlQuery; import org.nl.wms.st.instor.movestor.service.dto.MoveStorQuery; import org.springframework.data.domain.Pageable; + +import java.util.List; import java.util.Map; public interface HandMoveStorService extends IService { @@ -47,7 +51,7 @@ public interface HandMoveStorService extends IService { * @param whereJson / * @return */ - JSONArray getOutBillDtl(Map whereJson); + List getOutBillDtl(MoveStorDtlQuery whereJson); /** * 修改移库单 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/movestor/service/dao/mapper/MoveStorDtlMapper.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/movestor/service/dao/mapper/MoveStorDtlMapper.java index 3940a82..657b1f8 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/movestor/service/dao/mapper/MoveStorDtlMapper.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/movestor/service/dao/mapper/MoveStorDtlMapper.java @@ -1,8 +1,14 @@ package org.nl.wms.st.instor.movestor.service.dao.mapper; +import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.nl.wms.st.instor.movestor.service.dao.MoveStor; +import org.apache.ibatis.annotations.Param; import org.nl.wms.st.instor.movestor.service.dao.MoveStorDtl; +import org.nl.wms.st.instor.movestor.service.dto.MoveStorDtlDto; +import org.nl.wms.st.instor.movestor.service.dto.MoveStorDtlQuery; + +import java.util.HashSet; +import java.util.List; /** * @author: zds @@ -11,4 +17,11 @@ import org.nl.wms.st.instor.movestor.service.dao.MoveStorDtl; */ public interface MoveStorDtlMapper extends BaseMapper { + List getOutBillDtl(@Param("query")MoveStorDtlQuery query); + /** + * 查询 + * @param list + * @return + */ + JSONArray getBoxIvt(@Param("list") HashSet list); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/movestor/service/dao/mapper/MoveStorDtlMapper.xml b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/movestor/service/dao/mapper/MoveStorDtlMapper.xml index 33696bc..8f2fe54 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/movestor/service/dao/mapper/MoveStorDtlMapper.xml +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/movestor/service/dao/mapper/MoveStorDtlMapper.xml @@ -1,5 +1,64 @@ + + diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/movestor/service/dto/MoveStorDtlDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/movestor/service/dto/MoveStorDtlDto.java new file mode 100644 index 0000000..3f8a9f3 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/movestor/service/dto/MoveStorDtlDto.java @@ -0,0 +1,79 @@ +package org.nl.wms.st.instor.movestor.service.dto; + +import lombok.Data; +import java.io.Serializable; + +/** + * @author: zds + * @date: 2024-09-27 + * @description: + */ +@Data +public class MoveStorDtlDto implements Serializable { + + private String moveinvdtl_id; + //移库单标识 + private String moveinv_id; + //明细序号 + private String seq_no; + //转出库区标识 + private String turnout_sect_id; + //转出库区编码 + private String turnout_sect_code; + //转出库区名称 + private String turnout_sect_name; + //转出仓位标识 + private String turnout_struct_id; + //转出仓位编码 + private String turnout_struct_code; + //转出仓位名称 + private String turnout_struct_name; + //物料标识 + private String material_id; + //批次 + private String pcsn; + //品质类型 + private String quality_scode; + //数量计量单位标识 + private String qty_unit_id; + //数量计量单位名称 + private String qty_unit_name; + //数量 + private Double qty; + //转入库区标识 + private String turnin_sect_id; + //转入库区编码 + private String turnin_sect_code; + //转入库区名称 + private String turnin_sect_name; + //转入仓位标识 + private String turnin_struct_id; + //转入仓位编码 + private String turnin_struct_code; + //转入仓位名称 + private String turnin_struct_name; + //执行状态 + private String work_status; + //任务标识 + private String task_id; + //存储载具标识 + private String storagevehicle_id; + //存储载具编码 + private String storagevehicle_code; + //是否已下发 + private String is_issued; + //来源单据明细标识 + private String source_billdtl_id; + //来源单据类型 + private String source_bill_type; + //来源单编号 + private String source_bill_code; + //来源单表名 + private String source_bill_table; + //备注 + private String remark; + private String edit; + private String material_code; + private String material_name; + +} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/movestor/service/dto/MoveStorDtlQuery.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/movestor/service/dto/MoveStorDtlQuery.java new file mode 100644 index 0000000..375cbdb --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/movestor/service/dto/MoveStorDtlQuery.java @@ -0,0 +1,20 @@ +package org.nl.wms.st.instor.movestor.service.dto; + +import lombok.Data; +import java.io.Serializable; + +/** + * @author: zds + * @date: 2024-09-27 + * @description: + */ +@Data +public class MoveStorDtlQuery implements Serializable { + //移库单id + private String moveinv_id; + //移库明细id + private String moveinvdtl_id; + //移库明细状态 + private String work_status; + +} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/movestor/service/impl/HandMoveStorServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/movestor/service/impl/HandMoveStorServiceImpl.java index 0f27d7c..129da41 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/movestor/service/impl/HandMoveStorServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/movestor/service/impl/HandMoveStorServiceImpl.java @@ -34,6 +34,8 @@ import org.nl.wms.st.instor.movestor.service.dao.MoveStor; import org.nl.wms.st.instor.movestor.service.dao.MoveStorDtl; import org.nl.wms.st.instor.movestor.service.dao.mapper.MoveStorDtlMapper; import org.nl.wms.st.instor.movestor.service.dao.mapper.MoveStorMapper; +import org.nl.wms.st.instor.movestor.service.dto.MoveStorDtlDto; +import org.nl.wms.st.instor.movestor.service.dto.MoveStorDtlQuery; import org.nl.wms.st.instor.movestor.service.dto.MoveStorQuery; import org.nl.wms.st.instor.task.EmpMoveTask; import org.nl.wms.st.instor.task.HandMoveStorAcsTask; @@ -790,13 +792,8 @@ public class HandMoveStorServiceImpl extends ServiceImpl getOutBillDtl(MoveStorDtlQuery whereJson) { + return moveStorDtlMapper.getOutBillDtl(whereJson); } @Override @@ -925,24 +922,11 @@ public class HandMoveStorServiceImpl extends ServiceImpl set = new HashSet<>(); for (int i = 0; i < whereJson.size(); i++) { - JSONObject row = whereJson.getJSONObject(i); - String storagevehicle_code = row.getString("storagevehicle_code"); - set.add(storagevehicle_code); + set.add(whereJson.getJSONObject(i).getString("storagevehicle_code")); } - - for (String s : set) { - JSONArray rows = WQL.getWO("QST_IVT_HANDMOVESTOR") - .addParam("flag", "5") - .addParam("storagevehicle_code", s).process().getResultJSONArray(0); - for (int i = 0; i < rows.size(); i++) { - JSONObject mater = rows.getJSONObject(i); - total_rows.add(mater); - } - } - return total_rows; + return moveStorDtlMapper.getBoxIvt(set); } @Override diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/CheckServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/CheckServiceImpl.java index eed9936..9ae6d2d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/CheckServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/CheckServiceImpl.java @@ -439,7 +439,7 @@ public class CheckServiceImpl implements CheckService { String now = DateUtil.now(); String moveinv_id = whereJson.getString("moveinv_id"); - //查询所有载具的库存 + //查询当前移库单所有载具的任务 JSONArray ja = WQL.getWO("QST_IVT_HANDMOVESTOR") .addParam("flag", "4") .addParam("moveinv_id", moveinv_id) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_HANDMOVESTOR.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_HANDMOVESTOR.wql index 7ad5ff3..975ba64 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_HANDMOVESTOR.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_HANDMOVESTOR.wql @@ -72,32 +72,6 @@ # 3、业务主过程 # ########################################## - IF 输入.flag = "2" - QUERY - SELECT - MoveInvDtl.*, - true as edit, - mb.material_code, - mb.material_name - FROM - ST_IVT_MoveInvDtl MoveInvDtl - LEFT JOIN md_me_materialbase mb ON mb.material_id = MoveInvDtl.material_id - WHERE - 1 = 1 - OPTION 输入.moveinv_id <> "" - MoveInvDtl.moveinv_id = 输入.moveinv_id - ENDOPTION - OPTION 输入.moveinvdtl_id <> "" - MoveInvDtl.moveinvdtl_id = 输入.moveinvdtl_id - ENDOPTION - OPTION 输入.work_status <> "" - MoveInvDtl.work_status <= 输入.work_status - ENDOPTION - order by MoveInvDtl.seq_no - ENDSELECT - ENDQUERY - ENDIF - IF 输入.flag = "3" PAGEQUERY SELECT @@ -189,6 +163,31 @@ ENDPAGEQUERY ENDIF + IF 输入.flag = "4" + QUERY + SELECT + DISTINCT(task.task_id), + dtl.turnout_struct_code AS turnout_struct_code + FROM + ST_IVT_MoveInvDtl dtl + INNER JOIN ST_IVT_MoveInv mst ON mst.moveinv_id = dtl.moveinv_id + INNER JOIN SCH_BASE_Task task ON task.task_id = dtl.task_id + WHERE + 1 = 1 + AND mst.bill_status = '10' + AND dtl.work_status = '01' + AND task.task_status < '05' + AND mst.is_delete = '0' + AND task.is_delete = '0' + OPTION 输入.moveinv_id <> "" + dtl.moveinv_id = 输入.moveinv_id + ENDOPTION + + order by turnout_struct_code DESC + ENDSELECT + ENDQUERY + ENDIF + IF 输入.flag = "33" QUERY SELECT @@ -281,31 +280,6 @@ ENDQUERY ENDIF - IF 输入.flag = "4" - QUERY - SELECT - DISTINCT(task.task_id), - dtl.turnout_struct_code AS turnout_struct_code - FROM - ST_IVT_MoveInvDtl dtl - INNER JOIN ST_IVT_MoveInv mst ON mst.moveinv_id = dtl.moveinv_id - INNER JOIN SCH_BASE_Task task ON task.task_id = dtl.task_id - WHERE - 1 = 1 - AND mst.bill_status = '10' - AND dtl.work_status = '01' - AND task.task_status < '05' - AND mst.is_delete = '0' - AND task.is_delete = '0' - OPTION 输入.moveinv_id <> "" - dtl.moveinv_id = 输入.moveinv_id - ENDOPTION - - order by turnout_struct_code DESC - ENDSELECT - ENDQUERY - ENDIF - IF 输入.flag = "5" QUERY SELECT diff --git a/lms/nladmin-ui/src/views/wms/basedata/master/class/classstandard.js b/lms/nladmin-ui/src/views/wms/basedata/master/class/classstandard.js index 0c216de..1505b3c 100644 --- a/lms/nladmin-ui/src/views/wms/basedata/master/class/classstandard.js +++ b/lms/nladmin-ui/src/views/wms/basedata/master/class/classstandard.js @@ -48,29 +48,6 @@ export function getClassType(params) { params }) } -export function queryClassById(params) { - return request({ - url: 'api/Classstandard/queryClassById', - method: 'get', - params - }) -} -// 传入分类标识和级别 -export function getType(params) { - return request({ - url: 'api/Classstandard/getType', - method: 'get', - params - }) -} - -export function getClassTable(params) { - return request({ - url: 'api/Classstandard/getClassTable', - method: 'get', - params - }) -} export function getClassName() { return request({ @@ -79,4 +56,4 @@ export function getClassName() { }) } -export default { add, edit, del, getClass, getClassSuperior, getClassType, getClassTable, getType, queryClassById, getClassName } +export default { add, edit, del, getClass, getClassSuperior, getClassType, getClassName } diff --git a/lms/nladmin-ui/src/views/wms/st/inStor/moveStor/AddDialog.vue b/lms/nladmin-ui/src/views/wms/st/inStor/moveStor/AddDialog.vue index ed7214a..66bc7c5 100644 --- a/lms/nladmin-ui/src/views/wms/st/inStor/moveStor/AddDialog.vue +++ b/lms/nladmin-ui/src/views/wms/st/inStor/moveStor/AddDialog.vue @@ -65,6 +65,8 @@