diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataOpenIncomingSettingEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataOpenIncomingSettingEntity.java new file mode 100644 index 000000000..71a5d5d44 --- /dev/null +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataOpenIncomingSettingEntity.java @@ -0,0 +1,46 @@ +package com.logpm.basicdata.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.tenant.mp.TenantEntity; + +@Data +@TableName("logpm_basicdata_open_incoming") +@ApiModel(value = "BasicdataOpenIncomingSetting对象", description = "开单及入库设置表") +@EqualsAndHashCode(callSuper = true) +public class BasicdataOpenIncomingSettingEntity extends TenantEntity { + + /** + * 预留1 + */ + @ApiModelProperty(value = "预留1") + private String reserve1; + /** + * 预留2 + */ + @ApiModelProperty(value = "预留2") + private String reserve2; + /** + * 预留3 + */ + @ApiModelProperty(value = "预留3") + private String reserve3; + /** + * 预留4 + */ + @ApiModelProperty(value = "预留4") + private String reserve4; + /** + * 预留5 + */ + @ApiModelProperty(value = "预留5") + private String reserve5; + + + private Long warehouseId; + private String brand; + +} diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataOpenIncomingSettingVO.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataOpenIncomingSettingVO.java new file mode 100644 index 000000000..2017a0eab --- /dev/null +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataOpenIncomingSettingVO.java @@ -0,0 +1,11 @@ +package com.logpm.basicdata.vo; + +import com.logpm.basicdata.entity.BasicdataOpenIncomingSettingEntity; +import lombok.Data; + +@Data +public class BasicdataOpenIncomingSettingVO extends BasicdataOpenIncomingSettingEntity { + + private String warehouseName; + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataFactoryCategoryController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataFactoryCategoryController.java index 364ac363b..faf44a5e6 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataFactoryCategoryController.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataFactoryCategoryController.java @@ -28,7 +28,7 @@ public class BasicdataFactoryCategoryController extends BladeController { @ResponseBody @PostMapping("/pageList") @ApiOperationSupport(order = 1) - @ApiOperation(value = "提货单列表", notes = "传入basicdataFactoryCategoryDTO") + @ApiOperation(value = "工厂物料列表", notes = "传入basicdataFactoryCategoryDTO") public R pageList(@RequestBody BasicdataFactoryCategoryDTO basicdataFactoryCategoryDTO) { String method = "############pageList: "; log.info(method+"请求参数{}",basicdataFactoryCategoryDTO); @@ -40,8 +40,8 @@ public class BasicdataFactoryCategoryController extends BladeController { log.error(e.message,e); return R.fail(e.code,e.message); }catch (Exception e){ - log.error("############sendOrders: 系统异常",e); - return R.fail(500,"############sendOrders: 系统异常"); + log.error(method+"系统异常",e); + return R.fail(500,method+"系统异常"); } } @@ -49,7 +49,7 @@ public class BasicdataFactoryCategoryController extends BladeController { @ResponseBody @PostMapping("/save") @ApiOperationSupport(order = 1) - @ApiOperation(value = "提货单列表", notes = "传入basicdataFactoryCategoryDTO") + @ApiOperation(value = "新增工厂物料", notes = "传入basicdataFactoryCategoryDTO") public R save(@RequestBody BasicdataFactoryCategoryDTO basicdataFactoryCategoryDTO) { String method = "############save: "; log.info(method+"请求参数{}",basicdataFactoryCategoryDTO); @@ -59,8 +59,28 @@ public class BasicdataFactoryCategoryController extends BladeController { log.error(e.message,e); return R.fail(e.code,e.message); }catch (Exception e){ - log.error("############sendOrders: 系统异常",e); - return R.fail(500,"############sendOrders: 系统异常"); + log.error(method+"系统异常",e); + return R.fail(500,method+"系统异常"); + } + } + + @ResponseBody + @PostMapping("/remove") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "移除工厂物料", notes = "传入basicdataFactoryCategoryDTO") + public R remove(@RequestBody BasicdataFactoryCategoryDTO basicdataFactoryCategoryDTO) { + String method = "############remove: "; + log.info(method+"请求参数{}",basicdataFactoryCategoryDTO); + Long factoryCategoryId = basicdataFactoryCategoryDTO.getId(); + + try{ + return R.status(basicdataFactoryCategoryService.removeById(factoryCategoryId)); + }catch (CustomerException e){ + log.error(e.message,e); + return R.fail(e.code,e.message); + }catch (Exception e){ + log.error(method+"系统异常",e); + return R.fail(500,method+"系统异常"); } } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataOpenIncomingController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataOpenIncomingController.java new file mode 100644 index 000000000..066ae57a6 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataOpenIncomingController.java @@ -0,0 +1,109 @@ +package com.logpm.basicdata.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.logpm.basicdata.dto.BasicdataOpenIncomingDTO; +import com.logpm.basicdata.service.IBasicdataOpenIncomingSettingService; +import com.logpm.basicdata.vo.BasicdataOpenIncomingSettingVO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springblade.common.exception.CustomerException; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.StringUtil; +import org.springframework.web.bind.annotation.*; + +import java.util.Objects; + +@Slf4j +@RestController +@AllArgsConstructor +@RequestMapping("/openIncoming") +@Api(value = "开单及入库", tags = "开单及入库配置接口") +public class BasicdataOpenIncomingController { + + private final IBasicdataOpenIncomingSettingService basicdataOpenIncomingSettingService; + + @ResponseBody + @PostMapping("/pageList") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "开单及入库配置表", notes = "传入basicdataOpenIncomingDTO") + public R pageList(@RequestBody BasicdataOpenIncomingDTO basicdataOpenIncomingDTO) { + String method = "############pageList: "; + log.info(method+"请求参数{}",basicdataOpenIncomingDTO); + try{ + + IPage pages = basicdataOpenIncomingSettingService.pageList(basicdataOpenIncomingDTO); + return R.data(pages); + }catch (CustomerException e){ + log.error(e.message,e); + return R.fail(e.code,e.message); + }catch (Exception e){ + log.error(method+"系统异常",e); + return R.fail(500,method+"系统异常"); + } + } + + + @ResponseBody + @PostMapping("/addEntity") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "新增开单及入库配置", notes = "传入basicdataOpenIncomingDTO") + public R addEntity(@RequestBody BasicdataOpenIncomingDTO basicdataOpenIncomingDTO) { + String method = "############addEntity: "; + log.info(method+"请求参数{}",basicdataOpenIncomingDTO); + try{ + String brand = basicdataOpenIncomingDTO.getBrand(); + Long warehouseId = basicdataOpenIncomingDTO.getWarehouseId(); + if(StringUtil.isBlank(brand)){ + log.warn(method+"品牌不能为空"); + return R.fail(405,"品牌不能为空"); + } + if(Objects.isNull(warehouseId)){ + log.warn(method+"仓库不能为空"); + return R.fail(405,"仓库不能为空"); + } + + return basicdataOpenIncomingSettingService.addEntity(basicdataOpenIncomingDTO); + }catch (CustomerException e){ + log.error(e.message,e); + return R.fail(e.code,e.message); + }catch (Exception e){ + log.error(method+"系统异常",e); + return R.fail(500,method+"系统异常"); + } + } + + + @ResponseBody + @PostMapping("/remove") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "移除开单及入库配置", notes = "传入basicdataOpenIncomingDTO") + public R remove(@RequestBody BasicdataOpenIncomingDTO basicdataOpenIncomingDTO) { + String method = "############addEntity: "; + log.info(method+"请求参数{}",basicdataOpenIncomingDTO); + try{ + String brand = basicdataOpenIncomingDTO.getBrand(); + Long warehouseId = basicdataOpenIncomingDTO.getWarehouseId(); + if(StringUtil.isBlank(brand)){ + log.warn(method+"品牌不能为空"); + return R.fail(405,"品牌不能为空"); + } + if(Objects.isNull(warehouseId)){ + log.warn(method+"仓库不能为空"); + return R.fail(405,"仓库不能为空"); + } + + return basicdataOpenIncomingSettingService.addEntity(basicdataOpenIncomingDTO); + }catch (CustomerException e){ + log.error(e.message,e); + return R.fail(e.code,e.message); + }catch (Exception e){ + log.error(method+"系统异常",e); + return R.fail(500,method+"系统异常"); + } + } + + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataOpenIncomingDTO.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataOpenIncomingDTO.java new file mode 100644 index 000000000..453186a30 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataOpenIncomingDTO.java @@ -0,0 +1,12 @@ +package com.logpm.basicdata.dto; + +import com.logpm.basicdata.entity.BasicdataOpenIncomingSettingEntity; +import lombok.Data; + +@Data +public class BasicdataOpenIncomingDTO extends BasicdataOpenIncomingSettingEntity { + + private Integer pageSize; + private Integer pageNum; + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataOpenIncomingSettingMapper.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataOpenIncomingSettingMapper.java new file mode 100644 index 000000000..4d6acfe13 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataOpenIncomingSettingMapper.java @@ -0,0 +1,17 @@ +package com.logpm.basicdata.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.logpm.basicdata.dto.BasicdataOpenIncomingDTO; +import com.logpm.basicdata.entity.BasicdataOpenIncomingSettingEntity; +import com.logpm.basicdata.vo.BasicdataOpenIncomingSettingVO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +@Mapper +public interface BasicdataOpenIncomingSettingMapper extends BaseMapper { + + IPage pageList(IPage page, @Param("param") BasicdataOpenIncomingDTO basicdataOpenIncomingDTO); + + BasicdataOpenIncomingSettingEntity findEntityByParam(@Param("param") BasicdataOpenIncomingDTO basicdataOpenIncomingDTO); +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataOpenIncomingSettingMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataOpenIncomingSettingMapper.xml new file mode 100644 index 000000000..b71de652a --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataOpenIncomingSettingMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataOpenIncomingSettingService.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataOpenIncomingSettingService.java new file mode 100644 index 000000000..c89c27fe4 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataOpenIncomingSettingService.java @@ -0,0 +1,15 @@ +package com.logpm.basicdata.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.logpm.basicdata.dto.BasicdataOpenIncomingDTO; +import com.logpm.basicdata.entity.BasicdataOpenIncomingSettingEntity; +import com.logpm.basicdata.vo.BasicdataOpenIncomingSettingVO; +import org.springblade.core.mp.base.BaseService; +import org.springblade.core.tool.api.R; + +public interface IBasicdataOpenIncomingSettingService extends BaseService { + IPage pageList(BasicdataOpenIncomingDTO basicdataOpenIncomingDTO); + + R addEntity(BasicdataOpenIncomingDTO basicdataOpenIncomingDTO); + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataOpenIncomingSettingServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataOpenIncomingSettingServiceImpl.java new file mode 100644 index 000000000..7066fd147 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataOpenIncomingSettingServiceImpl.java @@ -0,0 +1,47 @@ +package com.logpm.basicdata.service.impl; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.logpm.basicdata.dto.BasicdataOpenIncomingDTO; +import com.logpm.basicdata.entity.BasicdataOpenIncomingSettingEntity; +import com.logpm.basicdata.mapper.BasicdataOpenIncomingSettingMapper; +import com.logpm.basicdata.service.IBasicdataOpenIncomingSettingService; +import com.logpm.basicdata.vo.BasicdataOpenIncomingSettingVO; +import lombok.AllArgsConstructor; +import lombok.extern.log4j.Log4j2; +import org.springblade.common.exception.CustomerException; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.core.tool.api.R; +import org.springframework.stereotype.Service; + +import java.util.Objects; + +@Service +@AllArgsConstructor +@Log4j2 +public class BasicdataOpenIncomingSettingServiceImpl extends BaseServiceImpl implements IBasicdataOpenIncomingSettingService { + @Override + public IPage pageList(BasicdataOpenIncomingDTO basicdataOpenIncomingDTO) { + IPage page = new Page<>(); + page.setCurrent(basicdataOpenIncomingDTO.getPageNum()); + page.setSize(basicdataOpenIncomingDTO.getPageSize()); + + IPage pageList = baseMapper.pageList(page,basicdataOpenIncomingDTO); + + return pageList; + } + + @Override + public R addEntity(BasicdataOpenIncomingDTO basicdataOpenIncomingDTO) { + + BasicdataOpenIncomingSettingEntity basicdataOpenIncomingSettingEntity = baseMapper.findEntityByParam(basicdataOpenIncomingDTO); + if(!Objects.isNull(basicdataOpenIncomingSettingEntity)){ + log.warn("############addEntity: 配置已存在"); + return R.fail(405,"配置已存在"); + } + + save(basicdataOpenIncomingDTO); + + return R.success("新增成功"); + } +} diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java index b38710aed..4e17a723c 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java @@ -4220,7 +4220,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl