diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/logging/aspect/LogAspect.java b/lms/nladmin-system/src/main/java/org/nl/modules/logging/aspect/LogAspect.java index 24e8e05..bd0965a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/modules/logging/aspect/LogAspect.java +++ b/lms/nladmin-system/src/main/java/org/nl/modules/logging/aspect/LogAspect.java @@ -34,8 +34,11 @@ import org.nl.modules.logging.service.LogService; import org.springframework.stereotype.Component; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.lang.reflect.Method; import java.lang.reflect.Parameter; import java.util.ArrayList; @@ -75,11 +78,19 @@ public class LogAspect { */ @Around("logPointcut()") public Object logAround(ProceedingJoinPoint joinPoint) throws Throwable { + ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); + HttpServletRequest request = attributes.getRequest(); + HttpServletResponse response = attributes.getResponse(); +// HttpServletRequest request = RequestHolder.getHttpServletRequest(); + + MethodSignature signature = (MethodSignature) joinPoint.getSignature(); Method method = signature.getMethod(); // 方法路径 String methodName = joinPoint.getTarget().getClass().getName() + "." + signature.getName() + "()"; String params=getParameter(method, joinPoint.getArgs()); + + log.info("请求uri:{}", request.getRequestURI()); log.info("请求方法:{}",methodName); log.info("请求方法参数:{}",params); @@ -88,7 +99,7 @@ public class LogAspect { result = joinPoint.proceed(); Log log = new Log("INFO",System.currentTimeMillis() - currentTime.get()); currentTime.remove(); - HttpServletRequest request = RequestHolder.getHttpServletRequest(); + logService.save(getUsername(), StringUtils.getBrowser(request), StringUtils.getIp(request),joinPoint, log); return result; } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_BASE_POINT.wql b/lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_BASE_POINT.wql similarity index 100% rename from lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_BASE_POINT.wql rename to lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_BASE_POINT.wql diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_REGION_01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_REGION_01.wql similarity index 100% rename from lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_REGION_01.wql rename to lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_REGION_01.wql diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_TASK_01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_TASK_01.wql similarity index 100% rename from lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_TASK_01.wql rename to lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_TASK_01.wql diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/SCH_Point_01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/SCH_Point_01.wql similarity index 100% rename from lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/SCH_Point_01.wql rename to lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/SCH_Point_01.wql diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/sch.xls b/lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/sch.xls similarity index 79% rename from lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/sch.xls rename to lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/sch.xls index edfcd26..dcc3cd9 100644 Binary files a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/sch.xls and b/lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/sch.xls differ diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/rest/InEmptyvehiclerecordController.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/rest/InEmptyvehiclerecordController.java deleted file mode 100644 index 46f652e..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/rest/InEmptyvehiclerecordController.java +++ /dev/null @@ -1,77 +0,0 @@ - -package org.nl.wms.st.vehiclebill.rest; - - -import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.modules.logging.annotation.Log; -import org.nl.wms.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 -@Api(tags = "空载具入库管理") -@RequestMapping("/api/inemptyvehicle") -@Slf4j -public class InEmptyvehiclerecordController { - - private final InEmptyvehiclerecordService inEmptyvehiclerecordService; - - @GetMapping - @Log("查询空载具入库") - @ApiOperation("查询空载具入库") - //@SaCheckPermission("emptyvehiclerecord:list") - public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { - return new ResponseEntity<>(inEmptyvehiclerecordService.queryAll(whereJson, page), HttpStatus.OK); - } - - @PostMapping - @Log("新增空载具入库") - @ApiOperation("新增空载具入库") - //@SaCheckPermission("emptyvehiclerecord:add") - public ResponseEntity create(@Validated @RequestBody EmptyvehiclerecordDto dto) { - inEmptyvehiclerecordService.create(dto); - return new ResponseEntity<>(HttpStatus.CREATED); - } - - @PutMapping - @Log("修改空载具入库") - @ApiOperation("修改空载具入库") - //@SaCheckPermission("emptyvehiclerecord:edit") - public ResponseEntity update(@Validated @RequestBody EmptyvehiclerecordDto dto) { - inEmptyvehiclerecordService.update(dto); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } - - @Log("删除空载具入库") - @ApiOperation("删除空载具入库") - //@SaCheckPermission("emptyvehiclerecord:del") - @DeleteMapping - public ResponseEntity delete(@RequestBody Long[] ids) { - inEmptyvehiclerecordService.deleteAll(ids); - return new ResponseEntity<>(HttpStatus.OK); - } - - @Log("生成任务") - @ApiOperation("生成任务") - @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 a3a9a5d..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/rest/OutEmptyvehiclerecordController.java +++ /dev/null @@ -1,77 +0,0 @@ - -package org.nl.wms.st.vehiclebill.rest; - - -import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.modules.logging.annotation.Log; -import org.nl.wms.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 -@Api(tags = "空载具出库管理") -@RequestMapping("/api/outemptyvehicle") -@Slf4j -public class OutEmptyvehiclerecordController { - - private final OutEmptyvehiclerecordService outEmptyvehiclerecordService; - - @GetMapping - @Log("查询空载具出库") - @ApiOperation("查询空载具出库") - //@SaCheckPermission("emptyvehiclerecord:list") - public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { - return new ResponseEntity<>(outEmptyvehiclerecordService.queryAll(whereJson, page), HttpStatus.OK); - } - - @PostMapping - @Log("新增空载具出库") - @ApiOperation("新增空载具出库") - //@SaCheckPermission("emptyvehiclerecord:add") - public ResponseEntity create(@Validated @RequestBody EmptyvehiclerecordDto dto) { - outEmptyvehiclerecordService.create(dto); - return new ResponseEntity<>(HttpStatus.CREATED); - } - - @PutMapping - @Log("修改空载具出库") - @ApiOperation("修改空载具出库") - //@SaCheckPermission("emptyvehiclerecord:edit") - public ResponseEntity update(@Validated @RequestBody EmptyvehiclerecordDto dto) { - outEmptyvehiclerecordService.update(dto); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } - - @Log("删除空载具出库") - @ApiOperation("删除空载具出库") - //@SaCheckPermission("emptyvehiclerecord:del") - @DeleteMapping - public ResponseEntity delete(@RequestBody Long[] ids) { - outEmptyvehiclerecordService.deleteAll(ids); - return new ResponseEntity<>(HttpStatus.OK); - } - - @Log("生成任务") - @ApiOperation("生成任务") - @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 fc1bc34..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/InEmptyvehiclerecordService.java +++ /dev/null @@ -1,79 +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 d1365c8..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/OutEmptyvehiclerecordService.java +++ /dev/null @@ -1,79 +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 1b68853..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/dto/EmptyvehiclerecordDto.java +++ /dev/null @@ -1,110 +0,0 @@ -package org.nl.wms.st.vehiclebill.service.dto; - -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - -/** - * @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 Long create_id; - - /** - * 创建人姓名 - */ - private String create_name; - - /** - * 创建时间 - */ - private String create_time; - - /** - * 修改人 - */ - private Long update_optid; - - /** - * 修改人姓名 - */ - private String update_optname; - - /** - * 修改时间 - */ - private String update_time; - - /** - * 是否删除 - */ - private String is_delete; -} 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 2183f3f..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/impl/InEmptyvehiclerecordServiceImpl.java +++ /dev/null @@ -1,211 +0,0 @@ - -package org.nl.wms.st.vehiclebill.service.impl; - - -import cn.hutool.core.map.MapUtil; -import com.alibaba.fastjson.JSON; -import lombok.RequiredArgsConstructor; - -import org.nl.modules.common.exception.BadRequestException; -import org.nl.modules.common.utils.SecurityUtils; -import org.nl.modules.system.util.CodeUtil; - -import org.nl.modules.wql.WQL; -import org.nl.modules.wql.core.bean.WQLObject; -import org.nl.modules.wql.util.SpringContextHolder; -import org.nl.modules.wql.util.WqlUtil; -import org.nl.wms.sch.service.PointService; -import org.nl.wms.sch.tasks.SendEmpVehicleTask; -import org.nl.wms.st.vehiclebill.service.InEmptyvehiclerecordService; -import org.nl.wms.st.vehiclebill.service.dto.EmptyvehiclerecordDto; - -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import org.springframework.data.domain.Pageable; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.IdUtil; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; - - - - -import lombok.extern.slf4j.Slf4j; -import cn.hutool.core.util.ObjectUtil; - -/** - * @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 pointTab = WQLObject.getWQLObject("sch_base_point"); - - Long 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 = pointTab.query("point_code = '" + start_point_code + "'").uniqueResult(0).getLongValue("region_id"); - if (ObjectUtil.isNotEmpty(next_point_code)) { - Long end_region_id = pointTab.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 pointTab = 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 = pointTab.query("point_code = '" + start_point_code + "'").uniqueResult(0).getLongValue("region_id"); - if (ObjectUtil.isNotEmpty(next_point_code)) { - Long end_region_id = pointTab.query("point_code = '" + next_point_code + "'").uniqueResult(0).getLongValue("region_id"); - dto.setEnd_region_id(end_region_id); - } - - Long 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) { - Long 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 taskTab = 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 = taskTab.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 192f11f..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/impl/OutEmptyvehiclerecordServiceImpl.java +++ /dev/null @@ -1,206 +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.modules.common.exception.BadRequestException; -import org.nl.modules.common.utils.SecurityUtils; -import org.nl.modules.system.util.CodeUtil; - - -import org.nl.modules.wql.WQL; -import org.nl.modules.wql.core.bean.WQLObject; -import org.nl.modules.wql.util.SpringContextHolder; -import org.nl.modules.wql.util.WqlUtil; -import org.nl.wms.sch.service.PointService; -import org.nl.wms.sch.tasks.CallEmpVehicleTask; -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 pointTab = WQLObject.getWQLObject("sch_base_point"); - - Long 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 = pointTab.query("point_code = '" + next_point_code + "'").uniqueResult(0).getLongValue("region_id"); - if (ObjectUtil.isNotEmpty(start_point_code)) { - Long start_region_id = pointTab.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 pointTab = 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 = pointTab.query("point_code = '" + next_point_code + "'").uniqueResult(0).getLongValue("region_id"); - if (ObjectUtil.isNotEmpty(start_point_code)) { - Long start_region_id = pointTab.query("point_code = '" + start_point_code + "'").uniqueResult(0).getLongValue("region_id"); - dto.setStart_region_id(start_region_id); - } - - Long 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) { - Long 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 taskTab = 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 = taskTab.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 588827c..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/resources/config/application-dev.yml b/lms/nladmin-system/src/main/resources/config/application-dev.yml index fa0bde8..8d35511 100644 --- a/lms/nladmin-system/src/main/resources/config/application-dev.yml +++ b/lms/nladmin-system/src/main/resources/config/application-dev.yml @@ -6,7 +6,7 @@ spring: druid: db-type: com.alibaba.druid.pool.DruidDataSource driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy - url: jdbc:log4jdbc:mysql://${DB_HOST:47.111.78.178}:${DB_PORT:3306}/${DB_NAME:lzhl_one_lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true + url: jdbc:log4jdbc:mysql://${DB_HOST:47.111.78.178}:${DB_PORT:3306}/${DB_NAME:yongyu_lms2}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true # url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:nladmin}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true username: ${DB_USER:root} password: ${DB_PWD:P@ssw0rd} @@ -134,7 +134,7 @@ logging: # Sa-Token配置 sa-token: # token 名称 (同时也是cookie名称) - token-name: satoken + token-name: Authorization # token 有效期，单位s 默认30天, -1代表永不过期 timeout: 2592000 # token 临时有效期 (指定时间内无操作就视为token过期) 单位: 秒 @@ -149,7 +149,7 @@ sa-token: is-log: false jwt-secret-key: opsjajisdnnca0sdkksdfaaasdfwwq # token 前缀 -# token-prefix: Bearer + token-prefix: Bearer loki: url: http://localhost:3100/loki/api/v1 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 87f3f94..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 dc3c59b..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/out/index.vue b/lms/nladmin-ui/src/views/wms/st/vehiclebill/out/index.vue deleted file mode 100644 index 2db0cd5..0000000 --- a/lms/nladmin-ui/src/views/wms/st/vehiclebill/out/index.vue +++ /dev/null @@ -1,217 +0,0 @@ - - - - -