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

opt:对比菜单功能代码，删除不是本项目的功能代码

Browse Source
This commit is contained in:
zds
2024-10-12 14:37:23 +08:00
parent 36b109f23d
commit 54af1e05e7
50 changed files with 9 additions and 5571 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/dao/MdpbBoxtype.java
View File

@@ -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;

61
lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/SupplierbaseController.java
View File

@@ -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<Object> query(@RequestParam Map whereJson, Pageable page) {
return new ResponseEntity<>(supplierbaseService.queryAll(whereJson, page), HttpStatus.OK);
}
@PostMapping
@Log("新增供应商")
public ResponseEntity<Object> create(@Validated @RequestBody SupplierbaseDto dto) {
supplierbaseService.create(dto);
return new ResponseEntity<>(HttpStatus.CREATED);
}
@PutMapping
@Log("修改供应商")
public ResponseEntity<Object> update(@Validated @RequestBody SupplierbaseDto dto) {
supplierbaseService.update(dto);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@Log("删除供应商")
//@PreAuthorize("@el.check('mdCsSupplierbase:del')")
@DeleteMapping
public ResponseEntity<Object> delete(@RequestBody Long[] ids) {
supplierbaseService.deleteAll(ids);
return new ResponseEntity<>(HttpStatus.OK);
}
}

71
lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/SupplierbaseService.java
View File

@@ -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<String, Object>
*/
Map<String, Object> queryAll(Map whereJson, Pageable page);
/**
* 查询所有数据不分页
*
* @param whereJson 条件参数
* @return List<MdCsSupplierbaseDto>
*/
List<SupplierbaseDto> 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);
}

158
lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/SupplierbaseDto.java
View File

@@ -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;
}

165
lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/SupplierbaseServiceImpl.java
View File

@@ -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<String, Object> 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<SupplierbaseDto> queryAll(Map whereJson) {
WQLObject wo = WQLObject.getWQLObject("md_cs_supplierbase");
JSONArray arr = wo.query().getResultJSONArray(0);
List<SupplierbaseDto> 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);
}
}
}

31
lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/rest/InchargeController.java
View File

@@ -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<Object> query(@RequestParam Map whereJson, Pageable page) {
return new ResponseEntity<>(inchargeService.queryAll(whereJson, page), HttpStatus.OK);
}
@PostMapping
@Log("新增入库冲销")
//@PreAuthorize("@el.check('emptyvehiclerecord:add')")
public ResponseEntity<Object> create(@Validated @RequestBody EmptyvehiclerecordDto dto) {
inchargeService.create(dto);
return new ResponseEntity<>(HttpStatus.CREATED);
}
@PutMapping
@Log("修改入库冲销")
//@PreAuthorize("@el.check('emptyvehiclerecord:edit')")
public ResponseEntity<Object> update(@Validated @RequestBody EmptyvehiclerecordDto dto) {
inchargeService.update(dto);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@Log("删除入库冲销")
//@PreAuthorize("@el.check('emptyvehiclerecord:del')")
@DeleteMapping
public ResponseEntity<Object> delete(@RequestBody Long[] ids) {
inchargeService.deleteAll(ids);
return new ResponseEntity<>(HttpStatus.OK);
}
@PostMapping("/charge")
@Log("冲销")
public ResponseEntity<Object> charge(@RequestBody JSONObject whereJson) {
inchargeService.charge(whereJson);
return new ResponseEntity<>(HttpStatus.OK);

49
lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/InchargeService.java
View File

@@ -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<String, Object> queryAll(Map whereJson, Pageable page);
/**
* 查询所有数据不分页
*
* @param whereJson 条件参数
* @return List<EmptyvehiclerecordDto>
*/
List<EmptyvehiclerecordDto> 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);
/**
* 冲销
*

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

@@ -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<EmptyvehiclerecordDto> 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) {

74
lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/rest/InEmptyvehiclerecordController.java
View File

@@ -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<Object> query(@RequestParam Map whereJson, Pageable page) {
return new ResponseEntity<>(inEmptyvehiclerecordService.queryAll(whereJson, page), HttpStatus.OK);
}
@PostMapping
@Log("新增空载具入库")
//@PreAuthorize("@el.check('emptyvehiclerecord:add')")
public ResponseEntity<Object> create(@Validated @RequestBody EmptyvehiclerecordDto dto) {
inEmptyvehiclerecordService.create(dto);
return new ResponseEntity<>(HttpStatus.CREATED);
}
@PutMapping
@Log("修改空载具入库")
//@PreAuthorize("@el.check('emptyvehiclerecord:edit')")
public ResponseEntity<Object> update(@Validated @RequestBody EmptyvehiclerecordDto dto) {
inEmptyvehiclerecordService.update(dto);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@Log("删除空载具入库")
//@PreAuthorize("@el.check('emptyvehiclerecord:del')")
@DeleteMapping
public ResponseEntity<Object> delete(@RequestBody Long[] ids) {
inEmptyvehiclerecordService.deleteAll(ids);
return new ResponseEntity<>(HttpStatus.OK);
}
@Log("生成任务")
@PostMapping("/createTask")
public ResponseEntity<Object> createTask(@RequestBody JSONObject whereJson) {
inEmptyvehiclerecordService.createTask(whereJson);
return new ResponseEntity<>(HttpStatus.OK);
}
}

74
lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/rest/OutEmptyvehiclerecordController.java
View File

@@ -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<Object> query(@RequestParam Map whereJson, Pageable page) {
return new ResponseEntity<>(outEmptyvehiclerecordService.queryAll(whereJson, page), HttpStatus.OK);
}
@PostMapping
@Log("新增空载具出库")
//@PreAuthorize("@el.check('emptyvehiclerecord:add')")
public ResponseEntity<Object> create(@Validated @RequestBody EmptyvehiclerecordDto dto) {
outEmptyvehiclerecordService.create(dto);
return new ResponseEntity<>(HttpStatus.CREATED);
}
@PutMapping
@Log("修改空载具出库")
//@PreAuthorize("@el.check('emptyvehiclerecord:edit')")
public ResponseEntity<Object> update(@Validated @RequestBody EmptyvehiclerecordDto dto) {
outEmptyvehiclerecordService.update(dto);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@Log("删除空载具出库")
//@PreAuthorize("@el.check('emptyvehiclerecord:del')")
@DeleteMapping
public ResponseEntity<Object> delete(@RequestBody Long[] ids) {
outEmptyvehiclerecordService.deleteAll(ids);
return new ResponseEntity<>(HttpStatus.OK);
}
@Log("生成任务")
@PostMapping("/createTask")
public ResponseEntity<Object> createTask(@RequestBody JSONObject whereJson) {
outEmptyvehiclerecordService.createTask(whereJson);
return new ResponseEntity<>(HttpStatus.OK);
}
}

78
lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/InEmptyvehiclerecordService.java
View File

@@ -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<String, Object>
*/
Map<String, Object> queryAll(Map whereJson, Pageable page);
/**
* 查询所有数据不分页
*
* @param whereJson 条件参数
* @return List<EmptyvehiclerecordDto>
*/
List<EmptyvehiclerecordDto> 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);
}

