1.添加sql性能分析插件,调整测试环境配置文件,添加单据类型相关接口

master
x_z 3 years ago
parent b1b6a1b849
commit 4df9ca7662

@ -133,6 +133,13 @@
</exclusions>
</dependency>
<!--mybatis-plus性能分析SQL打印插件-->
<dependency>
<groupId>p6spy</groupId>
<artifactId>p6spy</artifactId>
<version>3.9.1</version>
</dependency>
<!--自动生成 GET SET-->
<dependency>
<groupId>org.projectlombok</groupId>

@ -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<BasicBusTypeChangeResponse> basicBusTypeChangeEntities;
basicBusTypeChangeEntities = basicBusTypeChangeService.filterList(basicBusTypeChangeRequest);
PageInfo<BasicBusTypeChangeResponse> 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("更新成功");
}
}

@ -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<BasicBusTypePreEntity> bussinessTypeEntities = basicBusTypePreService.filterAll(busTypeChangeFilterRequest);
PageInfo<BasicBusTypePreEntity> pageInfo;
pageInfo = new PageInfo<>(bussinessTypeEntities);
PageSimpleResponse<BasicBusTypePreEntity> 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("添加成功");
}
}

@ -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<BasicBussinessTypeResponse> list = basicBussinessTypeService.filterList(filterBussinessTypeRequest);
PageInfo<BasicBussinessTypeResponse> 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<WarehouseBussinessTypeEntity> 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<MultipartFile> 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<BasicBussinessTypeEntity> 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<BussinessTypExportResponse> bussinessTypExportResponses = new ArrayList<>();
List<BasicBussinessTypeEntity> 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<BasicBussinessTypeEntity> bussinessTypeEntities = basicBussinessTypeService.candidateBussinessType(cndidateRequest.getMainAction());
if (StrUtil.isNotBlank(cndidateRequest.getCurAction())) {
BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(cndidateRequest.getCurAction());
bussinessTypeEntities.add(bussinessTypeEntity);
}
//查询补单单据类型
return ResultVOUtils.success(bussinessTypeEntities);
}
}

@ -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<BasicBusTypeChangeEntity> {
/**
*
*
* @param filterBusTypeChangeRequest
* @return
*/
List<BasicBusTypeChangeResponse> filterList(FilterBusTypeChangeRequest filterBusTypeChangeRequest);
}

@ -19,4 +19,20 @@ public interface BasicBussinessTypeDao extends BaseMapper<BasicBussinessTypeEnti
* @return
*/
List<BasicBussinessTypeResponse> filterList(FilterBussinessTypeRequest filterBussinessTypeRequest);
/**
*
*
* @param bussinessTypeEntity
* @return
*/
boolean insertIgnoreBussinessType(BasicBussinessTypeEntity bussinessTypeEntity);
/**
*
*
* @param bussinessTypeFilterRequest
* @return
*/
List<BasicBussinessTypeEntity> selectList(FilterBussinessTypeRequest bussinessTypeFilterRequest);
}

@ -18,7 +18,7 @@ public class BasicBusTypeChangeEntity {
/**
* id
*/
@TableId(value = "id", type = IdType.INPUT)
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
/**

@ -18,7 +18,7 @@ public class BasicBusTypePreEntity {
/**
* id
*/
@TableId(value = "id", type = IdType.INPUT)
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
/**

@ -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;
/**
* 01:
*/
* 01:
*/
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;
}

@ -18,7 +18,7 @@ public class ThrBusTypeOriginEntity {
/**
* id
*/
@TableId(value = "id", type = IdType.INPUT)
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
/**

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

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

@ -0,0 +1,20 @@
package com.glxp.api.res.basic;
import lombok.Data;
/**
*
*/
@Data
public class CandidateRequest {
/**
*
*/
String mainAction;
/**
*
*/
String curAction;
}

@ -20,11 +20,24 @@ public interface IBasicBusTypeChangeService {
List<BasicBusTypeChangeResponse> filterList(FilterBusTypeChangeRequest filterBusTypeChangeRequest);
/**
*
*
*
* @param basicBusTypeChangeEntity
* @return
*/
int insert(BasicBusTypeChangeEntity basicBusTypeChangeEntity);
/**
*
*
* @param basicBusTypeChangeEntity
*/
boolean updateBasicBusTypeChange(BasicBusTypeChangeEntity basicBusTypeChangeEntity);
/**
*
*
* @param id
*/
boolean deleteById(String id);
}

@ -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<BasicBusTypePreEntity> filterAll(FilterBusTypeChangeRequest busTypeChangeFilterRequest);
boolean deleteById(String id);
boolean deleteByAction(String action);
}

