diff --git a/pom.xml b/pom.xml index a31bac9fd..16358c72a 100644 --- a/pom.xml +++ b/pom.xml @@ -133,6 +133,13 @@ + + + p6spy + p6spy + 3.9.1 + + org.projectlombok diff --git a/src/main/java/com/glxp/api/controller/basic/BasicBusTypeChangeController.java b/src/main/java/com/glxp/api/controller/basic/BasicBusTypeChangeController.java index 3d3e3734a..2d1f804df 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicBusTypeChangeController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicBusTypeChangeController.java @@ -1,8 +1,26 @@ package com.glxp.api.controller.basic; +import com.github.pagehelper.PageInfo; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.entity.basic.BasicBusTypeChangeEntity; +import com.glxp.api.req.basic.FilterBusTypeChangeRequest; +import com.glxp.api.req.system.DeleteRequest; +import com.glxp.api.res.basic.BasicBusTypeChangeResponse; +import com.glxp.api.service.basic.IBasicBusTypeChangeService; import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; +import javax.annotation.Resource; +import javax.validation.Valid; +import java.util.Date; +import java.util.List; + /** * 单据转换设置接口 */ @@ -10,6 +28,79 @@ import org.springframework.web.bind.annotation.RestController; @RestController public class BasicBusTypeChangeController { + @Resource + private IBasicBusTypeChangeService basicBusTypeChangeService; + + /** + * 查询单据转换设置列表 + * + * @param basicBusTypeChangeRequest + * @param bindingResult + * @return + */ + @GetMapping("/basic/bustype/change/filter") + public BaseResponse filterJoinList(FilterBusTypeChangeRequest basicBusTypeChangeRequest, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List basicBusTypeChangeEntities; + basicBusTypeChangeEntities = basicBusTypeChangeService.filterList(basicBusTypeChangeRequest); + PageInfo pageInfo = new PageInfo<>(basicBusTypeChangeEntities); + return ResultVOUtils.page(pageInfo); + } + + /** + * 新增单据转换设置 + * + * @param basicBusTypeChangeEntity + * @param bindingResult + * @return + */ + @PostMapping("/basic/bustype/change/insert") + public BaseResponse insertBusType(@RequestBody @Valid BasicBusTypeChangeEntity basicBusTypeChangeEntity, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + basicBusTypeChangeEntity.setUpdateTime(new Date()); + basicBusTypeChangeService.insert(basicBusTypeChangeEntity); + return ResultVOUtils.success("更新成功"); + } + + /** + * 更新单据转换设置 + * + * @param basicBusTypeChangeEntity + * @param bindingResult + * @return + */ + @PostMapping("/basic/bustype/change/update") + public BaseResponse updateBusType(@RequestBody @Valid BasicBusTypeChangeEntity basicBusTypeChangeEntity, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + basicBusTypeChangeEntity.setUpdateTime(new Date()); + basicBusTypeChangeService.updateBasicBusTypeChange(basicBusTypeChangeEntity); + return ResultVOUtils.success("更新成功"); + } + /** + * 删除单据转换设置 + * + * @param deleteRequest + * @param bindingResult + * @return + */ + @PostMapping("/basic/bustype/change/delete") + public BaseResponse delBussinessType(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + if (deleteRequest != null) { + basicBusTypeChangeService.deleteById(deleteRequest.getId()); + } else { + return ResultVOUtils.error(999, "参数错误"); + } + return ResultVOUtils.success("更新成功"); + } } diff --git a/src/main/java/com/glxp/api/controller/basic/BasicBusTypePreController.java b/src/main/java/com/glxp/api/controller/basic/BasicBusTypePreController.java index 37aa3cfa0..5370e4a22 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicBusTypePreController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicBusTypePreController.java @@ -1,8 +1,26 @@ package com.glxp.api.controller.basic; +import cn.hutool.core.util.StrUtil; +import com.github.pagehelper.PageInfo; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.entity.basic.BasicBusTypePreEntity; +import com.glxp.api.req.basic.FilterBusTypeChangeRequest; +import com.glxp.api.req.basic.FilterBusTypePreRequest; +import com.glxp.api.req.system.DeleteRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.service.basic.IBasicBusTypePreService; import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; +import javax.annotation.Resource; +import java.util.List; + /** * 补单单据类型接口 */ @@ -10,6 +28,91 @@ import org.springframework.web.bind.annotation.RestController; @RestController public class BasicBusTypePreController { + @Resource + private IBasicBusTypePreService basicBusTypePreService; + + + @GetMapping("/spms/bussinessChangeType/filter") + public BaseResponse filterBussinessType(FilterBusTypePreRequest bussinessTypeFilterRequest) { + + return ResultVOUtils.success(null); + } + + @GetMapping("/spms/busTypeChange/filter") + public BaseResponse filterBusTypeChange(FilterBusTypeChangeRequest busTypeChangeFilterRequest, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List bussinessTypeEntities = basicBusTypePreService.filterAll(busTypeChangeFilterRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(bussinessTypeEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(bussinessTypeEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + @PostMapping("/spms/bussinessChangeType/remove") + public BaseResponse removeBussinessType(@RequestBody BasicBusTypePreEntity basicBusTypePreEntity, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + String action = basicBusTypePreEntity.getAction(); + if (StrUtil.isEmpty(action)) { + basicBusTypePreService.deleteById(basicBusTypePreEntity.getId() + ""); + } else { + basicBusTypePreService.deleteByAction(action); + } + return ResultVOUtils.success("删除成功"); + } + + @PostMapping("/spms/bussinessChangeType/delete") + public BaseResponse deleteBussinessType(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + String id = deleteRequest.getId(); + basicBusTypePreService.deleteById(id); + return ResultVOUtils.success("删除成功"); + } + + @PostMapping("/spms/bussinessChangeType/update") + public BaseResponse updateBussinessType(@RequestBody BasicBusTypePreEntity basicBusTypePreEntity, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + /*if (basicBusTypePreEntity != null) { + bussinessChangeTypeService.updateBusChangeType(basicBusTypePreEntity); + BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.findByAction(basicBusTypePreEntity.getAction()); + bussinessLocalTypeEntity.setUpdateTime(new Date()); + bussinessLocalTypeService.updateBusLocalType(bussinessLocalTypeEntity); + } else { + ResultVOUtils.error(999, "参数错误"); + }*/ + return ResultVOUtils.success("更新成功"); + } + + @PostMapping("/spms/bussinessChangeType/insert") + public BaseResponse insertBussinessType(@RequestBody BasicBusTypePreEntity basicBusTypePreEntity, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + /*if (basicBusTypePreEntity != null) { + if (StrUtil.isNotEmpty(basicBusTypePreEntity.getDefaultSubInv())) { + InvSubWarehouseEntity invSubWarehouseEntity = invSubWarehouseService.findByInvSubByCode(basicBusTypePreEntity.getDefaultSubInv()); + basicBusTypePreEntity.setDefaultInv(invSubWarehouseEntity.getParentId()); + } + if (StrUtil.isNotEmpty(basicBusTypePreEntity.getLocSubInv())) { + InvSubWarehouseEntity invSubWarehouseEntity = invSubWarehouseService.findByInvSubByCode(basicBusTypePreEntity.getLocSubInv()); + basicBusTypePreEntity.setLocInv(invSubWarehouseEntity.getParentId()); + } + bussinessChangeTypeService.insertBusChangeTypee(basicBusTypePreEntity); + } else { + ResultVOUtils.error(999, "参数错误"); + }*/ + return ResultVOUtils.success("添加成功"); + } } diff --git a/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java b/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java index 2dfad1f4d..33143f1ac 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java @@ -1,16 +1,33 @@ package com.glxp.api.controller.basic; +import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageInfo; +import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.entity.basic.BasicBussinessTypeEntity; import com.glxp.api.req.basic.FilterBussinessTypeRequest; +import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.res.basic.BasicBussinessTypeResponse; +import com.glxp.api.res.basic.BussinessTypExportResponse; +import com.glxp.api.res.basic.CandidateRequest; import com.glxp.api.service.basic.IBasicBussinessTypeService; +import com.glxp.api.util.CustomUtil; +import com.glxp.api.util.FileUtils; import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.beans.BeanUtils; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.InputStream; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; import java.util.List; /** @@ -23,21 +40,171 @@ public class BasicBussinessTypeController { @Resource private IBasicBussinessTypeService basicBussinessTypeService; - /** * 查询单据类型列表 * * @param filterBussinessTypeRequest * @return */ - @GetMapping("/udiwms/basic/busType/filterList") + @GetMapping("/udiwms/bussinessType/filter") public BaseResponse filterList(FilterBussinessTypeRequest filterBussinessTypeRequest) { List list = basicBussinessTypeService.filterList(filterBussinessTypeRequest); PageInfo pageInfo = new PageInfo<>(list); return ResultVOUtils.page(pageInfo); } + /** + * 新增单据类型 + * + * @param bussinessTypeEntity 单据类型数据 + * @param bindingResult + * @return + */ + @PostMapping("/udiwms/bussinessType/insert") + public BaseResponse insertBussinessType(@RequestBody BasicBussinessTypeEntity bussinessTypeEntity, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + + if (bussinessTypeEntity != null) { + bussinessTypeEntity.setAction("SC" + CustomUtil.getId()); + basicBussinessTypeService.insertBussinessType(bussinessTypeEntity); + } else { + ResultVOUtils.error(999, "参数错误"); + } + return ResultVOUtils.success("添加成功"); + } + + /** + * 更新单据类型 + * + * @param bussinessTypeEntity + * @param bindingResult + * @return + */ + @PostMapping("/udiwms/bussinessType/update") + public BaseResponse updateBussinessType(@RequestBody BasicBussinessTypeEntity bussinessTypeEntity, + BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + if (bussinessTypeEntity != null) { + basicBussinessTypeService.updateBussinessType(bussinessTypeEntity); + } else { + ResultVOUtils.error(999, "参数错误"); + } + return ResultVOUtils.success("更新成功"); + } + + /** + * 删除单据类型 + * + * @param deleteRequest + * @param bindingResult + * @return + */ + @PostMapping("/udiwms/bussinessType/delete") + public BaseResponse deleteBussinessType(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + String id = deleteRequest.getId(); + BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.selectById(id); + + //TODO 单据使用绑定和仓库绑定校验未做，等其他模块功能做完之后进行完善 + /*OrderFilterRequest orderFilterRequest = new OrderFilterRequest(); + orderFilterRequest.setAction(bussinessTypeEntity.getAction()); + OrderEntity orderEntity = orderService.findOne(orderFilterRequest); + if (orderEntity != null) { + return ResultVOUtils.error(500, "已存在该类型扫码单据，无法删除！"); + } + + + FilterInvBusTypeRequest filterInvBusTypeRequest = new FilterInvBusTypeRequest(); + filterInvBusTypeRequest.setAction(bussinessTypeEntity.getAction()); + List warehouseBussinessTypeEntities = warehouseBussinessTypeService.filterList(filterInvBusTypeRequest); + if (CollUtil.isNotEmpty(warehouseBussinessTypeEntities)) { + return ResultVOUtils.error(500, "单据类型已被仓库分库绑定，无法删除"); + }*/ + + return basicBussinessTypeService.deleteBussinessType(id) == true ? ResultVOUtils.success("删除成功") : ResultVOUtils.error(500, "删除失败，系统繁忙"); + } + + /** + * 单据类型导入 + * + * @param files + * @return + */ + @PostMapping("/udiwms/busstiness/file/upload") + public BaseResponse uploadProducts(@RequestParam("file") List files) { + for (int i = 0; i < files.size(); i++) { + MultipartFile file = files.get(i); + if (file.isEmpty()) { + return ResultVOUtils.error(500, "上传第" + (i++) + "个文件失败"); + } + try { + InputStream inputStream = file.getInputStream(); + String json = FileUtils.readStream(inputStream); + List bussinessTypeEntities = JSON.parseArray(json, BasicBussinessTypeEntity.class); + if (bussinessTypeEntities != null && bussinessTypeEntities.size() > 0) { + for (BasicBussinessTypeEntity bussinessTypeEntity : bussinessTypeEntities) { + basicBussinessTypeService.insertIgnoreBussinessType(bussinessTypeEntity); + } + } + } catch (Exception e) { + e.printStackTrace(); + return ResultVOUtils.error(500, "文件格式错误！"); + } + } + return ResultVOUtils.success("导入成功！"); + } + + /** + * 导出单据类型 + * + * @param res + */ + @PostMapping("udiwms/busstiness/file/export") + public void exportXml(HttpServletResponse res) { + FilterBussinessTypeRequest bussinessTypeFilterRequest = new FilterBussinessTypeRequest(); + bussinessTypeFilterRequest.setEnable(true); + List bussinessTypExportResponses = new ArrayList<>(); + List bussinessTypeEntities = basicBussinessTypeService.findList(bussinessTypeFilterRequest); + for (BasicBussinessTypeEntity bussinessTypeEntity : bussinessTypeEntities) { + BussinessTypExportResponse bussinessTypExportResponse = new BussinessTypExportResponse(); + BeanUtils.copyProperties(bussinessTypeEntity, bussinessTypExportResponse); + bussinessTypExportResponses.add(bussinessTypExportResponse); + } + String json = JSONObject.toJSON(bussinessTypExportResponses).toString(); + String fileName = "扫码单据类型导出" + CustomUtil.getId() + ".json"; + res.setHeader("Content-disposition", "attachment;fileName=" + fileName); + res.setContentType("text/plain;charset=UTF-8"); + try { + res.getOutputStream().write(json.getBytes(StandardCharsets.UTF_8)); + } catch (IOException e) { + log.error("导出单据类型异常", e); + } + } - //public BaseResponse add() + /** + * 查询候选补单单据类型 + * + * @return + */ + @GetMapping("/warehouse/bussinessType/candidateBussinessType") + public BaseResponse candidateBussinessType(CandidateRequest cndidateRequest) { + if (StrUtil.isBlank(cndidateRequest.getMainAction())) { + return ResultVOUtils.error(ResultEnum.DATA_ERROR); + } + List bussinessTypeEntities = basicBussinessTypeService.candidateBussinessType(cndidateRequest.getMainAction()); + if (StrUtil.isNotBlank(cndidateRequest.getCurAction())) { + BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(cndidateRequest.getCurAction()); + bussinessTypeEntities.add(bussinessTypeEntity); + } + //查询补单单据类型 + return ResultVOUtils.success(bussinessTypeEntities); + } } diff --git a/src/main/java/com/glxp/api/dao/basic/BasicBusTypeChangeDao.java b/src/main/java/com/glxp/api/dao/basic/BasicBusTypeChangeDao.java index 7096a82af..652a0b2bd 100644 --- a/src/main/java/com/glxp/api/dao/basic/BasicBusTypeChangeDao.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicBusTypeChangeDao.java @@ -2,11 +2,23 @@ package com.glxp.api.dao.basic; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.entity.basic.BasicBusTypeChangeEntity; +import com.glxp.api.req.basic.FilterBusTypeChangeRequest; +import com.glxp.api.res.basic.BasicBusTypeChangeResponse; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 单据转换表查询接口 */ @Mapper public interface BasicBusTypeChangeDao extends BaseMapper { + + /** + * 查询单据转换设置列表 + * + * @param filterBusTypeChangeRequest + * @return + */ + List filterList(FilterBusTypeChangeRequest filterBusTypeChangeRequest); } \ No newline at end of file diff --git a/src/main/java/com/glxp/api/dao/basic/BasicBussinessTypeDao.java b/src/main/java/com/glxp/api/dao/basic/BasicBussinessTypeDao.java index cb9408253..0776db712 100644 --- a/src/main/java/com/glxp/api/dao/basic/BasicBussinessTypeDao.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicBussinessTypeDao.java @@ -19,4 +19,20 @@ public interface BasicBussinessTypeDao extends BaseMapper filterList(FilterBussinessTypeRequest filterBussinessTypeRequest); + + /** + * 忽略已存在数据插入单据类型 + * + * @param bussinessTypeEntity + * @return + */ + boolean insertIgnoreBussinessType(BasicBussinessTypeEntity bussinessTypeEntity); + + /** + * 查询单据类型列表 + * + * @param bussinessTypeFilterRequest + * @return + */ + List selectList(FilterBussinessTypeRequest bussinessTypeFilterRequest); } diff --git a/src/main/java/com/glxp/api/entity/basic/BasicBusTypeChangeEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicBusTypeChangeEntity.java index 5e09af790..ab4e16c9f 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicBusTypeChangeEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicBusTypeChangeEntity.java @@ -18,7 +18,7 @@ public class BasicBusTypeChangeEntity { /** * id */ - @TableId(value = "id", type = IdType.INPUT) + @TableId(value = "id", type = IdType.AUTO) private Integer id; /** diff --git a/src/main/java/com/glxp/api/entity/basic/BasicBusTypePreEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicBusTypePreEntity.java index 63156fd54..59b95ed86 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicBusTypePreEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicBusTypePreEntity.java @@ -18,7 +18,7 @@ public class BasicBusTypePreEntity { /** * id */ - @TableId(value = "id", type = IdType.INPUT) + @TableId(value = "id", type = IdType.AUTO) private Integer id; /** diff --git a/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java index 8bc0a7f36..61300f01d 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java @@ -1,5 +1,8 @@ package com.glxp.api.entity.basic; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import java.util.Date; @@ -8,269 +11,277 @@ import java.util.Date; * 单据类型实体类 */ @Data +@TableName("basic_bussiness_type") public class BasicBussinessTypeEntity { + /** - * id - */ + * id + */ + @TableId(value = "id", type = IdType.AUTO) private Integer id; /** - * 主类型（出库，入库） - */ + * 主类型（出库，入库） + */ private String mainAction; /** - * 业务类型 - */ + * 业务类型 + */ private String action; /** - * 业务名称 - */ + * 业务名称 + */ private String name; /** - * 是否启用 - */ + * 是否启用 + */ private Boolean enable; /** - * 备注 - */ + * 备注 + */ private String remark; /** - * 第三方系统外键 - */ + * 第三方系统外键 + */ private String thirdSysFk; /** - * 是否自动生成往来单位：1.是；2.否 - */ + * 是否自动生成往来单位：1.是；2.否 + */ private Boolean genUnit; /** - * 是否是内部单据：1.是；0：否 - */ + * 是否是内部单据：1.是；0：否 + */ private Boolean innerOrder; /** - * 是否二次验收 - */ + * 是否二次验收 + */ private Boolean secCheckEnable; /** - * 是否根据业务单据类型校验 - */ + * 是否根据业务单据类型校验 + */ private Boolean checkEnable; /** - * UDIMS平台来源是否需要校验 - */ + * UDIMS平台来源是否需要校验 + */ private Boolean checkUdims; /** - * pda已校验单据 - */ + * pda已校验单据 + */ private Boolean checkPdaEd; /** - * pda未检验单据 - */ + * pda未检验单据 + */ private Boolean checkPdaUn; /** - * PC端扫码精灵 - */ + * PC端扫码精灵 + */ private Boolean checkPc; /** - * web前端页面新增单据 - */ + * web前端页面新增单据 + */ private Boolean checkWebNew; /** - * 供应商平台导出单据 - */ + * 供应商平台导出单据 + */ private Boolean checkSp; /** - * 流转生成单据 - */ + * 流转生成单据 + */ private Boolean checkChange; /** - * UDIMS平台单据 二次校验 - */ + * UDIMS平台单据 二次校验 + */ private Boolean secCheckUdims; /** - * 手持终端已校验单据 二次校验 - */ + * 手持终端已校验单据 二次校验 + */ private Boolean secCheckPdaEd; /** - * 手持终端未校验单据 二次校验 - */ + * 手持终端未校验单据 二次校验 + */ private Boolean secCheckPdaUn; /** - * UDI扫码通 二次校验 - */ + * UDI扫码通 二次校验 + */ private Boolean secCheckPc; /** - * web端新增单据 二次复核 - */ + * web端新增单据 二次复核 + */ private Boolean secCheckWebNew; /** - * 自动补单二次复核 - */ + * 自动补单二次复核 + */ private Boolean secCheckChange; /** - * 供应商平台导出单据 - */ + * 供应商平台导出单据 + */ private Boolean secCheckSp; /** - * 往来单位类型 - */ + * 往来单位类型 + */ private Boolean corpType; /** - * 补单扫码单据类型 - */ + * 补单扫码单据类型 + */ private String supplementOrderType; /** - * 平衡补单是否校验 - */ + * 平衡补单是否校验 + */ private Boolean checkBalance; /** - * 平衡补单是否二次验收 - */ + * 平衡补单是否二次验收 + */ private Boolean secCheckBalance; /** - * 允许科室多次使用出库 - */ + * 允许科室多次使用出库 + */ private Boolean useDyCount; /** - * 到期提示 - */ + * 到期提示 + */ private Boolean expireTip; /** - * 更新时间 - */ + * 更新时间 + */ private Date updateTime; /** - * 默认往来单位 - */ + * 默认往来单位 + */ private String defaultUnit; /** - * 创建单据前缀 - */ + * 创建单据前缀 + */ private String prefix; /** - * 出库是否直接上传至自助平台 - */ + * 出库是否直接上传至自助平台 + */ private Boolean outToSpms; /** - * 允许出库自动缺量补单 - */ + * 允许出库自动缺量补单 + */ private Boolean ullageFill; /** - * 是否只采集预验收产品 - */ + * 是否只采集预验收产品 + */ private Boolean scanPreIn; /** - * 是否访问库存 - */ + * 是否访问库存 + */ private Boolean vailInv; /** - * 允许验收自助平台单据 - */ + * 允许验收自助平台单据 + */ private Boolean entrutSpms; /** - * 是否强制三期校验 - */ + * 是否强制三期校验 + */ private Boolean codeFillCheck; /** - * 默认分库 - */ + * 默认分库 + */ private String defaultSubInv; /** - * 默认仓库 - */ + * 默认仓库 + */ private String defaultInv; /** - * 订单详情展示方式：0：根据批次号展示，1:根据条码展示 - */ + * 订单详情展示方式：0：根据批次号展示，1:根据条码展示 + */ private Boolean orderVisibleType; /** - * 是否校验复制单据 - */ + * 是否校验复制单据 + */ private Boolean checkCopy; /** - * 是否二次校验复制单据 - */ + * 是否二次校验复制单据 + */ private Boolean secCheckCopy; /** - * 第三方系统单据类型 - */ + * 第三方系统单据类型 + */ private String originAction; /** - * 是否预入库 - */ + * 是否预入库 + */ private Boolean advanceType; /** - * 是否流转 - */ + * 是否流转 + */ private Boolean changeEnable; /** - * 是否供应商使用 - */ + * 是否供应商使用 + */ private Boolean spUse; /** - * 是否预验收单据类型 - */ + * 是否预验收单据类型 + */ private Boolean preIn; /** - * 缺量补单是否全量补单 - */ + * 缺量补单是否全量补单 + */ private Boolean supplementAll; /** - * 创建人 - */ + * 创建人 + */ private String createUser; /** - * 创建时间 - */ + * 更新人 + */ + private String updateUser; + + /** + * 创建时间 + */ private Date createTime; } \ No newline at end of file diff --git a/src/main/java/com/glxp/api/entity/thrsys/ThrBusTypeOriginEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrBusTypeOriginEntity.java index b0e4a038c..e1590584d 100644 --- a/src/main/java/com/glxp/api/entity/thrsys/ThrBusTypeOriginEntity.java +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrBusTypeOriginEntity.java @@ -18,7 +18,7 @@ public class ThrBusTypeOriginEntity { /** * id */ - @TableId(value = "id", type = IdType.INPUT) + @TableId(value = "id", type = IdType.AUTO) private Integer id; /** diff --git a/src/main/java/com/glxp/api/res/basic/BasicBusTypeChangeResponse.java b/src/main/java/com/glxp/api/res/basic/BasicBusTypeChangeResponse.java index 6d5e9525b..cdb2bf141 100644 --- a/src/main/java/com/glxp/api/res/basic/BasicBusTypeChangeResponse.java +++ b/src/main/java/com/glxp/api/res/basic/BasicBusTypeChangeResponse.java @@ -1,10 +1,17 @@ package com.glxp.api.res.basic; +import com.glxp.api.entity.basic.BasicBusTypeChangeEntity; import lombok.Data; /** * 单据流转设置接口响应VO */ @Data -public class BasicBusTypeChangeResponse { +public class BasicBusTypeChangeResponse extends BasicBusTypeChangeEntity { + + /** + * 目标单据类型名称 + */ + private String targetBusName; + } diff --git a/src/main/java/com/glxp/api/res/basic/BussinessTypExportResponse.java b/src/main/java/com/glxp/api/res/basic/BussinessTypExportResponse.java new file mode 100644 index 000000000..0340081e5 --- /dev/null +++ b/src/main/java/com/glxp/api/res/basic/BussinessTypExportResponse.java @@ -0,0 +1,16 @@ +package com.glxp.api.res.basic; + +import lombok.Data; + +/** + * 单据类型导出实体 + */ +@Data +public class BussinessTypExportResponse { + private Integer id; + private String action; + private String name; + private Boolean enable; + private String remark; + private String mainAction; +} diff --git a/src/main/java/com/glxp/api/res/basic/CandidateRequest.java b/src/main/java/com/glxp/api/res/basic/CandidateRequest.java new file mode 100644 index 000000000..79ff353c7 --- /dev/null +++ b/src/main/java/com/glxp/api/res/basic/CandidateRequest.java @@ -0,0 +1,20 @@ +package com.glxp.api.res.basic; + +import lombok.Data; + +/** + * 查询候选补单单据类型接口参数 + */ +@Data +public class CandidateRequest { + + /** + * 出入库类型 + */ + String mainAction; + + /** + * 当前单据类型 + */ + String curAction; +} diff --git a/src/main/java/com/glxp/api/service/basic/IBasicBusTypeChangeService.java b/src/main/java/com/glxp/api/service/basic/IBasicBusTypeChangeService.java index 50c02319b..14b0d1052 100644 --- a/src/main/java/com/glxp/api/service/basic/IBasicBusTypeChangeService.java +++ b/src/main/java/com/glxp/api/service/basic/IBasicBusTypeChangeService.java @@ -20,11 +20,24 @@ public interface IBasicBusTypeChangeService { List filterList(FilterBusTypeChangeRequest filterBusTypeChangeRequest); /** - * 新增单据流转设置 + * 新增单据转换设置 * * @param basicBusTypeChangeEntity * @return */ int insert(BasicBusTypeChangeEntity basicBusTypeChangeEntity); + /** + * 更新单据转换设置 + * + * @param basicBusTypeChangeEntity + */ + boolean updateBasicBusTypeChange(BasicBusTypeChangeEntity basicBusTypeChangeEntity); + + /** + * 删除单据转换设置 + * + * @param id + */ + boolean deleteById(String id); } diff --git a/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java b/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java index 9b3a88095..411ebb96e 100644 --- a/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java +++ b/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java @@ -1,7 +1,17 @@ package com.glxp.api.service.basic; +import com.glxp.api.entity.basic.BasicBusTypePreEntity; +import com.glxp.api.req.basic.FilterBusTypeChangeRequest; + +import java.util.List; + /** * 补单单据类型Service */ public interface IBasicBusTypePreService { + List filterAll(FilterBusTypeChangeRequest busTypeChangeFilterRequest); + + boolean deleteById(String id); + + boolean deleteByAction(String action); } diff --git a/src/main/java/com/glxp/api/service/basic/IBasicBussinessTypeService.java b/src/main/java/com/glxp/api/service/basic/IBasicBussinessTypeService.java index ee41d7c0e..e48ca2641 100644 --- a/src/main/java/com/glxp/api/service/basic/IBasicBussinessTypeService.java +++ b/src/main/java/com/glxp/api/service/basic/IBasicBussinessTypeService.java @@ -1,5 +1,6 @@ package com.glxp.api.service.basic; +import com.glxp.api.entity.basic.BasicBussinessTypeEntity; import com.glxp.api.req.basic.FilterBussinessTypeRequest; import com.glxp.api.res.basic.BasicBussinessTypeResponse; @@ -18,4 +19,67 @@ public interface IBasicBussinessTypeService { */ List filterList(FilterBussinessTypeRequest filterBussinessTypeRequest); + /** + * 添加单据类型 + * + * @param bussinessTypeEntity + * @return + */ + + boolean insertBussinessType(BasicBussinessTypeEntity bussinessTypeEntity); + + /** + * 更新单据类型 + * + * @param basicBussinessTypeEntity + * @return + */ + boolean updateBussinessType(BasicBussinessTypeEntity basicBussinessTypeEntity); + + /** + * 删除单据类型 + * + * @param id + * @return + */ + boolean deleteBussinessType(String id); + + /** + * 通过单据类型编码查询单据类型数据 + * + * @param action + * @return + */ + BasicBussinessTypeEntity findByAction(String action); + + /** + * 根据ID查询单据类型数据 + * + * @param id + * @return + */ + BasicBussinessTypeEntity selectById(String id); + + /** + * 忽略已存在单据数据进行替换 + * + * @param bussinessTypeEntity + */ + boolean insertIgnoreBussinessType(BasicBussinessTypeEntity bussinessTypeEntity); + + /** + * 查询单据类型实体列表，不分页 + * + * @param bussinessTypeFilterRequest + * @return + */ + List findList(FilterBussinessTypeRequest bussinessTypeFilterRequest); + + /** + * 查询补单候选单据类型 + * + * @param mainAction + * @return + */ + List candidateBussinessType(String mainAction); } diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypeChangeServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypeChangeServiceImpl.java index dd350211a..6bf5a5fc9 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypeChangeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypeChangeServiceImpl.java @@ -1,5 +1,6 @@ package com.glxp.api.service.basic.impl; +import com.github.pagehelper.PageHelper; import com.glxp.api.dao.basic.BasicBusTypeChangeDao; import com.glxp.api.entity.basic.BasicBusTypeChangeEntity; import com.glxp.api.req.basic.FilterBusTypeChangeRequest; @@ -11,6 +12,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.util.Collections; import java.util.Date; import java.util.List; @@ -26,7 +28,13 @@ public class BasicBusTypeChangeServiceImpl implements IBasicBusTypeChangeService @Override public List filterList(FilterBusTypeChangeRequest filterBusTypeChangeRequest) { - return null; + if (null == filterBusTypeChangeRequest) { + return Collections.emptyList(); + } + if (null != filterBusTypeChangeRequest.getPage() && null != filterBusTypeChangeRequest.getLimit()) { + PageHelper.offsetPage((filterBusTypeChangeRequest.getPage() - 1) * filterBusTypeChangeRequest.getLimit(), filterBusTypeChangeRequest.getLimit()); + } + return basicBusTypeChangeDao.filterList(filterBusTypeChangeRequest); } @Override @@ -35,6 +43,17 @@ public class BasicBusTypeChangeServiceImpl implements IBasicBusTypeChangeService return basicBusTypeChangeDao.insert(basicBusTypeChangeEntity); } + @Override + public boolean updateBasicBusTypeChange(BasicBusTypeChangeEntity basicBusTypeChangeEntity) { + setUpdateInfo(basicBusTypeChangeEntity); + return basicBusTypeChangeDao.updateById(basicBusTypeChangeEntity) != 0; + } + + @Override + public boolean deleteById(String id) { + return basicBusTypeChangeDao.deleteById(id) != 0; + } + private void setUpdateInfo(BasicBusTypeChangeEntity basicBusTypeChangeEntity) { Date now = new Date(); String userId = String.valueOf(customerService.getUserBean().getId()); diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java index 72b686654..7ed0184ba 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java @@ -1,12 +1,30 @@ package com.glxp.api.service.basic.impl; +import com.glxp.api.entity.basic.BasicBusTypePreEntity; +import com.glxp.api.req.basic.FilterBusTypeChangeRequest; import com.glxp.api.service.basic.IBasicBusTypePreService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.List; + @Slf4j @Service @Transactional(rollbackFor = Exception.class) public class BasicBusTypePreServiceImpl implements IBasicBusTypePreService { + @Override + public List filterAll(FilterBusTypeChangeRequest busTypeChangeFilterRequest) { + return null; + } + + @Override + public boolean deleteById(String id) { + return false; + } + + @Override + public boolean deleteByAction(String action) { + return false; + } } diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java index c3efa6a17..ce8140142 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java @@ -1,21 +1,31 @@ package com.glxp.api.service.basic.impl; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; +import com.glxp.api.constant.ConstantType; import com.glxp.api.dao.basic.BasicBussinessTypeDao; +import com.glxp.api.entity.basic.BasicBussinessTypeEntity; import com.glxp.api.req.basic.FilterBussinessTypeRequest; import com.glxp.api.res.basic.BasicBussinessTypeResponse; +import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.basic.IBasicBussinessTypeService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; +import java.util.Date; import java.util.List; @Slf4j @Service +@Transactional(rollbackFor = Exception.class) public class BasicBussinessTypeServiceImpl implements IBasicBussinessTypeService { + @Resource + private CustomerService customerService; @Resource private BasicBussinessTypeDao basicBussinessTypeDao; @@ -30,4 +40,98 @@ public class BasicBussinessTypeServiceImpl implements IBasicBussinessTypeService return basicBussinessTypeDao.filterList(filterBussinessTypeRequest); } + @Override + public boolean insertBussinessType(BasicBussinessTypeEntity bussinessTypeEntity) { + //设置创建时间和更新时间数据 + setUpdateInfo(bussinessTypeEntity); + return basicBussinessTypeDao.insert(bussinessTypeEntity) != 0; + } + + @Override + public boolean updateBussinessType(BasicBussinessTypeEntity basicBussinessTypeEntity) { + //设置更新时间等数据 + setUpdateInfo(basicBussinessTypeEntity); + //更新时处理补单类型逻辑 + if (StrUtil.isBlank(basicBussinessTypeEntity.getSupplementOrderType())) { + //查询当前单据类型完整数据 + BasicBussinessTypeEntity currentBusType = findByAction(basicBussinessTypeEntity.getAction()); + //查询补单类型的数据 + BasicBussinessTypeEntity supplementType = findByAction(currentBusType.getSupplementOrderType()); + if (null != supplementType) { + supplementType.setSupplementOrderType(""); + basicBussinessTypeDao.updateById(supplementType); + } + } else { + //补单类型不为空,查询出补单类型数据，将对向单据设置为当前单据类型的编码 + BasicBussinessTypeEntity supplementType = findByAction(basicBussinessTypeEntity.getSupplementOrderType()); + supplementType.setSupplementOrderType(basicBussinessTypeEntity.getAction()); + basicBussinessTypeDao.updateById(supplementType); + } + return basicBussinessTypeDao.updateById(basicBussinessTypeEntity) != 0; + } + + @Override + public boolean deleteBussinessType(String id) { + return basicBussinessTypeDao.deleteById(id) == 0 ? false : true; + } + + @Override + public BasicBussinessTypeEntity findByAction(String action) { + if (StrUtil.isNotBlank(action)) { + return basicBussinessTypeDao.selectOne(new QueryWrapper().eq("action", action)); + } + return null; + } + + @Override + public BasicBussinessTypeEntity selectById(String id) { + if (StrUtil.isNotBlank(id)) { + return basicBussinessTypeDao.selectById(id); + } + return null; + } + + @Override + public boolean insertIgnoreBussinessType(BasicBussinessTypeEntity bussinessTypeEntity) { + return basicBussinessTypeDao.insertIgnoreBussinessType(bussinessTypeEntity); + } + + @Override + public List findList(FilterBussinessTypeRequest bussinessTypeFilterRequest) { + //构造查询参数 + return basicBussinessTypeDao.selectList(bussinessTypeFilterRequest); + } + + @Override + public List candidateBussinessType(String mainAction) { + if (mainAction.equals(ConstantType.TYPE_OUT)) { + mainAction = ConstantType.TYPE_PUT; + } else { + mainAction = ConstantType.TYPE_OUT; + } + QueryWrapper query = new QueryWrapper<>(); + query.select("name", "action") + .eq("mainAction", mainAction) + .eq("corpType", 1) + .isNull("supplementOrderType").or().eq("supplementOrderType", ""); + return basicBussinessTypeDao.selectList(query); + } + + + /** + * 统一设置创建/更新信息 + * + * @param bussinessTypeEntity + */ + private void setUpdateInfo(BasicBussinessTypeEntity bussinessTypeEntity) { + Date now = new Date(); + String userId = String.valueOf(customerService.getUserBean().getId()); + if (null == bussinessTypeEntity.getId()) { + bussinessTypeEntity.setCreateUser(userId); + bussinessTypeEntity.setCreateTime(now); + } + bussinessTypeEntity.setUpdateUser(userId); + bussinessTypeEntity.setUpdateTime(now); + } + } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index c79f5a305..97fee7870 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -3,9 +3,8 @@ server: spring: datasource: - driver-class-name: com.mysql.cj.jdbc.Driver - type: com.zaxxer.hikari.HikariDataSource - jdbc-url: jdbc:mysql://192.168.0.66:3364/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + driver-class-name: com.p6spy.engine.spy.P6SpyDriver + jdbc-url: jdbc:p6spy:mysql://192.168.0.66:3364/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true username: root password: Glxp@6066 hikari: diff --git a/src/main/resources/mybatis/mapper/basic/BasicBusTypeChangeDao.xml b/src/main/resources/mybatis/mapper/basic/BasicBusTypeChangeDao.xml index cfc049d36..e9a72ff89 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicBusTypeChangeDao.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicBusTypeChangeDao.xml @@ -1,5 +1,29 @@ - + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml b/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml index 8e88683c1..636ff0206 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml @@ -51,4 +51,119 @@ order by bu.updateTime desc + + + insert ignore into basic_bussiness_type (mainAction, action, name, enable, remark, thirdSysFk, genUnit, + innerOrder, secCheckEnable, checkEnable, checkUdims, checkPdaEd, + checkPdaUn, checkPc, checkWebNew, checkSp, checkChange, secCheckUdims, + secCheckPdaEd, secCheckPdaUn, secCheckPc, secCheckWebNew, + secCheckChange, secCheckSp, corpType, supplementOrderType, + checkBalance, secCheckBalance, useDyCount, expireTip, updateTime, + defaultUnit, prefix, outToSpms, ullageFill, scanPreIn, vailInv, + entrutSpms, codeFillCheck, defaultSubInv, defaultInv, orderVisibleType, + checkCopy, secCheckCopy, originAction, advanceType, changeEnable, + spUse, preIn, supplementAll, createUser, createTime) + values (#{mainAction}, + #{action}, + #{name}, + #{enable}, + #{remark}, + #{thirdSysFk}, + #{genUnit}, + #{innerOrder}, + #{secCheckEnable}, + #{checkEnable}, + #{checkUdims}, + #{checkPdaEd}, + #{checkPdaUn}, + #{checkPc}, + #{checkWebNew}, + #{checkSp}, + #{checkChange}, + #{secCheckUdims}, + #{secCheckPdaEd}, + #{secCheckPdaUn}, + #{secCheckPc}, + #{secCheckWebNew}, + #{secCheckChange}, + #{secCheckSp}, + #{corpType}, + #{supplementOrderType}, + #{checkBalance}, + #{secCheckBalance}, + #{useDyCount}, + #{expireTip}, + #{updateTime}, + #{defaultUnit}, + #{prefix}, + #{outToSpms}, + #{ullageFill}, + #{scanPreIn}, + #{vailInv}, + #{entrutSpms}, + #{codeFillCheck}, + #{defaultSubInv}, + #{defaultInv}, + #{orderVisibleType}, + #{checkCopy}, + #{secCheckCopy}, + #{originAction}, + #{advanceType}, + #{changeEnable}, + #{spUse}, + #{preIn}, + #{supplementAll}, + #{createUser}, + #{createTime} + ) + + + diff --git a/src/main/resources/spy.properties b/src/main/resources/spy.properties new file mode 100644 index 000000000..cc8e8b824 --- /dev/null +++ b/src/main/resources/spy.properties @@ -0,0 +1,24 @@ +#3.2.1\u4EE5\u4E0A\u4F7F\u7528 +modulelist=com.baomidou.mybatisplus.extension.p6spy.MybatisPlusLogFactory,com.p6spy.engine.outage.P6OutageFactory +#3.2.1\u4EE5\u4E0B\u4F7F\u7528\u6216\u8005\u4E0D\u914D\u7F6E +#modulelist=com.p6spy.engine.logging.P6LogFactory,com.p6spy.engine.outage.P6OutageFactory +# \u81EA\u5B9A\u4E49\u65E5\u5FD7\u6253\u5370 +logMessageFormat=com.baomidou.mybatisplus.extension.p6spy.P6SpyLogger +#\u65E5\u5FD7\u8F93\u51FA\u5230\u63A7\u5236\u53F0 +appender=com.baomidou.mybatisplus.extension.p6spy.StdoutLogger +# \u4F7F\u7528\u65E5\u5FD7\u7CFB\u7EDF\u8BB0\u5F55 sql +#appender=com.p6spy.engine.spy.appender.Slf4JLogger +# \u8BBE\u7F6E p6spy driver \u4EE3\u7406 +deregisterdrivers=true +# \u53D6\u6D88JDBC URL\u524D\u7F00 +useprefix=true +# \u914D\u7F6E\u8BB0\u5F55 Log \u4F8B\u5916,\u53EF\u53BB\u6389\u7684\u7ED3\u679C\u96C6\u6709error,info,batch,debug,statement,commit,rollback,result,resultset. +excludecategories=info,debug,result,commit,resultset +# \u65E5\u671F\u683C\u5F0F +dateformat=yyyy-MM-dd HH:mm:ss +# \u5B9E\u9645\u9A71\u52A8\u53EF\u591A\u4E2A +#driverlist=org.h2.Driver +# \u662F\u5426\u5F00\u542F\u6162SQL\u8BB0\u5F55 +outagedetection=true +# \u6162SQL\u8BB0\u5F55\u6807\u51C6 2 \u79D2 +outagedetectioninterval=2 \ No newline at end of file