From 54af1e05e74eec1d9b1d67b3ed07562c05b28260 Mon Sep 17 00:00:00 2001 From: zds <2388969634@qq.com> Date: Sat, 12 Oct 2024 14:37:23 +0800 Subject: [PATCH] =?UTF-8?q?opt:=E5=AF=B9=E6=AF=94=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BB=A3=E7=A0=81=EF=BC=8C=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E4=B8=8D=E6=98=AF=E6=9C=AC=E9=A1=B9=E7=9B=AE=E7=9A=84=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../database/service/dao/MdpbBoxtype.java | 2 +- .../master/rest/SupplierbaseController.java | 61 ---- .../master/service/SupplierbaseService.java | 71 ---- .../master/service/dto/SupplierbaseDto.java | 158 -------- .../service/impl/SupplierbaseServiceImpl.java | 165 --------- .../st/inbill/rest/InchargeController.java | 31 -- .../st/inbill/service/InchargeService.java | 49 --- .../service/impl/InchargeServiceImpl.java | 129 ------- .../rest/InEmptyvehiclerecordController.java | 74 ---- .../rest/OutEmptyvehiclerecordController.java | 74 ---- .../service/InEmptyvehiclerecordService.java | 78 ---- .../service/OutEmptyvehiclerecordService.java | 78 ---- .../service/dto/EmptyvehiclerecordDto.java | 109 ------ .../impl/InEmptyvehiclerecordServiceImpl.java | 210 ----------- .../OutEmptyvehiclerecordServiceImpl.java | 210 ----------- .../st/vehiclebill/wql/ST_VEHICLE_IN_01.wql | 61 ---- .../st/vehiclebill/wql/ST_VEHICLE_IN_02.wql | 108 ------ .../st/vehiclebill/wql/ST_VEHICLE_OUT_01.wql | 61 ---- .../st/vehiclebill/wql/ST_VEHICLE_OUT_02.wql | 114 ------ .../wms/stat/rest/IostordailyController.java | 45 --- .../stat/service/impl/IostordailyService.java | 28 -- .../service/impl/IostordailyServiceImpl.java | 90 ----- .../org/nl/wms/stat/wql/SendReceiveQuery.wql | 244 ------------- .../views/wms/basedata/master/supp/index.vue | 344 ------------------ .../wms/basedata/master/supp/supplierbase.js | 27 -- .../src/views/wms/mps/device/device.js | 74 ---- .../src/views/wms/mps/device/index.vue | 151 -------- .../src/views/wms/mps/item/deviceitem.js | 27 -- .../src/views/wms/mps/item/index.vue | 162 --------- .../mps/personcorrdevice/DevicesDialog.vue | 144 -------- .../personcorrdevice/SelectDeviceDialog.vue | 187 ---------- .../personcorrdevice/SelectPeersonDialog.vue | 153 -------- .../views/wms/mps/personcorrdevice/index.vue | 135 ------- .../mps/personcorrdevice/personcorrdevice.js | 67 ---- .../wms/mps/teamcorrperson/PersonDialog.vue | 111 ------ .../teamcorrperson/SelectPeersonDialog.vue | 151 -------- .../views/wms/mps/teamcorrperson/index.vue | 208 ----------- .../wms/mps/teamcorrperson/teamcorrperson.js | 43 --- .../views/wms/mps/teamcorrperson/workteam.js | 42 --- .../src/views/wms/pub/DeviceDialog.vue | 175 --------- .../src/views/wms/st/incharge/incharge.js | 26 +- .../src/views/wms/st/incharge/index.vue | 9 +- .../src/views/wms/st/outcharge/index.vue | 35 +- .../views/wms/st/vehiclebill/PointDialog.vue | 202 ---------- .../src/views/wms/st/vehiclebill/in/index.vue | 217 ----------- .../wms/st/vehiclebill/in/inemptyvehicl.js | 35 -- .../views/wms/st/vehiclebill/out/index.vue | 217 ----------- .../wms/st/vehiclebill/out/outemptyvehicl.js | 35 -- .../wms/statistics/sendReceiveQuery/index.vue | 319 ---------------- .../sendReceiveQuery/iostordaily.js | 34 -- 50 files changed, 9 insertions(+), 5571 deletions(-) delete mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/SupplierbaseController.java delete mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/SupplierbaseService.java delete mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/SupplierbaseDto.java delete mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/SupplierbaseServiceImpl.java delete mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/rest/InEmptyvehiclerecordController.java delete mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/rest/OutEmptyvehiclerecordController.java delete mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/InEmptyvehiclerecordService.java delete mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/OutEmptyvehiclerecordService.java delete mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/dto/EmptyvehiclerecordDto.java delete mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/impl/InEmptyvehiclerecordServiceImpl.java delete mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/impl/OutEmptyvehiclerecordServiceImpl.java delete mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/wql/ST_VEHICLE_IN_01.wql delete mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/wql/ST_VEHICLE_IN_02.wql delete mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/wql/ST_VEHICLE_OUT_01.wql delete mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/wql/ST_VEHICLE_OUT_02.wql delete mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/stat/rest/IostordailyController.java delete mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/IostordailyService.java delete mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/IostordailyServiceImpl.java delete mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/SendReceiveQuery.wql delete mode 100644 lms/nladmin-ui/src/views/wms/basedata/master/supp/index.vue delete mode 100644 lms/nladmin-ui/src/views/wms/basedata/master/supp/supplierbase.js delete mode 100644 lms/nladmin-ui/src/views/wms/mps/device/device.js delete mode 100644 lms/nladmin-ui/src/views/wms/mps/device/index.vue delete mode 100644 lms/nladmin-ui/src/views/wms/mps/item/deviceitem.js delete mode 100644 lms/nladmin-ui/src/views/wms/mps/item/index.vue delete mode 100644 lms/nladmin-ui/src/views/wms/mps/personcorrdevice/DevicesDialog.vue delete mode 100644 lms/nladmin-ui/src/views/wms/mps/personcorrdevice/SelectDeviceDialog.vue delete mode 100644 lms/nladmin-ui/src/views/wms/mps/personcorrdevice/SelectPeersonDialog.vue delete mode 100644 lms/nladmin-ui/src/views/wms/mps/personcorrdevice/index.vue delete mode 100644 lms/nladmin-ui/src/views/wms/mps/personcorrdevice/personcorrdevice.js delete mode 100644 lms/nladmin-ui/src/views/wms/mps/teamcorrperson/PersonDialog.vue delete mode 100644 lms/nladmin-ui/src/views/wms/mps/teamcorrperson/SelectPeersonDialog.vue delete mode 100644 lms/nladmin-ui/src/views/wms/mps/teamcorrperson/index.vue delete mode 100644 lms/nladmin-ui/src/views/wms/mps/teamcorrperson/teamcorrperson.js delete mode 100644 lms/nladmin-ui/src/views/wms/mps/teamcorrperson/workteam.js delete mode 100644 lms/nladmin-ui/src/views/wms/pub/DeviceDialog.vue delete mode 100644 lms/nladmin-ui/src/views/wms/st/vehiclebill/PointDialog.vue delete mode 100644 lms/nladmin-ui/src/views/wms/st/vehiclebill/in/index.vue delete mode 100644 lms/nladmin-ui/src/views/wms/st/vehiclebill/in/inemptyvehicl.js delete mode 100644 lms/nladmin-ui/src/views/wms/st/vehiclebill/out/index.vue delete mode 100644 lms/nladmin-ui/src/views/wms/st/vehiclebill/out/outemptyvehicl.js delete mode 100644 lms/nladmin-ui/src/views/wms/statistics/sendReceiveQuery/index.vue delete mode 100644 lms/nladmin-ui/src/views/wms/statistics/sendReceiveQuery/iostordaily.js diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/dao/MdpbBoxtype.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/dao/MdpbBoxtype.java index 40c04a1..70c5798 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/dao/MdpbBoxtype.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/dao/MdpbBoxtype.java @@ -19,7 +19,7 @@ import java.io.Serializable; */ @Data @EqualsAndHashCode(callSuper = false) -@TableName("mdpb_boxtype") +@TableName("md_pb_boxtype") public class MdpbBoxtype implements Serializable { private static final long serialVersionUID = 1L; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/SupplierbaseController.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/SupplierbaseController.java deleted file mode 100644 index 34dc0c7..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/SupplierbaseController.java +++ /dev/null @@ -1,61 +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.SupplierbaseService; -import org.nl.wms.basedata.master.service.dto.SupplierbaseDto; -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-06 - **/ -@RestController -@RequiredArgsConstructor - -@RequestMapping("/api/supplierbase") -@Slf4j -public class SupplierbaseController { - - private final SupplierbaseService supplierbaseService; - - @GetMapping - @Log("查询供应商") - - public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { - return new ResponseEntity<>(supplierbaseService.queryAll(whereJson, page), HttpStatus.OK); - } - - @PostMapping - @Log("新增供应商") - - public ResponseEntity create(@Validated @RequestBody SupplierbaseDto dto) { - supplierbaseService.create(dto); - return new ResponseEntity<>(HttpStatus.CREATED); - } - - @PutMapping - @Log("修改供应商") - - public ResponseEntity update(@Validated @RequestBody SupplierbaseDto dto) { - supplierbaseService.update(dto); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } - - @Log("删除供应商") - - //@PreAuthorize("@el.check('mdCsSupplierbase:del')") - @DeleteMapping - public ResponseEntity delete(@RequestBody Long[] ids) { - supplierbaseService.deleteAll(ids); - return new ResponseEntity<>(HttpStatus.OK); - } -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/SupplierbaseService.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/SupplierbaseService.java deleted file mode 100644 index a48fffa..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/SupplierbaseService.java +++ /dev/null @@ -1,71 +0,0 @@ -package org.nl.wms.basedata.master.service; - -import org.nl.wms.basedata.master.service.dto.SupplierbaseDto; -import org.springframework.data.domain.Pageable; - -import java.util.List; -import java.util.Map; - -/** - * @author zhouz - * @description 服务接口 - * @date 2021-12-06 - **/ -public interface SupplierbaseService { - - /** - * 查询数据分页 - * - * @param whereJson 条件 - * @param page 分页参数 - * @return Map - */ - Map queryAll(Map whereJson, Pageable page); - - /** - * 查询所有数据不分页 - * - * @param whereJson 条件参数 - * @return List - */ - List queryAll(Map whereJson); - - /** - * 根据ID查询 - * - * @param supp_id ID - * @return MdCsSupplierbase - */ - SupplierbaseDto findById(Long supp_id); - - /** - * 根据编码查询 - * - * @param code code - * @return MdCsSupplierbase - */ - SupplierbaseDto findByCode(String code); - - - /** - * 创建 - * - * @param dto / - */ - void create(SupplierbaseDto dto); - - /** - * 编辑 - * - * @param dto / - */ - void update(SupplierbaseDto dto); - - /** - * c - * 多选删除 - * - * @param ids / - */ - void deleteAll(Long[] ids); -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/SupplierbaseDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/SupplierbaseDto.java deleted file mode 100644 index 2404584..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/SupplierbaseDto.java +++ /dev/null @@ -1,158 +0,0 @@ -package org.nl.wms.basedata.master.service.dto; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; - -/** - * @author zhouz - * @description / - * @date 2021-12-06 - **/ -@Data -public class SupplierbaseDto implements Serializable { - /** 供应商标识 */ - /** - * 防止精度丢失 - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long supp_id; - - /** - * 供应商编码 - */ - private String supp_code; - - /** - * 供应商名称 - */ - private String supp_name; - - /** - * 法人代表 - */ - 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 barcode_print; - - /** - * 备注 - */ - private String remark; - - /** - * 分类标识 - */ - private Long class_id; - - /** - * 分类编码 - */ - private String class_code; - - /** - * 分类名称 - */ - private String class_name; - - /** - * 资金计划履约天数 - */ - private BigDecimal honour_days; -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/SupplierbaseServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/SupplierbaseServiceImpl.java deleted file mode 100644 index 3367801..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/SupplierbaseServiceImpl.java +++ /dev/null @@ -1,165 +0,0 @@ -package org.nl.wms.basedata.master.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.core.bean.ResultBean; -import org.nl.modules.wql.core.bean.WQLObject; -import org.nl.modules.wql.util.WqlUtil; -import org.nl.wms.basedata.master.service.ClassstandardService; -import org.nl.wms.basedata.master.service.SupplierbaseService; -import org.nl.wms.basedata.master.service.dto.ClassstandardDto; -import org.nl.wms.basedata.master.service.dto.SupplierbaseDto; -import org.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.List; -import java.util.Map; - -/** - * @author zhouz - * @description 服务实现 - * @date 2021-12-06 - **/ -@Service -@RequiredArgsConstructor -@Slf4j -public class SupplierbaseServiceImpl implements SupplierbaseService { - @Autowired - private ClassstandardService classstandardService; - - @Override - public Map queryAll(Map whereJson, Pageable page) { - String where = ""; - WQLObject wo = WQLObject.getWQLObject("md_cs_supplierbase"); - String search = (String) whereJson.get("search"); - if (!StrUtil.isEmpty(search)) { - where = "AND (supp_code like '%" + search + "%' OR supp_name like '%" + search + "%')"; - } - ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), "is_delete = '0'" + where, "update_time desc"); - final JSONObject json = rb.pageResult(); - return json; - } - - @Override - public List queryAll(Map whereJson) { - WQLObject wo = WQLObject.getWQLObject("md_cs_supplierbase"); - JSONArray arr = wo.query().getResultJSONArray(0); - List list = arr.toJavaList(SupplierbaseDto.class); - return list; - } - - @Override - public SupplierbaseDto findById(Long supp_id) { - WQLObject wo = WQLObject.getWQLObject("md_cs_supplierbase"); - JSONObject json = wo.query("supp_id =" + supp_id + "").uniqueResult(0); - if (ObjectUtil.isEmpty(json)) { - return null; - } - final SupplierbaseDto obj = json.toJavaObject(SupplierbaseDto.class); - return obj; - } - - @Override - public SupplierbaseDto findByCode(String code) { - WQLObject wo = WQLObject.getWQLObject("md_cs_supplierbase"); - JSONObject json = wo.query("supp_code ='" + code + "'").uniqueResult(0); - if (ObjectUtil.isEmpty(json)) { - return null; - } - final SupplierbaseDto obj = json.toJavaObject(SupplierbaseDto.class); - return obj; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void create(SupplierbaseDto dto) { - String supp_code = dto.getSupp_code(); - SupplierbaseDto supplierbaseDto = this.findByCode(supp_code); - if (supplierbaseDto != null && "0".equals(supplierbaseDto.getIs_delete())) { - throw new BadRequestException("存在相同的供应商编号"); - } - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - String now = DateUtil.now(); - - ClassstandardDto classDto = classstandardService.findById(dto.getClass_id() + ""); - if (ObjectUtil.isNotEmpty(classDto)) { - dto.setClass_code(classDto.getClass_code()); - dto.setClass_name(classDto.getClass_name()); - } - - dto.setSupp_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_supplierbase"); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - wo.insert(json); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(SupplierbaseDto dto) { - SupplierbaseDto entity = this.findById(dto.getSupp_id()); - if (entity == null) { - throw new BadRequestException("被删除或无权限，操作失败!"); - } - ClassstandardDto classDto = classstandardService.findById(dto.getClass_id() + ""); - if (ObjectUtil.isNotEmpty(classDto)) { - dto.setClass_code(classDto.getClass_code()); - dto.setClass_name(classDto.getClass_name()); - } - String supp_code = dto.getSupp_code(); - SupplierbaseDto supplierbaseDto = this.findByCode(supp_code); - if (supplierbaseDto != null && !dto.getSupp_id().equals(supplierbaseDto.getSupp_id()) && "0".equals(supplierbaseDto.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); - - WQLObject wo = WQLObject.getWQLObject("md_cs_supplierbase"); - 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_supplierbase"); - for (Long supp_id : ids) { - JSONObject param = new JSONObject(); - param.put("supp_id", String.valueOf(supp_id)); - param.put("is_delete", "1"); - param.put("update_optid", currentUserId); - param.put("update_optname", nickName); - param.put("update_time", now); - wo.update(param); - } - } -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/rest/InchargeController.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/rest/InchargeController.java index 6d8fc09..51b9389 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/rest/InchargeController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/rest/InchargeController.java @@ -6,11 +6,9 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; import org.nl.wms.st.inbill.service.InchargeService; -import org.nl.wms.st.vehiclebill.service.dto.EmptyvehiclerecordDto; 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; @@ -30,42 +28,13 @@ public class InchargeController { @GetMapping @Log("查询入库冲销") - - //@PreAuthorize("@el.check('emptyvehiclerecord:list')") public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(inchargeService.queryAll(whereJson, page), HttpStatus.OK); } - @PostMapping - @Log("新增入库冲销") - - //@PreAuthorize("@el.check('emptyvehiclerecord:add')") - public ResponseEntity create(@Validated @RequestBody EmptyvehiclerecordDto dto) { - inchargeService.create(dto); - return new ResponseEntity<>(HttpStatus.CREATED); - } - - @PutMapping - @Log("修改入库冲销") - - //@PreAuthorize("@el.check('emptyvehiclerecord:edit')") - public ResponseEntity update(@Validated @RequestBody EmptyvehiclerecordDto dto) { - inchargeService.update(dto); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } - - @Log("删除入库冲销") - - //@PreAuthorize("@el.check('emptyvehiclerecord:del')") - @DeleteMapping - public ResponseEntity delete(@RequestBody Long[] ids) { - inchargeService.deleteAll(ids); - return new ResponseEntity<>(HttpStatus.OK); - } @PostMapping("/charge") @Log("冲销") - public ResponseEntity charge(@RequestBody JSONObject whereJson) { inchargeService.charge(whereJson); return new ResponseEntity<>(HttpStatus.OK); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/InchargeService.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/InchargeService.java index 75f41d3..fdb26fc 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/InchargeService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/InchargeService.java @@ -1,10 +1,7 @@ package org.nl.wms.st.inbill.service; import com.alibaba.fastjson.JSONObject; -import org.nl.wms.st.vehiclebill.service.dto.EmptyvehiclerecordDto; import org.springframework.data.domain.Pageable; - -import java.util.List; import java.util.Map; /** @@ -23,52 +20,6 @@ public interface InchargeService { */ Map queryAll(Map whereJson, Pageable page); - /** - * 查询所有数据不分页 - * - * @param whereJson 条件参数 - * @return List - */ - List queryAll(Map whereJson); - - /** - * 根据ID查询 - * - * @param record_uuid ID - * @return Emptyvehiclerecord - */ - EmptyvehiclerecordDto findById(Long record_uuid); - - /** - * 根据编码查询 - * - * @param code code - * @return Emptyvehiclerecord - */ - EmptyvehiclerecordDto findByCode(String code); - - - /** - * 创建 - * - * @param dto / - */ - void create(EmptyvehiclerecordDto dto); - - /** - * 编辑 - * - * @param dto / - */ - void update(EmptyvehiclerecordDto dto); - - /** - * 多选删除 - * - * @param ids / - */ - void deleteAll(Long[] ids); - /** * 冲销 * diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/InchargeServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/InchargeServiceImpl.java index 065f07f..8e388c6 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/InchargeServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/InchargeServiceImpl.java @@ -6,7 +6,6 @@ import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; @@ -20,13 +19,10 @@ import org.nl.modules.wql.util.WqlUtil; import org.nl.wms.basedata.st.service.impl.UserStorServiceImpl; import org.nl.wms.st.inbill.service.InchargeService; import org.nl.wms.st.inbill.service.StorPublicService; -import org.nl.wms.st.vehiclebill.service.dto.EmptyvehiclerecordDto; 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; /** @@ -76,131 +72,6 @@ public class InchargeServiceImpl implements InchargeService { return json; } - @Override - public List queryAll(Map whereJson) { - WQLObject wo = WQLObject.getWQLObject("st_ivt_emptyvehiclerecord"); - JSONArray arr = wo.query().getResultJSONArray(0); - if (ObjectUtil.isNotEmpty(arr)) { - return arr.toJavaList(EmptyvehiclerecordDto.class); - } - return null; - } - - @Override - public EmptyvehiclerecordDto findById(Long record_uuid) { - WQLObject wo = WQLObject.getWQLObject("st_ivt_emptyvehiclerecord"); - JSONObject json = wo.query("record_uuid = '" + record_uuid + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(json)) { - return json.toJavaObject(EmptyvehiclerecordDto.class); - } - return null; - } - - @Override - public EmptyvehiclerecordDto findByCode(String code) { - WQLObject wo = WQLObject.getWQLObject("st_ivt_emptyvehiclerecord"); - JSONObject json = wo.query("code ='" + code + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(json)) { - return json.toJavaObject(EmptyvehiclerecordDto.class); - } - return null; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void create(EmptyvehiclerecordDto dto) { - WQLObject schBasePointService = WQLObject.getWQLObject("sch_base_point"); - - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - String now = DateUtil.now(); - - String start_point_code = dto.getStart_point_code(); - String next_point_code = dto.getNext_point_code(); - // 判断起点是否为空！ 入库起点不能为空 - if (ObjectUtil.isEmpty(start_point_code)) { - throw new BadRequestException("起点不能为空"); - } - // 根据点位编码找到对应的所属区域 - Long start_region_id = schBasePointService.query("point_code = '" + start_point_code + "'").uniqueResult(0).getLongValue("region_id"); - if (ObjectUtil.isNotEmpty(next_point_code)) { - Long end_region_id = schBasePointService.query("point_code = '" + next_point_code + "'").uniqueResult(0).getLongValue("region_id"); - dto.setEnd_region_id(end_region_id); - } - - dto.setRecord_uuid(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); - dto.setBill_code(CodeUtil.getNewCode("KZJ_BILL_CODE")); - dto.setIo_type("0"); - dto.setBill_status("10"); - dto.setStart_region_id(start_region_id); - - WQLObject wo = WQLObject.getWQLObject("st_ivt_emptyvehiclerecord"); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - wo.insert(json); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(EmptyvehiclerecordDto dto) { - EmptyvehiclerecordDto entity = this.findById(dto.getRecord_uuid()); - if (entity == null) { - throw new BadRequestException("被删除或无权限，操作失败!"); - } - - WQLObject schBasePointService = WQLObject.getWQLObject("sch_base_point"); - - String start_point_code = dto.getStart_point_code(); - String next_point_code = dto.getNext_point_code(); - // 判断起点是否为空！ 入库起点不能为空 - if (ObjectUtil.isEmpty(start_point_code)) { - throw new BadRequestException("起点不能为空"); - } - // 根据点位编码找到对应的所属区域 - Long start_region_id = schBasePointService.query("point_code = '" + start_point_code + "'").uniqueResult(0).getLongValue("region_id"); - if (ObjectUtil.isNotEmpty(next_point_code)) { - Long end_region_id = schBasePointService.query("point_code = '" + next_point_code + "'").uniqueResult(0).getLongValue("region_id"); - dto.setEnd_region_id(end_region_id); - } - - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - - String now = DateUtil.now(); - dto.setUpdate_time(now); - dto.setStart_region_id(start_region_id); - dto.setUpdate_optid(currentUserId); - dto.setUpdate_optname(nickName); - - WQLObject wo = WQLObject.getWQLObject("st_ivt_emptyvehiclerecord"); - 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_emptyvehiclerecord"); - for (Long record_uuid : ids) { - JSONObject param = new JSONObject(); - param.put("record_uuid", String.valueOf(record_uuid)); - 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 charge(JSONObject whereJson) { diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/rest/InEmptyvehiclerecordController.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/rest/InEmptyvehiclerecordController.java deleted file mode 100644 index b709b6e..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/rest/InEmptyvehiclerecordController.java +++ /dev/null @@ -1,74 +0,0 @@ -package org.nl.wms.st.vehiclebill.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.st.vehiclebill.service.InEmptyvehiclerecordService; -import org.nl.wms.st.vehiclebill.service.dto.EmptyvehiclerecordDto; -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-08-12 - **/ -@RestController -@RequiredArgsConstructor - -@RequestMapping("/api/inemptyvehicle") -@Slf4j -public class InEmptyvehiclerecordController { - - private final InEmptyvehiclerecordService inEmptyvehiclerecordService; - - @GetMapping - @Log("查询空载具入库") - - //@PreAuthorize("@el.check('emptyvehiclerecord:list')") - public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { - return new ResponseEntity<>(inEmptyvehiclerecordService.queryAll(whereJson, page), HttpStatus.OK); - } - - @PostMapping - @Log("新增空载具入库") - - //@PreAuthorize("@el.check('emptyvehiclerecord:add')") - public ResponseEntity create(@Validated @RequestBody EmptyvehiclerecordDto dto) { - inEmptyvehiclerecordService.create(dto); - return new ResponseEntity<>(HttpStatus.CREATED); - } - - @PutMapping - @Log("修改空载具入库") - - //@PreAuthorize("@el.check('emptyvehiclerecord:edit')") - public ResponseEntity update(@Validated @RequestBody EmptyvehiclerecordDto dto) { - inEmptyvehiclerecordService.update(dto); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } - - @Log("删除空载具入库") - - //@PreAuthorize("@el.check('emptyvehiclerecord:del')") - @DeleteMapping - public ResponseEntity delete(@RequestBody Long[] ids) { - inEmptyvehiclerecordService.deleteAll(ids); - return new ResponseEntity<>(HttpStatus.OK); - } - - @Log("生成任务") - - @PostMapping("/createTask") - public ResponseEntity createTask(@RequestBody JSONObject whereJson) { - inEmptyvehiclerecordService.createTask(whereJson); - return new ResponseEntity<>(HttpStatus.OK); - } - -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/rest/OutEmptyvehiclerecordController.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/rest/OutEmptyvehiclerecordController.java deleted file mode 100644 index 961755f..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/rest/OutEmptyvehiclerecordController.java +++ /dev/null @@ -1,74 +0,0 @@ -package org.nl.wms.st.vehiclebill.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.st.vehiclebill.service.OutEmptyvehiclerecordService; -import org.nl.wms.st.vehiclebill.service.dto.EmptyvehiclerecordDto; -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-08-12 - **/ -@RestController -@RequiredArgsConstructor - -@RequestMapping("/api/outemptyvehicle") -@Slf4j -public class OutEmptyvehiclerecordController { - - private final OutEmptyvehiclerecordService outEmptyvehiclerecordService; - - @GetMapping - @Log("查询空载具出库") - - //@PreAuthorize("@el.check('emptyvehiclerecord:list')") - public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { - return new ResponseEntity<>(outEmptyvehiclerecordService.queryAll(whereJson, page), HttpStatus.OK); - } - - @PostMapping - @Log("新增空载具出库") - - //@PreAuthorize("@el.check('emptyvehiclerecord:add')") - public ResponseEntity create(@Validated @RequestBody EmptyvehiclerecordDto dto) { - outEmptyvehiclerecordService.create(dto); - return new ResponseEntity<>(HttpStatus.CREATED); - } - - @PutMapping - @Log("修改空载具出库") - - //@PreAuthorize("@el.check('emptyvehiclerecord:edit')") - public ResponseEntity update(@Validated @RequestBody EmptyvehiclerecordDto dto) { - outEmptyvehiclerecordService.update(dto); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } - - @Log("删除空载具出库") - - //@PreAuthorize("@el.check('emptyvehiclerecord:del')") - @DeleteMapping - public ResponseEntity delete(@RequestBody Long[] ids) { - outEmptyvehiclerecordService.deleteAll(ids); - return new ResponseEntity<>(HttpStatus.OK); - } - - @Log("生成任务") - - @PostMapping("/createTask") - public ResponseEntity createTask(@RequestBody JSONObject whereJson) { - outEmptyvehiclerecordService.createTask(whereJson); - return new ResponseEntity<>(HttpStatus.OK); - } - -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/InEmptyvehiclerecordService.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/InEmptyvehiclerecordService.java deleted file mode 100644 index 79cd1a2..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/InEmptyvehiclerecordService.java +++ /dev/null @@ -1,78 +0,0 @@ -package org.nl.wms.st.vehiclebill.service; - -import com.alibaba.fastjson.JSONObject; -import org.nl.wms.st.vehiclebill.service.dto.EmptyvehiclerecordDto; -import org.springframework.data.domain.Pageable; - -import java.util.List; -import java.util.Map; - -/** - * @author Liuxy - * @description 服务接口 - * @date 2022-08-12 - **/ -public interface InEmptyvehiclerecordService { - - /** - * 查询数据分页 - * - * @param whereJson 条件 - * @param page 分页参数 - * @return Map - */ - Map queryAll(Map whereJson, Pageable page); - - /** - * 查询所有数据不分页 - * - * @param whereJson 条件参数 - * @return List - */ - List queryAll(Map whereJson); - - /** - * 根据ID查询 - * - * @param record_uuid ID - * @return Emptyvehiclerecord - */ - EmptyvehiclerecordDto findById(Long record_uuid); - - /** - * 根据编码查询 - * - * @param code code - * @return Emptyvehiclerecord - */ - EmptyvehiclerecordDto findByCode(String code); - - - /** - * 创建 - * - * @param dto / - */ - void create(EmptyvehiclerecordDto dto); - - /** - * 编辑 - * - * @param dto / - */ - void update(EmptyvehiclerecordDto dto); - - /** - * 多选删除 - * - * @param ids / - */ - void deleteAll(Long[] ids); - - /** - * 生成任务 - * - * @param whereJson / - */ - void createTask(JSONObject whereJson); -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/OutEmptyvehiclerecordService.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/OutEmptyvehiclerecordService.java deleted file mode 100644 index d6f631f..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/OutEmptyvehiclerecordService.java +++ /dev/null @@ -1,78 +0,0 @@ -package org.nl.wms.st.vehiclebill.service; - -import com.alibaba.fastjson.JSONObject; -import org.nl.wms.st.vehiclebill.service.dto.EmptyvehiclerecordDto; -import org.springframework.data.domain.Pageable; - -import java.util.List; -import java.util.Map; - -/** - * @author Liuxy - * @description 服务接口 - * @date 2022-08-12 - **/ -public interface OutEmptyvehiclerecordService { - - /** - * 查询数据分页 - * - * @param whereJson 条件 - * @param page 分页参数 - * @return Map - */ - Map queryAll(Map whereJson, Pageable page); - - /** - * 查询所有数据不分页 - * - * @param whereJson 条件参数 - * @return List - */ - List queryAll(Map whereJson); - - /** - * 根据ID查询 - * - * @param record_uuid ID - * @return Emptyvehiclerecord - */ - EmptyvehiclerecordDto findById(Long record_uuid); - - /** - * 根据编码查询 - * - * @param code code - * @return Emptyvehiclerecord - */ - EmptyvehiclerecordDto findByCode(String code); - - - /** - * 创建 - * - * @param dto / - */ - void create(EmptyvehiclerecordDto dto); - - /** - * 编辑 - * - * @param dto / - */ - void update(EmptyvehiclerecordDto dto); - - /** - * 多选删除 - * - * @param ids / - */ - void deleteAll(Long[] ids); - - /** - * 生成任务 - * - * @param whereJson / - */ - void createTask(JSONObject whereJson); -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/dto/EmptyvehiclerecordDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/dto/EmptyvehiclerecordDto.java deleted file mode 100644 index bbe72ca..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/dto/EmptyvehiclerecordDto.java +++ /dev/null @@ -1,109 +0,0 @@ -package org.nl.wms.st.vehiclebill.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 Liuxy - * @description / - * @date 2022-08-12 - **/ -@Data -public class EmptyvehiclerecordDto implements Serializable { - - /** 记录标识 */ - /** - * 防止精度丢失 - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long record_uuid; - - /** - * 单据编号 - */ - private String bill_code; - - /** - * 单据类型 - */ - private String io_type; - - /** - * 单据状态 - */ - private String bill_status; - - /** - * 载具数量 - */ - private BigDecimal vehicle_qty; - - /** - * 起始点位 - */ - private String start_point_code; - - /** - * 下一点位 - */ - private String next_point_code; - - /** - * 起始区域 - */ - private Long start_region_id; - - /** - * 终点区域 - */ - private Long end_region_id; - - /** - * 任务标识 - */ - private Long task_uuid; - - /** - * 备注 - */ - 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; -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/impl/InEmptyvehiclerecordServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/impl/InEmptyvehiclerecordServiceImpl.java deleted file mode 100644 index 60a7e6f..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/impl/InEmptyvehiclerecordServiceImpl.java +++ /dev/null @@ -1,210 +0,0 @@ -package org.nl.wms.st.vehiclebill.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.common.utils.CodeUtil; -import org.nl.modules.wql.WQL; -import org.nl.modules.wql.core.bean.WQLObject; -import org.nl.modules.wql.util.SpringContextHolder; -import org.nl.modules.wql.util.WqlUtil; -import org.nl.wms.sch.service.PointService; -import org.nl.wms.st.vehiclebill.service.InEmptyvehiclerecordService; -import org.nl.wms.st.vehiclebill.service.dto.EmptyvehiclerecordDto; -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 Liuxy - * @description 服务实现 - * @date 2022-08-12 - **/ -@Service -@RequiredArgsConstructor -@Slf4j -public class InEmptyvehiclerecordServiceImpl implements InEmptyvehiclerecordService { - - @Override - public Map queryAll(Map whereJson, Pageable page) { - String bill_code = MapUtil.getStr(whereJson, "bill_code"); - - HashMap map = new HashMap<>(); - map.put("flag", "1"); - - if (ObjectUtil.isNotEmpty(bill_code)) { - map.put("bill_code", bill_code + "%"); - } - - JSONObject json = WQL.getWO("ST_VEHICLE_IN_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "st.create_time DESC"); - return json; - } - - @Override - public List queryAll(Map whereJson) { - WQLObject wo = WQLObject.getWQLObject("st_ivt_emptyvehiclerecord"); - JSONArray arr = wo.query().getResultJSONArray(0); - if (ObjectUtil.isNotEmpty(arr)) { - return arr.toJavaList(EmptyvehiclerecordDto.class); - } - return null; - } - - @Override - public EmptyvehiclerecordDto findById(Long record_uuid) { - WQLObject wo = WQLObject.getWQLObject("st_ivt_emptyvehiclerecord"); - JSONObject json = wo.query("record_uuid = '" + record_uuid + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(json)) { - return json.toJavaObject(EmptyvehiclerecordDto.class); - } - return null; - } - - @Override - public EmptyvehiclerecordDto findByCode(String code) { - WQLObject wo = WQLObject.getWQLObject("st_ivt_emptyvehiclerecord"); - JSONObject json = wo.query("code ='" + code + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(json)) { - return json.toJavaObject(EmptyvehiclerecordDto.class); - } - return null; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void create(EmptyvehiclerecordDto dto) { - WQLObject schBasePointService = WQLObject.getWQLObject("sch_base_point"); - - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - String now = DateUtil.now(); - - String start_point_code = dto.getStart_point_code(); - String next_point_code = dto.getNext_point_code(); - // 判断起点是否为空！ 入库起点不能为空 - if (ObjectUtil.isEmpty(start_point_code)) { - throw new BadRequestException("起点不能为空"); - } - // 根据点位编码找到对应的所属区域 - Long start_region_id = schBasePointService.query("point_code = '" + start_point_code + "'").uniqueResult(0).getLongValue("region_id"); - if (ObjectUtil.isNotEmpty(next_point_code)) { - Long end_region_id = schBasePointService.query("point_code = '" + next_point_code + "'").uniqueResult(0).getLongValue("region_id"); - dto.setEnd_region_id(end_region_id); - } - - dto.setRecord_uuid(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); - dto.setBill_code(CodeUtil.getNewCode("KZJ_BILL_CODE")); - dto.setIo_type("0"); - dto.setBill_status("10"); - dto.setStart_region_id(start_region_id); - - WQLObject wo = WQLObject.getWQLObject("st_ivt_emptyvehiclerecord"); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - wo.insert(json); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(EmptyvehiclerecordDto dto) { - EmptyvehiclerecordDto entity = this.findById(dto.getRecord_uuid()); - if (entity == null) { - throw new BadRequestException("被删除或无权限，操作失败!"); - } - - WQLObject schBasePointService = WQLObject.getWQLObject("sch_base_point"); - - String start_point_code = dto.getStart_point_code(); - String next_point_code = dto.getNext_point_code(); - // 判断起点是否为空！ 入库起点不能为空 - if (ObjectUtil.isEmpty(start_point_code)) { - throw new BadRequestException("起点不能为空"); - } - // 根据点位编码找到对应的所属区域 - Long start_region_id = schBasePointService.query("point_code = '" + start_point_code + "'").uniqueResult(0).getLongValue("region_id"); - if (ObjectUtil.isNotEmpty(next_point_code)) { - Long end_region_id = schBasePointService.query("point_code = '" + next_point_code + "'").uniqueResult(0).getLongValue("region_id"); - dto.setEnd_region_id(end_region_id); - } - - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - - String now = DateUtil.now(); - dto.setUpdate_time(now); - dto.setStart_region_id(start_region_id); - dto.setUpdate_optid(currentUserId); - dto.setUpdate_optname(nickName); - - WQLObject wo = WQLObject.getWQLObject("st_ivt_emptyvehiclerecord"); - 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_emptyvehiclerecord"); - for (Long record_uuid : ids) { - JSONObject param = new JSONObject(); - param.put("record_uuid", String.valueOf(record_uuid)); - 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 createTask(JSONObject whereJson) { - WQLObject empTab = WQLObject.getWQLObject("st_ivt_EmptyVehicleRecord"); - WQLObject taskService = WQLObject.getWQLObject("sch_base_task"); - - JSONObject jsonEmp = empTab.query("record_uuid = '" + whereJson.getString("record_uuid") + "'").uniqueResult(0); - // 准备参数 调用空载具处理类中的 创建任务的方法 - JSONObject param = new JSONObject(); - param.put("start_point_code", jsonEmp.getString("start_point_code")); - param.put("next_point_code", jsonEmp.getString("next_point_code")); - param.put("qty", jsonEmp.getString("vehicle_qty")); - param.put("record_uuid", jsonEmp.getString("record_uuid")); - -// String task_id = new SendEmpVehicleTask().createTask(param); - // 更新空载具表中的任务id和单据状态 - PointService pointDto = SpringContextHolder.getBean(PointService.class); -// JSONObject jsonTask = taskService.query("task_id = '" + task_id + "'").uniqueResult(0); - -// jsonEmp.put("task_uuid", Long.valueOf(task_id)); - jsonEmp.put("bill_status", "20"); -// jsonEmp.put("next_point_code",jsonTask.getString("next_point_code")); -// jsonEmp.put("end_region_id",pointDto.findByCode(jsonTask.getString("next_point_code")).getRegion_id()); - jsonEmp.put("update_optid", SecurityUtils.getCurrentUserId()); - jsonEmp.put("update_optname", SecurityUtils.getCurrentNickName()); - jsonEmp.put("update_time", DateUtil.now()); - empTab.update(jsonEmp); - } - -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/impl/OutEmptyvehiclerecordServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/impl/OutEmptyvehiclerecordServiceImpl.java deleted file mode 100644 index 6ef9c49..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/impl/OutEmptyvehiclerecordServiceImpl.java +++ /dev/null @@ -1,210 +0,0 @@ -package org.nl.wms.st.vehiclebill.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.common.utils.CodeUtil; -import org.nl.modules.wql.WQL; -import org.nl.modules.wql.core.bean.WQLObject; -import org.nl.modules.wql.util.SpringContextHolder; -import org.nl.modules.wql.util.WqlUtil; -import org.nl.wms.sch.service.PointService; -import org.nl.wms.st.vehiclebill.service.OutEmptyvehiclerecordService; -import org.nl.wms.st.vehiclebill.service.dto.EmptyvehiclerecordDto; -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 Liuxy - * @description 服务实现 - * @date 2022-08-12 - **/ -@Service -@RequiredArgsConstructor -@Slf4j -public class OutEmptyvehiclerecordServiceImpl implements OutEmptyvehiclerecordService { - - @Override - public Map queryAll(Map whereJson, Pageable page) { - String bill_code = MapUtil.getStr(whereJson, "bill_code"); - - HashMap map = new HashMap<>(); - map.put("flag", "1"); - - if (ObjectUtil.isNotEmpty(bill_code)) { - map.put("bill_code", bill_code + "%"); - } - - JSONObject json = WQL.getWO("ST_VEHICLE_OUT_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "st.create_time DESC"); - return json; - } - - @Override - public List queryAll(Map whereJson) { - WQLObject wo = WQLObject.getWQLObject("st_ivt_emptyvehiclerecord"); - JSONArray arr = wo.query().getResultJSONArray(0); - if (ObjectUtil.isNotEmpty(arr)) { - return arr.toJavaList(EmptyvehiclerecordDto.class); - } - return null; - } - - @Override - public EmptyvehiclerecordDto findById(Long record_uuid) { - WQLObject wo = WQLObject.getWQLObject("st_ivt_emptyvehiclerecord"); - JSONObject json = wo.query("record_uuid = '" + record_uuid + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(json)) { - return json.toJavaObject(EmptyvehiclerecordDto.class); - } - return null; - } - - @Override - public EmptyvehiclerecordDto findByCode(String code) { - WQLObject wo = WQLObject.getWQLObject("st_ivt_emptyvehiclerecord"); - JSONObject json = wo.query("code ='" + code + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(json)) { - return json.toJavaObject(EmptyvehiclerecordDto.class); - } - return null; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void create(EmptyvehiclerecordDto dto) { - WQLObject schBasePointService = WQLObject.getWQLObject("sch_base_point"); - - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - String now = DateUtil.now(); - - String start_point_code = dto.getStart_point_code(); - String next_point_code = dto.getNext_point_code(); - // 判断终点是否为空！ 出库终点不能为空 - if (ObjectUtil.isEmpty(next_point_code)) { - throw new BadRequestException("终点不能为空"); - } - // 根据点位编码找到对应的所属区域 - Long end_region_id = schBasePointService.query("point_code = '" + next_point_code + "'").uniqueResult(0).getLongValue("region_id"); - if (ObjectUtil.isNotEmpty(start_point_code)) { - Long start_region_id = schBasePointService.query("point_code = '" + start_point_code + "'").uniqueResult(0).getLongValue("region_id"); - dto.setStart_region_id(start_region_id); - } - - dto.setRecord_uuid(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); - dto.setBill_code(CodeUtil.getNewCode("KZJ_BILL_CODE")); - dto.setIo_type("1"); - dto.setBill_status("10"); - dto.setEnd_region_id(end_region_id); - - WQLObject wo = WQLObject.getWQLObject("st_ivt_emptyvehiclerecord"); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - wo.insert(json); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(EmptyvehiclerecordDto dto) { - EmptyvehiclerecordDto entity = this.findById(dto.getRecord_uuid()); - if (entity == null) { - throw new BadRequestException("被删除或无权限，操作失败!"); - } - - WQLObject schBasePointService = WQLObject.getWQLObject("sch_base_point"); - - String start_point_code = dto.getStart_point_code(); - String next_point_code = dto.getNext_point_code(); - // 判断起点是否为空！ 入库起点不能为空 - if (ObjectUtil.isEmpty(next_point_code)) { - throw new BadRequestException("终点不能为空"); - } - // 根据点位编码找到对应的所属区域 - Long end_region_id = schBasePointService.query("point_code = '" + next_point_code + "'").uniqueResult(0).getLongValue("region_id"); - if (ObjectUtil.isNotEmpty(start_point_code)) { - Long start_region_id = schBasePointService.query("point_code = '" + start_point_code + "'").uniqueResult(0).getLongValue("region_id"); - dto.setStart_region_id(start_region_id); - } - - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - - String now = DateUtil.now(); - dto.setUpdate_time(now); - dto.setStart_region_id(end_region_id); - dto.setUpdate_optid(currentUserId); - dto.setUpdate_optname(nickName); - - WQLObject wo = WQLObject.getWQLObject("st_ivt_emptyvehiclerecord"); - 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_emptyvehiclerecord"); - for (Long record_uuid : ids) { - JSONObject param = new JSONObject(); - param.put("record_uuid", String.valueOf(record_uuid)); - 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 createTask(JSONObject whereJson) { - WQLObject empTab = WQLObject.getWQLObject("st_ivt_EmptyVehicleRecord"); - WQLObject taskService = WQLObject.getWQLObject("sch_base_task"); - - JSONObject jsonEmp = empTab.query("record_uuid = '" + whereJson.getString("record_uuid") + "'").uniqueResult(0); - // 准备参数 调用空载具处理类中的 创建任务的方法 - JSONObject param = new JSONObject(); - param.put("start_point_code", jsonEmp.getString("start_point_code")); - param.put("next_point_code", jsonEmp.getString("next_point_code")); - param.put("qty", jsonEmp.getString("vehicle_qty")); - param.put("record_uuid", jsonEmp.getString("record_uuid")); - -// String task_id = new CallEmpVehicleTask().createTask(param); - // 更新空载具表中的任务id和单据状态 - PointService pointDto = SpringContextHolder.getBean(PointService.class); -// JSONObject jsonTask = taskService.query("task_id = '" + task_id + "'").uniqueResult(0); - -// jsonEmp.put("task_uuid", Long.valueOf(task_id)); - jsonEmp.put("bill_status", "20"); -// jsonEmp.put("start_point_code",jsonTask.getString("start_point_code")); -// jsonEmp.put("start_region_id",pointDto.findByCode(jsonTask.getString("start_point_code")).getRegion_id()); - jsonEmp.put("update_optid", SecurityUtils.getCurrentUserId()); - jsonEmp.put("update_optname", SecurityUtils.getCurrentNickName()); - jsonEmp.put("update_time", DateUtil.now()); - empTab.update(jsonEmp); - } - -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/wql/ST_VEHICLE_IN_01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/wql/ST_VEHICLE_IN_01.wql deleted file mode 100644 index 74724e5..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/wql/ST_VEHICLE_IN_01.wql +++ /dev/null @@ -1,61 +0,0 @@ -[交易说明] - 交易名： 空载具入库分页查询 - 所属模块： - 功能简述： - 版权所有： - 表引用： - 版本经历： - -[数据库] - --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库 - -[IO定义] - ################################################# - ## 表字段对应输入参数 - ################################################# - 输入.flag TYPEAS s_string - 输入.bill_code TYPEAS s_string - -[临时表] - --这边列出来的临时表就会在运行期动态创建 - -[临时变量] - --所有中间过程变量均可在此处定义 - -[业务过程] - - ########################################## - # 1、输入输出检查 # - ########################################## - - - ########################################## - # 2、主过程前处理 # - ########################################## - - - ########################################## - # 3、业务主过程 # - ########################################## - - IF 输入.flag = "1" - PAGEQUERY - SELECT - st.*, - region1.region_name AS start_region_name, - region2.region_name AS endt_region_name - FROM - st_ivt_EmptyVehicleRecord st - LEFT JOIN sch_base_region region1 ON st.start_region_id = region1.region_id - LEFT JOIN sch_base_region region2 ON st.end_region_id = region2.region_id - WHERE - st.is_delete = '0' - AND st.io_type = '0' - - OPTION 输入.bill_code <> "" - st.bill_code like 输入.bill_code - ENDOPTION - - ENDSELECT - ENDPAGEQUERY - ENDIF diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/wql/ST_VEHICLE_IN_02.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/wql/ST_VEHICLE_IN_02.wql deleted file mode 100644 index bdbbfb4..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/wql/ST_VEHICLE_IN_02.wql +++ /dev/null @@ -1,108 +0,0 @@ -[交易说明] - 交易名： 空载具入库业务 - 所属模块： - 功能简述： - 版权所有： - 表引用： - 版本经历： - -[数据库] - --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库 - -[IO定义] - ################################################# - ## 表字段对应输入参数 - ################################################# - 输入.flag TYPEAS s_string - 输入.vehicle_qty TYPEAS s_string - 输入.region_code TYPEAS s_string - 输入.vehicle_type TYPEAS s_string - -[临时表] - --这边列出来的临时表就会在运行期动态创建 - -[临时变量] - --所有中间过程变量均可在此处定义 - -[业务过程] - - ########################################## - # 1、输入输出检查 # - ########################################## - - - ########################################## - # 2、主过程前处理 # - ########################################## - - - ########################################## - # 3、业务主过程 # - ########################################## - - IF 输入.flag = "1" - QUERY - SELECT - point.* - FROM - sch_base_point point - LEFT JOIN SCH_BASE_Region region ON point.region_id = region.region_id - WHERE - point.lock_type = '00' - AND (12 - IFNULL(point.vehicle_qty,0)) >= 输入.vehicle_qty - - OPTION 输入.region_code <> "" - region.region_code = 输入.region_code - ENDOPTION - - OPTION 输入.vehicle_type <> "" - point.vehicle_type = 输入.vehicle_type - ENDOPTION - - order by point.vehicle_qty DESC - - ENDSELECT - ENDQUERY - ENDIF - - IF 输入.flag = "2" - QUERY - SELECT - point.* - FROM - sch_base_point point - LEFT JOIN SCH_BASE_Region region ON point.region_id = region.region_id - WHERE - point.lock_type = '00' - AND IFNULL(point.vehicle_qty,0) = '0' - - OPTION 输入.region_code <> "" - region.region_code = 输入.region_code - ENDOPTION - - order by point.vehicle_qty DESC - - ENDSELECT - ENDQUERY - ENDIF - - IF 输入.flag = "3" - QUERY - SELECT - point.* - FROM - sch_base_point point - LEFT JOIN SCH_BASE_Region region ON point.region_id = region.region_id - WHERE - point.lock_type = '00' - AND point.point_status = '00' - - OPTION 输入.region_code <> "" - region.region_code = 输入.region_code - ENDOPTION - - order by point.point_code DESC - - ENDSELECT - ENDQUERY - ENDIF diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/wql/ST_VEHICLE_OUT_01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/wql/ST_VEHICLE_OUT_01.wql deleted file mode 100644 index 7c4919c..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/wql/ST_VEHICLE_OUT_01.wql +++ /dev/null @@ -1,61 +0,0 @@ -[交易说明] - 交易名： 空载具出库分页查询 - 所属模块： - 功能简述： - 版权所有： - 表引用： - 版本经历： - -[数据库] - --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库 - -[IO定义] - ################################################# - ## 表字段对应输入参数 - ################################################# - 输入.flag TYPEAS s_string - 输入.bill_code TYPEAS s_string - -[临时表] - --这边列出来的临时表就会在运行期动态创建 - -[临时变量] - --所有中间过程变量均可在此处定义 - -[业务过程] - - ########################################## - # 1、输入输出检查 # - ########################################## - - - ########################################## - # 2、主过程前处理 # - ########################################## - - - ########################################## - # 3、业务主过程 # - ########################################## - - IF 输入.flag = "1" - PAGEQUERY - SELECT - st.*, - region1.region_name AS start_region_name, - region2.region_name AS endt_region_name - FROM - st_ivt_EmptyVehicleRecord st - LEFT JOIN sch_base_region region1 ON st.start_region_id = region1.region_id - LEFT JOIN sch_base_region region2 ON st.end_region_id = region2.region_id - WHERE - st.is_delete = '0' - AND st.io_type = '1' - - OPTION 输入.bill_code <> "" - st.bill_code like 输入.bill_code - ENDOPTION - - ENDSELECT - ENDPAGEQUERY - ENDIF diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/wql/ST_VEHICLE_OUT_02.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/wql/ST_VEHICLE_OUT_02.wql deleted file mode 100644 index c49d544..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/wql/ST_VEHICLE_OUT_02.wql +++ /dev/null @@ -1,114 +0,0 @@ -[交易说明] - 交易名： 空载具出库业务 - 所属模块： - 功能简述： - 版权所有： - 表引用： - 版本经历： - -[数据库] - --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库 - -[IO定义] - ################################################# - ## 表字段对应输入参数 - ################################################# - 输入.flag TYPEAS s_string - 输入.vehicle_qty TYPEAS s_string - 输入.vehicle_type TYPEAS s_string - 输入.region_code TYPEAS s_string - -[临时表] - --这边列出来的临时表就会在运行期动态创建 - -[临时变量] - --所有中间过程变量均可在此处定义 - -[业务过程] - - ########################################## - # 1、输入输出检查 # - ########################################## - - - ########################################## - # 2、主过程前处理 # - ########################################## - - - ########################################## - # 3、业务主过程 # - ########################################## - - IF 输入.flag = "1" - QUERY - SELECT - point.* - FROM - sch_base_point point - LEFT JOIN SCH_BASE_Region region ON point.region_id = region.region_id - WHERE - point.lock_type = '00' - AND point.point_status = '01' - AND IFNULL(point.vehicle_qty,0) >= 输入.vehicle_qty - - OPTION 输入.region_code <> "" - region.region_code = 输入.region_code - ENDOPTION - - OPTION 输入.vehicle_type <> "" - point.vehicle_type = 输入.vehicle_type - ENDOPTION - - order by point.vehicle_qty ASC - - ENDSELECT - ENDQUERY - ENDIF - - IF 输入.flag = "3" - QUERY - SELECT - point.* - FROM - sch_base_point point - LEFT JOIN SCH_BASE_Region region ON point.region_id = region.region_id - WHERE - point.lock_type = '00' - AND point.point_status = '01' - AND IFNULL(point.vehicle_qty,0) == 输入.vehicle_qty - - OPTION 输入.region_code <> "" - region.region_code = 输入.region_code - ENDOPTION - - OPTION 输入.vehicle_type <> "" - point.vehicle_type = 输入.vehicle_type - ENDOPTION - - order by point.point_code DESC - - ENDSELECT - ENDQUERY - ENDIF - - IF 输入.flag = "2" - QUERY - SELECT - point.* - FROM - sch_base_point point - LEFT JOIN SCH_BASE_Region region ON point.region_id = region.region_id - WHERE - point.lock_type = '00' - AND point.point_status = '00' - - OPTION 输入.region_code <> "" - region.region_code = 输入.region_code - ENDOPTION - - order by point.point_code DESC - - ENDSELECT - ENDQUERY - ENDIF diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/rest/IostordailyController.java b/lms/nladmin-system/src/main/java/org/nl/wms/stat/rest/IostordailyController.java deleted file mode 100644 index b7434b5..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/rest/IostordailyController.java +++ /dev/null @@ -1,45 +0,0 @@ -package org.nl.wms.stat.rest; - - -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.modules.logging.annotation.Log; -import org.nl.wms.stat.service.impl.IostordailyService; -import org.springframework.data.domain.Pageable; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import java.util.Map; - -/** - * @author Liuxy - * @date 2022-01-17 - **/ -@RestController -@RequiredArgsConstructor - -@RequestMapping("/api/iostordaily") -@Slf4j -public class IostordailyController { - - private final IostordailyService iostordailyService; - - @GetMapping - @Log("查询收发存查询") - - //@PreAuthorize("@el.check('iostordaily:list')") - public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { - return new ResponseEntity<>(iostordailyService.queryAll(whereJson, page), HttpStatus.OK); - } - - @GetMapping("/getStor") - @Log("查询仓库") - - public ResponseEntity getStor() { - return new ResponseEntity<>(iostordailyService.getStor(), HttpStatus.OK); - } -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/IostordailyService.java b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/IostordailyService.java deleted file mode 100644 index 2962d3a..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/IostordailyService.java +++ /dev/null @@ -1,28 +0,0 @@ -package org.nl.wms.stat.service.impl; - -import com.alibaba.fastjson.JSONArray; -import org.springframework.data.domain.Pageable; - -import java.util.Map; - -/** - * @author Liuxy - * @description 服务接口 - * @date 2022-01-17 - **/ -public interface IostordailyService { - - /** - * 查询数据分页 - * - * @param whereJson 条件 - * @param page 分页参数 - * @return Map - */ - Map queryAll(Map whereJson, Pageable page); - - /** - * 查询仓库 - */ - JSONArray getStor(); -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/IostordailyServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/IostordailyServiceImpl.java deleted file mode 100644 index 15369b7..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/IostordailyServiceImpl.java +++ /dev/null @@ -1,90 +0,0 @@ -package org.nl.wms.stat.service.impl; - - -import cn.hutool.core.map.MapUtil; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.modules.wql.WQL; -import org.nl.modules.wql.util.WqlUtil; -import org.nl.wms.basedata.master.service.ClassstandardService; -import org.nl.wms.basedata.master.service.MaterialbaseService; -import org.nl.wms.basedata.st.service.impl.UserStorServiceImpl; -import org.springframework.data.domain.Pageable; -import org.springframework.stereotype.Service; - -import java.util.HashMap; -import java.util.Map; - -/** - * @author Liuxy - * @description 服务实现 - * @date 2022-01-17 - **/ -@Service -@RequiredArgsConstructor -@Slf4j -public class IostordailyServiceImpl implements IostordailyService { - private final ClassstandardService classstandardService; - private final MaterialbaseService materialbaseService; - - @Override - public Map queryAll(Map whereJson, Pageable page) { - String material_code = MapUtil.getStr(whereJson, "material_code"); - String material_type_id = MapUtil.getStr(whereJson, "material_type_id"); - String pcsn = MapUtil.getStr(whereJson, "pcsn"); - String sap_pcsn = MapUtil.getStr(whereJson, "sap_pcsn"); - String package_box_sn = MapUtil.getStr(whereJson, "package_box_sn"); - //物料限制的时候使用，初始化页面 - String class_idStr = MapUtil.getStr(whereJson, "class_idStr"); - HashMap map = new HashMap<>(whereJson); - map.put("flag", "1"); - map.put("stor_id", MapUtil.getStr(whereJson, "stor_id")); - //处理物料当前节点的所有子节点 - if (!StrUtil.isEmpty(material_type_id)) { - map.put("material_type_id", material_type_id); - String classIds = classstandardService.getChildIdStr(material_type_id); - map.put("classIds", classIds); - } else if (ObjectUtil.isNotEmpty(class_idStr)) { - String classIds = classstandardService.getAllChildIdStr(class_idStr); - map.put("classIds", classIds); - } - if (!ObjectUtil.isEmpty(material_code)) { - //处理转义字符 - if (material_code.contains("\\")) { - material_code = material_code.replace("\\", "\\\\\\"); - } - map.put("material_code", "%" + material_code + "%"); - } - if (ObjectUtil.isNotEmpty(pcsn)) { - map.put("pcsn", "%" + pcsn + "%"); - } - if (ObjectUtil.isNotEmpty(sap_pcsn)) { - map.put("sap_pcsn", "%" + sap_pcsn + "%"); - } - if (ObjectUtil.isNotEmpty(package_box_sn)) { - map.put("package_box_sn", "%" + package_box_sn + "%"); - } - - //获取人员对应的仓库 - 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 json = WQL.getWO("SendReceiveQuery").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "da.sect_date desc"); - - return json; - } - - @Override - public JSONArray getStor() { - JSONArray jsonArr = WQL.getWO("SendReceiveQuery").addParam("flag", "2").process().getResultJSONArray(0); - return jsonArr; - } -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/SendReceiveQuery.wql b/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/SendReceiveQuery.wql deleted file mode 100644 index 472ff55..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/SendReceiveQuery.wql +++ /dev/null @@ -1,244 +0,0 @@ -[交易说明] - 交易名： 收发存分页查询 - 所属模块： - 功能简述： - 版权所有： - 表引用： - 版本经历： - -[数据库] - --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库 - -[IO定义] - ################################################# - ## 表字段对应输入参数 - ################################################# - 输入.flag TYPEAS s_string - 输入.stor_id TYPEAS s_string - 输入.begin_time TYPEAS s_string - 输入.end_time TYPEAS s_string - 输入.material_code TYPEAS s_string - 输入.pcsn TYPEAS s_string - 输入.sap_pcsn TYPEAS s_string - 输入.package_box_sn TYPEAS s_string - 输入.in_stor_id TYPEAS f_string - - -[临时表] - --这边列出来的临时表就会在运行期动态创建 - -[临时变量] - --所有中间过程变量均可在此处定义 - -[业务过程] - - ########################################## - # 1、输入输出检查 # - ########################################## - - - ########################################## - # 2、主过程前处理 # - ########################################## - - - ########################################## - # 3、业务主过程 # - ########################################## - - IF 输入.flag = "1" - PAGEQUERY - SELECT - stor.stor_name, - da.sect_date, - da.pcsn, - mater.material_id, - mater.material_code, - mater.material_name, - da.start_num, - da.in_num, - da.out_num, - da.end_num, - da.more_num, - da.less_num, - sub.sap_pcsn, - sub.package_box_sn - FROM( - SELECT - sum(start_num) AS start_num, - sum(in_num ) AS in_num, - sum(out_num ) AS out_num, - sum(end_num) AS end_num, - sum(more_num) AS more_num, - sum(less_num) AS less_num, - max( material_id ) AS material_id, - max(stor_id) AS stor_id, - sect_date, - pcsn - FROM - ST_IVT_IOStorDaily a - GROUP BY - a.pcsn, - a.sect_date - ) AS da - LEFT JOIN MD_ME_MaterialBase mater ON da.material_id = mater.material_id - LEFT JOIN st_ivt_bsrealstorattr stor ON stor.stor_id = da.stor_id - LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = da.pcsn - WHERE 1=1 - and stor.stor_id in 输入.in_stor_id - - OPTION 输入.stor_id <> "" - stor.stor_id = 输入.stor_id - ENDOPTION - - OPTION 输入.begin_time <> "" - da.sect_date >= 输入.begin_time - ENDOPTION - - OPTION 输入.end_time <> "" - da.sect_date <= 输入.end_time - ENDOPTION - - OPTION 输入.material_code <> "" - (mater.material_code like 输入.material_code or - mater.material_name like 输入.material_code) - ENDOPTION - - OPTION 输入.pcsn <> "" - da.pcsn like 输入.pcsn - ENDOPTION - - OPTION 输入.sap_pcsn <> "" - sub.sap_pcsn like 输入.sap_pcsn - ENDOPTION - - OPTION 输入.package_box_sn <> "" - sub.package_box_sn like 输入.package_box_sn - ENDOPTION - - ENDSELECT - ENDPAGEQUERY - ENDIF - - IF 输入.flag = "11" - QUERY - SELECT - sum(outq.start_num) AS start_num, - sum(outq.in_num) AS in_num, - sum(outq.out_num) AS out_num, - sum(outq.end_num) AS end_num - FROM - ( - SELECT - stor.stor_name, - da.sect_date, - da.is_active, - da.ivt_level, - da.pcsn, - da.quality_scode, - class.class_name, - class.class_code, - mater.material_id, - mater.material_code, - mater.material_name, - mater.material_model, - unit.unit_name, - da.start_num, - da.in_num, - da.out_num, - da.end_num, - da.more_num, - da.less_num - FROM( - SELECT - sum(start_num) AS start_num, - sum(in_num ) AS in_num, - sum(out_num ) AS out_num, - sum(end_num) AS end_num, - sum(more_num) AS more_num, - sum(less_num) AS less_num, - max(material_id) AS material_id, - max(stor_id) AS stor_id, - max(sect_date) AS sect_date, - max(quality_scode) AS quality_scode, - max(pcsn) AS pcsn, - max(ivt_level) AS ivt_level, - max(is_active) AS is_active - FROM - ST_IVT_IOStorDaily a - GROUP BY - a.material_id, - a.quality_scode, - a.pcsn, - a.ivt_level, - a.is_active, - a.sect_date - ) AS da - LEFT JOIN MD_ME_MaterialBase mater ON da.material_id = mater.material_id - LEFT JOIN md_pb_classstandard class ON mater.material_type_id = class.class_id - LEFT JOIN md_pb_measureunit unit ON unit.measure_unit_id = mater.base_unit_id - LEFT JOIN st_ivt_bsrealstorattr stor ON stor.stor_id = da.stor_id - WHERE 1=1 - OPTION 输入.stor_id <> "" - stor.stor_id = 输入.stor_id - ENDOPTION - OPTION 输入.begin_time <> "" - da.sect_date >= 输入.begin_time - ENDOPTION - OPTION 输入.end_time <> "" - da.sect_date <= 输入.end_time - ENDOPTION - - OPTION 输入.material_code <> "" - (mater.material_code like 输入.material_code or - mater.material_name like 输入.material_code) - ENDOPTION - OPTION 输入.pcsn <> "" - (da.pcsn like 输入.pcsn or - da.pcsn like 输入.pcsn) - ENDOPTION - OPTION 输入.classIds <> "" - class.class_id in 输入.classIds - ENDOPTION - ) outq - where 1=1 - ENDSELECT - ENDQUERY - ENDIF - - IF 输入.flag = "2" - QUERY - SELECT - t.stor_name AS label, - t.stor_id AS value - FROM - st_ivt_bsrealstorattr t - WHERE - t.is_delete = '0' - AND t.is_used = '1' - - ENDSELECT - ENDQUERY - ENDIF - - IF 输入.flag = "3" - QUERY - SELECT - sum(work.ok_qty) AS ok_qty, - dept.name AS dept_name - FROM - PDM_BI_WorkOrder work - INNER JOIN md_me_materialbase mater ON mater.material_id = work.material_id - INNER JOIN sys_dept dept ON dept.dept_id = work.org_id - WHERE - work.is_delete = '0' - - OPTION 输入.material_code <> "" - mater.material_code = 输入.material_code - ENDOPTION - - group by work.org_id - - ENDSELECT - ENDQUERY - ENDIF diff --git a/lms/nladmin-ui/src/views/wms/basedata/master/supp/index.vue b/lms/nladmin-ui/src/views/wms/basedata/master/supp/index.vue deleted file mode 100644 index d01b6b7..0000000 --- a/lms/nladmin-ui/src/views/wms/basedata/master/supp/index.vue +++ /dev/null @@ -1,344 +0,0 @@ - - - - - diff --git a/lms/nladmin-ui/src/views/wms/basedata/master/supp/supplierbase.js b/lms/nladmin-ui/src/views/wms/basedata/master/supp/supplierbase.js deleted file mode 100644 index d04cf8b..0000000 --- a/lms/nladmin-ui/src/views/wms/basedata/master/supp/supplierbase.js +++ /dev/null @@ -1,27 +0,0 @@ -import request from '@/utils/request' - -export function add(data) { - return request({ - url: 'api/supplierbase', - method: 'post', - data - }) -} - -export function del(ids) { - return request({ - url: 'api/supplierbase/', - method: 'delete', - data: ids - }) -} - -export function edit(data) { - return request({ - url: 'api/supplierbase', - method: 'put', - data - }) -} - -export default { add, edit, del } diff --git a/lms/nladmin-ui/src/views/wms/mps/device/device.js b/lms/nladmin-ui/src/views/wms/mps/device/device.js deleted file mode 100644 index b901755..0000000 --- a/lms/nladmin-ui/src/views/wms/mps/device/device.js +++ /dev/null @@ -1,74 +0,0 @@ -import request from '@/utils/request' - -export function add(data) { - return request({ - url: 'api/device', - method: 'post', - data - }) -} - -export function del(ids) { - return request({ - url: 'api/device/', - method: 'delete', - data: ids - }) -} - -export function edit(data) { - return request({ - url: 'api/device', - method: 'put', - data - }) -} - -export function getWorkprocedure() { - return request({ - url: 'api/device/getWorkprocedure', - method: 'get' - }) -} - -export function getItemByDevice(data) { - return request({ - url: 'api/device/getItemByDevice', - method: 'post', - data - }) -} - -export function savaDeviceItem(data) { - return request({ - url: 'api/device/savaDeviceItem', - method: 'post', - data - }) -} - -export function getItemByDeviceId(data) { - return request({ - url: 'api/device/getItemByDeviceId', - method: 'post', - data - }) -} - -export function copyAdd(data) { - return request({ - url: 'api/device/copyAdd', - method: 'post', - data - }) -} - -export function changeActive(data) { - return request({ - url: 'api/device/changeActive', - method: 'put', - data - }) -} - -export default { add, edit, del, getWorkprocedure, getItemByDeviceId, copyAdd, changeActive } diff --git a/lms/nladmin-ui/src/views/wms/mps/device/index.vue b/lms/nladmin-ui/src/views/wms/mps/device/index.vue deleted file mode 100644 index bd3e6a5..0000000 --- a/lms/nladmin-ui/src/views/wms/mps/device/index.vue +++ /dev/null @@ -1,151 +0,0 @@ - - - - - diff --git a/lms/nladmin-ui/src/views/wms/mps/item/deviceitem.js b/lms/nladmin-ui/src/views/wms/mps/item/deviceitem.js deleted file mode 100644 index 287219b..0000000 --- a/lms/nladmin-ui/src/views/wms/mps/item/deviceitem.js +++ /dev/null @@ -1,27 +0,0 @@ -import request from '@/utils/request' - -export function add(data) { - return request({ - url: 'api/deviceitem', - method: 'post', - data - }) -} - -export function del(ids) { - return request({ - url: 'api/deviceitem/', - method: 'delete', - data: ids - }) -} - -export function edit(data) { - return request({ - url: 'api/deviceitem', - method: 'put', - data - }) -} - -export default { add, edit, del } diff --git a/lms/nladmin-ui/src/views/wms/mps/item/index.vue b/lms/nladmin-ui/src/views/wms/mps/item/index.vue deleted file mode 100644 index 312d2f0..0000000 --- a/lms/nladmin-ui/src/views/wms/mps/item/index.vue +++ /dev/null @@ -1,162 +0,0 @@ - - - - - diff --git a/lms/nladmin-ui/src/views/wms/mps/personcorrdevice/DevicesDialog.vue b/lms/nladmin-ui/src/views/wms/mps/personcorrdevice/DevicesDialog.vue deleted file mode 100644 index 7a6ebf4..0000000 --- a/lms/nladmin-ui/src/views/wms/mps/personcorrdevice/DevicesDialog.vue +++ /dev/null @@ -1,144 +0,0 @@ - - - - - diff --git a/lms/nladmin-ui/src/views/wms/mps/personcorrdevice/SelectDeviceDialog.vue b/lms/nladmin-ui/src/views/wms/mps/personcorrdevice/SelectDeviceDialog.vue deleted file mode 100644 index 464acc7..0000000 --- a/lms/nladmin-ui/src/views/wms/mps/personcorrdevice/SelectDeviceDialog.vue +++ /dev/null @@ -1,187 +0,0 @@ - - - - - diff --git a/lms/nladmin-ui/src/views/wms/mps/personcorrdevice/SelectPeersonDialog.vue b/lms/nladmin-ui/src/views/wms/mps/personcorrdevice/SelectPeersonDialog.vue deleted file mode 100644 index 30230e9..0000000 --- a/lms/nladmin-ui/src/views/wms/mps/personcorrdevice/SelectPeersonDialog.vue +++ /dev/null @@ -1,153 +0,0 @@ - - - - - diff --git a/lms/nladmin-ui/src/views/wms/mps/personcorrdevice/index.vue b/lms/nladmin-ui/src/views/wms/mps/personcorrdevice/index.vue deleted file mode 100644 index f30f608..0000000 --- a/lms/nladmin-ui/src/views/wms/mps/personcorrdevice/index.vue +++ /dev/null @@ -1,135 +0,0 @@ - - - - - diff --git a/lms/nladmin-ui/src/views/wms/mps/personcorrdevice/personcorrdevice.js b/lms/nladmin-ui/src/views/wms/mps/personcorrdevice/personcorrdevice.js deleted file mode 100644 index b6af730..0000000 --- a/lms/nladmin-ui/src/views/wms/mps/personcorrdevice/personcorrdevice.js +++ /dev/null @@ -1,67 +0,0 @@ -import request from '@/utils/request' - -export function add(data) { - return request({ - url: 'api/personcorrdevice', - method: 'post', - data - }) -} - -export function del(ids) { - return request({ - url: 'api/personcorrdevice/', - method: 'delete', - data: ids - }) -} - -export function edit(data) { - return request({ - url: 'api/personcorrdevice', - method: 'put', - data - }) -} - -export function addPersons(data) { - return request({ - url: 'api/personcorrdevice/addPersons', - method: 'post', - data - }) -} - -export function getHeader(data) { - return request({ - url: 'api/personcorrdevice/getHeader', - method: 'post', - data - }) -} - -export function getDeviceIdByUserId(data) { - return request({ - url: 'api/personcorrdevice/getDeviceIdByUserId', - method: 'post', - data - }) -} - -export function addDevices(data) { - return request({ - url: 'api/personcorrdevice/addDevices', - method: 'post', - data - }) -} - -export function deleteRow(data) { - return request({ - url: 'api/personcorrdevice/deleteRow', - method: 'delete', - data - }) -} - -export default { add, edit, del, addPersons, getHeader, getDeviceIdByUserId, deleteRow, addDevices } diff --git a/lms/nladmin-ui/src/views/wms/mps/teamcorrperson/PersonDialog.vue b/lms/nladmin-ui/src/views/wms/mps/teamcorrperson/PersonDialog.vue deleted file mode 100644 index 47f77ea..0000000 --- a/lms/nladmin-ui/src/views/wms/mps/teamcorrperson/PersonDialog.vue +++ /dev/null @@ -1,111 +0,0 @@ - - - - - diff --git a/lms/nladmin-ui/src/views/wms/mps/teamcorrperson/SelectPeersonDialog.vue b/lms/nladmin-ui/src/views/wms/mps/teamcorrperson/SelectPeersonDialog.vue deleted file mode 100644 index 27381f9..0000000 --- a/lms/nladmin-ui/src/views/wms/mps/teamcorrperson/SelectPeersonDialog.vue +++ /dev/null @@ -1,151 +0,0 @@ - - - - - diff --git a/lms/nladmin-ui/src/views/wms/mps/teamcorrperson/index.vue b/lms/nladmin-ui/src/views/wms/mps/teamcorrperson/index.vue deleted file mode 100644 index 8462813..0000000 --- a/lms/nladmin-ui/src/views/wms/mps/teamcorrperson/index.vue +++ /dev/null @@ -1,208 +0,0 @@ - - - - - diff --git a/lms/nladmin-ui/src/views/wms/mps/teamcorrperson/teamcorrperson.js b/lms/nladmin-ui/src/views/wms/mps/teamcorrperson/teamcorrperson.js deleted file mode 100644 index 87dc011..0000000 --- a/lms/nladmin-ui/src/views/wms/mps/teamcorrperson/teamcorrperson.js +++ /dev/null @@ -1,43 +0,0 @@ -import request from '@/utils/request' - -export function add(data) { - return request({ - url: 'api/teamcorrperson', - method: 'post', - data - }) -} - -export function del(ids) { - return request({ - url: 'api/teamcorrperson/', - method: 'delete', - data: ids - }) -} - -export function edit(data) { - return request({ - url: 'api/teamcorrperson', - method: 'put', - data - }) -} - -export function getPersonIdByTeamId(data) { - return request({ - url: 'api/teamcorrperson/getPersonIdByTeamId', - method: 'post', - data - }) -} - -export function addPersons(data) { - return request({ - url: 'api/teamcorrperson/addPersons', - method: 'post', - data - }) -} - -export default { add, edit, del, getPersonIdByTeamId, addPersons } diff --git a/lms/nladmin-ui/src/views/wms/mps/teamcorrperson/workteam.js b/lms/nladmin-ui/src/views/wms/mps/teamcorrperson/workteam.js deleted file mode 100644 index 824f160..0000000 --- a/lms/nladmin-ui/src/views/wms/mps/teamcorrperson/workteam.js +++ /dev/null @@ -1,42 +0,0 @@ -import request from '@/utils/request' - -export function add(data) { - return request({ - url: 'api/workteam', - method: 'post', - data - }) -} - -export function del(ids) { - return request({ - url: 'api/workteam/', - method: 'delete', - data: ids - }) -} - -export function edit(data) { - return request({ - url: 'api/workteam', - method: 'put', - data - }) -} - -export function getClasssystem() { - return request({ - url: 'api/workteam/getClasssystem', - method: 'get' - }) -} - -export function changeActive(data) { - return request({ - url: 'api/workteam/changeActive', - method: 'put', - data - }) -} - -export default { add, edit, del, getClasssystem, changeActive } diff --git a/lms/nladmin-ui/src/views/wms/pub/DeviceDialog.vue b/lms/nladmin-ui/src/views/wms/pub/DeviceDialog.vue deleted file mode 100644 index 2c81c40..0000000 --- a/lms/nladmin-ui/src/views/wms/pub/DeviceDialog.vue +++ /dev/null @@ -1,175 +0,0 @@ - - - - - diff --git a/lms/nladmin-ui/src/views/wms/st/incharge/incharge.js b/lms/nladmin-ui/src/views/wms/st/incharge/incharge.js index 179218c..481deb1 100644 --- a/lms/nladmin-ui/src/views/wms/st/incharge/incharge.js +++ b/lms/nladmin-ui/src/views/wms/st/incharge/incharge.js @@ -1,29 +1,5 @@ import request from '@/utils/request' -export function add(data) { - return request({ - url: 'api/incharge', - method: 'post', - data - }) -} - -export function del(ids) { - return request({ - url: 'api/incharge/', - method: 'delete', - data: ids - }) -} - -export function edit(data) { - return request({ - url: 'api/incharge', - method: 'put', - data - }) -} - export function charge(data) { return request({ url: 'api/incharge/charge', @@ -32,4 +8,4 @@ export function charge(data) { }) } -export default { add, edit, del, charge } +export default { charge } diff --git a/lms/nladmin-ui/src/views/wms/st/incharge/index.vue b/lms/nladmin-ui/src/views/wms/st/incharge/index.vue index e1e969a..63b0233 100644 --- a/lms/nladmin-ui/src/views/wms/st/incharge/index.vue +++ b/lms/nladmin-ui/src/views/wms/st/incharge/index.vue @@ -165,24 +165,20 @@ import CRUD, { crud, header, presenter } from '@crud/crud' import rrOperation from '@crud/RR.operation' import crudOperation from '@crud/CRUD.operation' -import udOperation from '@crud/UD.operation' import pagination from '@crud/Pagination' -import DateRangePicker from '@/components/DateRangePicker/index' import crudInchargefrom from '@/views/wms/st/incharge/incharge' -import crudStorattr from '@/views/wms/basedata/st/stor/storattr' import ViewDialog from '@/views/wms/st/outbill/ViewDialog' import crudUserStor from '@/views/wms/basedata/st/userStor/userStor' export default { name: 'Incharge', - components: { crudOperation, rrOperation, udOperation, pagination, DateRangePicker, ViewDialog }, + components: { crudOperation, rrOperation, pagination, ViewDialog }, cruds() { return CRUD({ title: '入库冲销', url: 'api/incharge', idField: 'id', sort: 'id,desc', - crudMethod: { ...crudInchargefrom }, optShow: { add: false, edit: false, @@ -247,6 +243,9 @@ export default { this.mstrow = row this.viewShow = true }, + querytable() { + this.crud.toQuery() + }, charge() { const _selectData = this.$refs.table.selection crudInchargefrom.charge(_selectData[0]).then(res => { diff --git a/lms/nladmin-ui/src/views/wms/st/outcharge/index.vue b/lms/nladmin-ui/src/views/wms/st/outcharge/index.vue index 5a74695..2a2cbfc 100644 --- a/lms/nladmin-ui/src/views/wms/st/outcharge/index.vue +++ b/lms/nladmin-ui/src/views/wms/st/outcharge/index.vue @@ -129,9 +129,6 @@ style="width: 100%;" highlight-current-row @selection-change="crud.selectionChangeHandler" - @current-change="handleCurrentChange" - @select="handleSelectionChange" - @select-all="onSelectAll" > @@ -167,24 +164,20 @@ import CRUD, { crud, header, presenter } from '@crud/crud' import rrOperation from '@crud/RR.operation' import crudOperation from '@crud/CRUD.operation' -import udOperation from '@crud/UD.operation' import pagination from '@crud/Pagination' -import DateRangePicker from '@/components/DateRangePicker/index' import crudOutchargefrom from '@/views/wms/st/outcharge/outcharge' -import crudStorattr from '@/views/wms/basedata/st/stor/storattr' import ViewDialog from '@/views/wms/st/outbill/ViewDialog' import crudUserStor from '@/views/wms/basedata/st/userStor/userStor' export default { name: 'Outcharge', - components: { crudOperation, rrOperation, udOperation, pagination, DateRangePicker, ViewDialog }, + components: { crudOperation, rrOperation, pagination, ViewDialog }, cruds() { return CRUD({ title: '出库冲销', url: 'api/outcharge', idField: 'iostorinv_id', sort: 'iostorinv_id,desc', - crudMethod: { ...crudOutchargefrom }, optShow: { add: false, edit: false, @@ -262,30 +255,8 @@ export default { bill_typeFormat(row, column) { return this.dict.label.ST_INV_OUT_TYPE[row.bill_type] }, - handleCurrentChange(currentRow) { - if (currentRow === null) { - this.currentRow = {} - } - }, - handleSelectionChange(val, row) { - if (val.length > 1) { - this.$refs.table.clearSelection() - this.$refs.table.toggleRowSelection(val.pop()) - this.buttonChange(row) - } else if (val.length === 1) { - this.buttonChange(row) - } else { - this.handleCurrentChange(null) - } - }, - onSelectAll() { - this.$refs.table.clearSelection() - this.handleCurrentChange(null) - }, - buttonChange(currentRow) { - if (currentRow !== null) { - this.currentRow = currentRow - } + querytable() { + this.crud.toQuery() }, charge() { debugger diff --git a/lms/nladmin-ui/src/views/wms/st/vehiclebill/PointDialog.vue b/lms/nladmin-ui/src/views/wms/st/vehiclebill/PointDialog.vue deleted file mode 100644 index 88013d4..0000000 --- a/lms/nladmin-ui/src/views/wms/st/vehiclebill/PointDialog.vue +++ /dev/null @@ -1,202 +0,0 @@ - - - - - diff --git a/lms/nladmin-ui/src/views/wms/st/vehiclebill/in/index.vue b/lms/nladmin-ui/src/views/wms/st/vehiclebill/in/index.vue deleted file mode 100644 index 04db461..0000000 --- a/lms/nladmin-ui/src/views/wms/st/vehiclebill/in/index.vue +++ /dev/null @@ -1,217 +0,0 @@ - - - - - diff --git a/lms/nladmin-ui/src/views/wms/st/vehiclebill/in/inemptyvehicl.js b/lms/nladmin-ui/src/views/wms/st/vehiclebill/in/inemptyvehicl.js deleted file mode 100644 index 9ab5257..0000000 --- a/lms/nladmin-ui/src/views/wms/st/vehiclebill/in/inemptyvehicl.js +++ /dev/null @@ -1,35 +0,0 @@ -import request from '@/utils/request' - -export function add(data) { - return request({ - url: 'api/inemptyvehicle', - method: 'post', - data - }) -} - -export function del(ids) { - return request({ - url: 'api/inemptyvehicle/', - method: 'delete', - data: ids - }) -} - -export function edit(data) { - return request({ - url: 'api/inemptyvehicle', - method: 'put', - data - }) -} - -export function createTask(data) { - return request({ - url: 'api/inemptyvehicle/createTask', - method: 'post', - data - }) -} - -export default { add, edit, del, createTask } diff --git a/lms/nladmin-ui/src/views/wms/st/vehiclebill/out/index.vue b/lms/nladmin-ui/src/views/wms/st/vehiclebill/out/index.vue deleted file mode 100644 index 8fe6d69..0000000 --- a/lms/nladmin-ui/src/views/wms/st/vehiclebill/out/index.vue +++ /dev/null @@ -1,217 +0,0 @@ - - - - - diff --git a/lms/nladmin-ui/src/views/wms/st/vehiclebill/out/outemptyvehicl.js b/lms/nladmin-ui/src/views/wms/st/vehiclebill/out/outemptyvehicl.js deleted file mode 100644 index 6143dde..0000000 --- a/lms/nladmin-ui/src/views/wms/st/vehiclebill/out/outemptyvehicl.js +++ /dev/null @@ -1,35 +0,0 @@ -import request from '@/utils/request' - -export function add(data) { - return request({ - url: 'api/outemptyvehicle', - method: 'post', - data - }) -} - -export function del(ids) { - return request({ - url: 'api/outemptyvehicle/', - method: 'delete', - data: ids - }) -} - -export function edit(data) { - return request({ - url: 'api/outemptyvehicle', - method: 'put', - data - }) -} - -export function createTask(data) { - return request({ - url: 'api/outemptyvehicle/createTask', - method: 'post', - data - }) -} - -export default { add, edit, del, createTask } diff --git a/lms/nladmin-ui/src/views/wms/statistics/sendReceiveQuery/index.vue b/lms/nladmin-ui/src/views/wms/statistics/sendReceiveQuery/index.vue deleted file mode 100644 index 381deb5..0000000 --- a/lms/nladmin-ui/src/views/wms/statistics/sendReceiveQuery/index.vue +++ /dev/null @@ -1,319 +0,0 @@ - - - - - diff --git a/lms/nladmin-ui/src/views/wms/statistics/sendReceiveQuery/iostordaily.js b/lms/nladmin-ui/src/views/wms/statistics/sendReceiveQuery/iostordaily.js deleted file mode 100644 index 9a0a599..0000000 --- a/lms/nladmin-ui/src/views/wms/statistics/sendReceiveQuery/iostordaily.js +++ /dev/null @@ -1,34 +0,0 @@ -import request from '@/utils/request' - -export function add(data) { - return request({ - url: 'api/iostordaily', - method: 'post', - data - }) -} - -export function del(ids) { - return request({ - url: 'api/iostordaily/', - method: 'delete', - data: ids - }) -} - -export function edit(data) { - return request({ - url: 'api/iostordaily', - method: 'put', - data - }) -} - -export function getStor() { - return request({ - url: 'api/iostordaily/getStor', - method: 'get' - }) -} - -export default { add, edit, del, getStor }