78
lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/OutEmptyvehiclerecordService.java
View File

@@ -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<String, Object>
*/
Map<String, Object> queryAll(Map whereJson, Pageable page);
/**
* 查询所有数据不分页
*
* @param whereJson 条件参数
* @return List<EmptyvehiclerecordDto>
*/
List<EmptyvehiclerecordDto> 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);
}

109
lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/dto/EmptyvehiclerecordDto.java
View File

@@ -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;
}

210
lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/impl/InEmptyvehiclerecordServiceImpl.java
View File

@@ -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<String, Object> queryAll(Map whereJson, Pageable page) {
String bill_code = MapUtil.getStr(whereJson, "bill_code");
HashMap<String, String> 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<EmptyvehiclerecordDto> 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);
}
}

210
lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/impl/OutEmptyvehiclerecordServiceImpl.java
View File

@@ -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<String, Object> queryAll(Map whereJson, Pageable page) {
String bill_code = MapUtil.getStr(whereJson, "bill_code");
HashMap<String, String> 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<EmptyvehiclerecordDto> 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);
}
}

61
lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/wql/ST_VEHICLE_IN_01.wql
View File

@@ -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

108
lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/wql/ST_VEHICLE_IN_02.wql
View File

@@ -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

61
lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/wql/ST_VEHICLE_OUT_01.wql
View File

@@ -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

114
lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/wql/ST_VEHICLE_OUT_02.wql
View File

@@ -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

45
lms/nladmin-system/src/main/java/org/nl/wms/stat/rest/IostordailyController.java
View File

@@ -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<Object> query(@RequestParam Map whereJson, Pageable page) {
return new ResponseEntity<>(iostordailyService.queryAll(whereJson, page), HttpStatus.OK);
}
@GetMapping("/getStor")
@Log("查询仓库")
public ResponseEntity<Object> getStor() {
return new ResponseEntity<>(iostordailyService.getStor(), HttpStatus.OK);
}
}

28
lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/IostordailyService.java
View File

@@ -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<String, Object>
*/
Map<String, Object> queryAll(Map whereJson, Pageable page);
/**
* 查询仓库
*/
JSONArray getStor();
}

90
lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/IostordailyServiceImpl.java
View File

@@ -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<String, Object> 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<String, String> 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;
}
}

244
lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/SendReceiveQuery.wql
View File

@@ -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