From 782061caa6edc1d9f24652eba4eba34205432795 Mon Sep 17 00:00:00 2001 From: ldj_willow Date: Mon, 17 Oct 2022 15:03:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/modules/logging/aspect/LogAspect.java | 13 +- .../sch/{service => }/wql/QSCH_BASE_POINT.wql | 0 .../sch/{service => }/wql/QSCH_REGION_01.wql | 0 .../sch/{service => }/wql/QSCH_TASK_01.wql | 0 .../sch/{service => }/wql/SCH_Point_01.wql | 0 .../org/nl/wms/sch/{service => }/wql/sch.xls | Bin 186368 -> 185344 bytes .../rest/InEmptyvehiclerecordController.java | 77 ------- .../rest/OutEmptyvehiclerecordController.java | 77 ------- .../service/InEmptyvehiclerecordService.java | 79 ------- .../service/OutEmptyvehiclerecordService.java | 79 ------- .../service/dto/EmptyvehiclerecordDto.java | 110 --------- .../impl/InEmptyvehiclerecordServiceImpl.java | 211 ----------------- .../OutEmptyvehiclerecordServiceImpl.java | 206 ----------------- .../st/vehiclebill/wql/ST_VEHICLE_IN_01.wql | 61 ----- .../st/vehiclebill/wql/ST_VEHICLE_IN_02.wql | 108 --------- .../st/vehiclebill/wql/ST_VEHICLE_OUT_01.wql | 61 ----- .../st/vehiclebill/wql/ST_VEHICLE_OUT_02.wql | 114 --------- .../main/resources/config/application-dev.yml | 6 +- .../views/wms/st/vehiclebill/PointDialog.vue | 202 ---------------- .../src/views/wms/st/vehiclebill/in/index.vue | 217 ------------------ .../views/wms/st/vehiclebill/out/index.vue | 217 ------------------ 21 files changed, 15 insertions(+), 1823 deletions(-) rename lms/nladmin-system/src/main/java/org/nl/wms/sch/{service => }/wql/QSCH_BASE_POINT.wql (100%) rename lms/nladmin-system/src/main/java/org/nl/wms/sch/{service => }/wql/QSCH_REGION_01.wql (100%) rename lms/nladmin-system/src/main/java/org/nl/wms/sch/{service => }/wql/QSCH_TASK_01.wql (100%) rename lms/nladmin-system/src/main/java/org/nl/wms/sch/{service => }/wql/SCH_Point_01.wql (100%) rename lms/nladmin-system/src/main/java/org/nl/wms/sch/{service => }/wql/sch.xls (79%) delete mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/rest/InEmptyvehiclerecordController.java delete mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/rest/OutEmptyvehiclerecordController.java delete mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/InEmptyvehiclerecordService.java delete mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/OutEmptyvehiclerecordService.java delete mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/dto/EmptyvehiclerecordDto.java delete mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/impl/InEmptyvehiclerecordServiceImpl.java delete mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/impl/OutEmptyvehiclerecordServiceImpl.java delete mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/wql/ST_VEHICLE_IN_01.wql delete mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/wql/ST_VEHICLE_IN_02.wql delete mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/wql/ST_VEHICLE_OUT_01.wql delete mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/wql/ST_VEHICLE_OUT_02.wql delete mode 100644 lms/nladmin-ui/src/views/wms/st/vehiclebill/PointDialog.vue delete mode 100644 lms/nladmin-ui/src/views/wms/st/vehiclebill/in/index.vue delete mode 100644 lms/nladmin-ui/src/views/wms/st/vehiclebill/out/index.vue 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 edfcd2678a465edda3697c73178e08b50ae28c66..dcc3cd99d81407868740f9d1f7cba108c02b72ff 100644 GIT binary patch delta 14741 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 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 @@ - - - - -