@ -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<BasicBussinessTypeResponse> 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<BasicBussinessTypeEntity> findList(FilterBussinessTypeRequest bussinessTypeFilterRequest);
/**
*
*
* @param mainAction
* @return
*/
List<BasicBussinessTypeEntity> candidateBussinessType(String mainAction);
}

@ -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<BasicBusTypeChangeResponse> 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());

@ -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<BasicBusTypePreEntity> filterAll(FilterBusTypeChangeRequest busTypeChangeFilterRequest) {
return null;
}
@Override
public boolean deleteById(String id) {
return false;
}
@Override
public boolean deleteByAction(String action) {
return false;
}
}

@ -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<BasicBussinessTypeEntity>().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<BasicBussinessTypeEntity> findList(FilterBussinessTypeRequest bussinessTypeFilterRequest) {
//构造查询参数
return basicBussinessTypeDao.selectList(bussinessTypeFilterRequest);
}
@Override
public List<BasicBussinessTypeEntity> candidateBussinessType(String mainAction) {
if (mainAction.equals(ConstantType.TYPE_OUT)) {
mainAction = ConstantType.TYPE_PUT;
} else {
mainAction = ConstantType.TYPE_OUT;
}
QueryWrapper<BasicBussinessTypeEntity> 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);
}
}

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

@ -1,5 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.glxp.api.dao.basic.BasicBusTypeChangeDao">
<select id="filterList" resultType="com.glxp.api.res.basic.BasicBusTypeChangeResponse">
select bc.*, bu.name
from basic_bustype_change bc
left join basic_bussiness_type bu on bc.targetAction = bu.action
<where>
<if test="originAction != null and originAction != ''">
AND bc.originAction = #{originAction}
</if>
<if test="originName != null and originName != ''">
AND bc.originName = #{originName}
</if>
<if test="type != null">
AND bc.type = #{type}
</if>
<if test="enable != null">
AND bc.enable = #{enable}
</if>
<if test="lastUpdateTime != null and lastUpdateTime != ''">
<![CDATA[
and DATE_FORMAT(bc.updateTime, '%Y-%m-%d %H:%i:%S') >=
DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')
]]>
</if>
</where>
</select>
</mapper>

@ -51,4 +51,119 @@
</where>
order by bu.updateTime desc
</select>
<insert id="insertIgnoreBussinessType" parameterType="com.glxp.api.entity.basic.BasicBussinessTypeEntity">
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}
)
</insert>
<select id="selectList" resultType="com.glxp.api.entity.basic.BasicBussinessTypeEntity">
select *
from basic_bussiness_type bu
<where>
<if test="name != null and name != ''">
AND bu.name like concat('%', #{name}, '%')
</if>
<if test="action != null and action != ''">
AND bu.action like concat('%', #{action}, '%')
</if>
<if test="advanceType != null">
AND bu.advanceType = #{advanceType}
</if>
<if test="enable != null">
AND bu.enable = #{enable}
</if>
<if test="mainAction != null and mainAction != ''">
AND bu.mainAction = #{mainAction}
</if>
<if test="thirdAction != null and thirdAction != ''">
AND bu.thirdSysFk like concat('%', #{thirdAction}, '%')
</if>
<if test="checkEnable != null">
AND bu.checkEnable = #{checkEnable}
</if>
<if test="spUse != null">
AND bu.spUse = #{spUse}
</if>
<if test="secCheckEnable != null">
AND bu.secCheckEnable = #{secCheckEnable}
</if>
<if test="preIn != null">
AND bu.preIn = #{preIn}
</if>
<if test="actionList != null and actionList.size() != 0">
AND bu.action in
<foreach collection="actionList" index="index" item="item" separator="," open="(" close=")">
#{item}
</foreach>
</if>
<if test="lastUpdateTime != null and lastUpdateTime != ''">
<![CDATA[
and DATE_FORMAT(bu.updateTime, '%Y-%m-%d %H:%i:%S') >=
DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')
]]>
</if>
</where>
</select>
</mapper>

@ -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
Loading…
Cancel
Save