server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformGroupCloudController.java
@@ -35,6 +35,7 @@ @PostMapping("/create") @CloudRequiredPermission("business:platformgroup:create") public ApiResponse create(@RequestBody PlatformGroup platformGroup,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){ platformGroup.setLoginUserInfo(this.getLoginUser(token)); return ApiResponse.success(platformGroupService.create(platformGroup)); } @@ -42,7 +43,7 @@ @GetMapping("/delete/{id}") @CloudRequiredPermission("business:platformgroup:delete") public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){ platformGroupService.deleteById(id); platformGroupService.deleteById(id,this.getLoginUser(token)); return ApiResponse.success(null); } @@ -50,7 +51,7 @@ @GetMapping("/delete/batch") @CloudRequiredPermission("business:platformgroup:delete") public ApiResponse deleteByIdInBatch(@RequestParam String ids,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){ platformGroupService.deleteByIdInBatch(this.getIdList(ids)); platformGroupService.deleteByIdInBatch(this.getIdList(ids),this.getLoginUser(token)); return ApiResponse.success(null); } @@ -58,6 +59,7 @@ @PostMapping("/updateById") @CloudRequiredPermission("business:platformgroup:update") public ApiResponse updateById(@RequestBody PlatformGroup platformGroup,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){ platformGroup.setLoginUserInfo(this.getLoginUser(token)); platformGroupService.updateById(platformGroup); return ApiResponse.success(null); } server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformGroup.java
@@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.doumee.core.annotation.excel.ExcelColumn; import com.doumee.core.model.LoginUserModel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import com.baomidou.mybatisplus.annotation.IdType; @@ -20,7 +21,7 @@ @Data @ApiModel("月台_分组信息表") @TableName("`platform_group`") public class PlatformGroup { public class PlatformGroup extends LoginUserModel { @TableId(type = IdType.AUTO) @ApiModelProperty(value = "主键", example = "1") server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java
@@ -113,6 +113,9 @@ @ApiModelProperty(value = "最近分配月台编码（关联platform)", example = "1") @ExcelColumn(name="最近分配月台编码（关联platform)") private Integer platformId; @ApiModelProperty(value = "月台分组编码（关联platform_group)", example = "1") @ExcelColumn(name="月台分组编码（关联platform_group)") private Integer platformGroupId; @ApiModelProperty(value = "通知入园等待时间") @ExcelColumn(name="通知入园等待时间") @@ -138,17 +141,14 @@ @ApiModelProperty(value = "开始作业时间") @ExcelColumn(name="开始作业时间") private Date startDate; @ApiModelProperty(value = "作业完成时间（最终时间）") @ExcelColumn(name="作业完成时间（最终时间）") private Date doneDate; @ApiModelProperty(value = "异常挂起时间") @ExcelColumn(name="异常挂起时间") private Date errorDate; @ApiModelProperty(value = "异常挂起人编码", example = "1") @@ -208,7 +208,6 @@ @ApiModelProperty(value = "车辆进厂下发时间") @ExcelColumn(name="车辆进厂下发时间") private Date inHkdate; @ApiModelProperty(value = "作业类型 0自有车卸货 1自有车装货 2外协车卸货 3外协车装货 4市公司外协车卸货", example = "1") @@ -233,7 +232,6 @@ @ApiModelProperty(value = "作废时间") @ExcelColumn(name="作废时间") private Date cancelDate; @ApiModelProperty(value = "作废处理人编码", example = "1") server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformGroupService.java
@@ -27,6 +27,7 @@ * @param id 主键 */ void deleteById(Integer id); void deleteById(Integer id,LoginUserInfo user); /** * 删除 @@ -41,6 +42,7 @@ * @param ids 主键集 */ void deleteByIdInBatch(List<Integer> ids); void deleteByIdInBatch(List<Integer> ids,LoginUserInfo user); /** * 主键更新 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformGroupServiceImpl.java
@@ -1,5 +1,7 @@ package com.doumee.service.business.impl; import com.doumee.core.constants.ResponseStatus; import com.doumee.core.exception.BusinessException; import com.doumee.core.model.LoginUserInfo; import com.doumee.core.model.PageData; import com.doumee.core.model.PageWrap; @@ -21,6 +23,7 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import java.util.Date; import java.util.List; import java.util.Objects; import java.util.stream.Collectors; @@ -44,13 +47,43 @@ @Override public Integer create(PlatformGroup platformGroup) { if(platformGroup.getType() ==null || platformGroup.getType()>2 || platformGroup.getType()<0){ throw new BusinessException(ResponseStatus.BAD_REQUEST); } if(platformGroupMapper.selectCount(new QueryWrapper<PlatformGroup>().lambda() .eq(PlatformGroup::getIsdeleted,Constants.ZERO) .eq(PlatformGroup::getType,platformGroup.getType()) )>0){ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，该类型分组已经创建，请返回刷新页面查看！"); } platformGroup.setIsdeleted(Constants.ZERO); platformGroup.setCreator(platformGroup.getLoginUserInfo().getId()); platformGroup.setCreateDate(new Date()); platformGroup.setEditDate(platformGroup.getEditDate()); platformGroup.setEditor(platformGroup.getCreator()); platformGroupMapper.insert(platformGroup); return platformGroup.getId(); } @Override public void deleteById(Integer id) { platformGroupMapper.deleteById(id); PlatformGroup param = new PlatformGroup(); param.setId(id); param.setIsdeleted(Constants.ONE); platformGroupMapper.updateById(param); } @Override public void deleteById(Integer id,LoginUserInfo user) { // platformGroupMapper.deleteById(id); PlatformGroup param = new PlatformGroup(); param.setId(id); param.setIsdeleted(Constants.ONE); param.setEditor(user.getId()); param.setEditDate(new Date()); platformGroupMapper.updateById(param); } @Override @@ -64,11 +97,36 @@ if (CollectionUtils.isEmpty(ids)) { return; } platformGroupMapper.deleteBatchIds(ids); for(Integer id : ids){ deleteById(id); } } @Override public void deleteByIdInBatch(List<Integer> ids,LoginUserInfo user) { if (CollectionUtils.isEmpty(ids)) { return; } for(Integer id : ids){ deleteById(id,user); } } @Override public void updateById(PlatformGroup platformGroup) { if(platformGroup.getType() ==null || platformGroup.getType()>2 || platformGroup.getType()<0){ throw new BusinessException(ResponseStatus.BAD_REQUEST); } if(platformGroupMapper.selectCount(new QueryWrapper<PlatformGroup>().lambda() .eq(PlatformGroup::getIsdeleted,Constants.ZERO) .eq(PlatformGroup::getType,platformGroup.getType()) .ne(PlatformGroup::getId,platformGroup.getId()) )>0){ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，该类型分组已经创建，请返回刷新页面查看！"); } platformGroup.setEditDate(platformGroup.getEditDate()); platformGroup.setEditor(platformGroup.getCreator()); platformGroupMapper.updateById(platformGroup); }
@@ -397,16 +397,7 @@ platform.setSignJobList(platformJobSignInList); platform.setWorkJobList(platformJobWorkList); } lineUpVO.setPlatformList(platformList); return lineUpVO; }
@@ -6,14 +6,8 @@ import com.doumee.core.wms.model.request.*; import com.doumee.core.wms.model.response.WmsBaseDataResponse; import com.doumee.core.wms.model.response.WmsBaseResponse; import com.doumee.dao.business.CarsMapper; import com.doumee.dao.business.PlatformJobMapper; import com.doumee.dao.business.PlatformWmsDetailMapper; import com.doumee.dao.business.PlatformWmsJobMapper; import com.doumee.dao.business.model.Cars; import com.doumee.dao.business.model.PlatformJob; import com.doumee.dao.business.model.PlatformWmsDetail; import com.doumee.dao.business.model.PlatformWmsJob; import com.doumee.dao.business.*; import com.doumee.dao.business.model.*; import com.doumee.service.business.WmsService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -33,6 +27,8 @@ public class WmsServiceImpl implements WmsService { @Autowired private PlatformWmsJobMapper platformWmsJobMapper; @Autowired private PlatformGroupMapper platformGroupMapper; @Autowired private CarsMapper carsMapper; @Autowired @@ -68,6 +64,7 @@ .last("limit 1" )); if(job == null){ PlatformJob model =dealJobBizInbound(param); job = new PlatformWmsJob(); job.setCreateDate(new Date()); @@ -146,6 +143,11 @@ job.setStatus(Constants.PlatformJobStatus.WAIT_CALL.getKey());//在园无作业状态，则自动【已签到】处理 } } PlatformGroup group = platformGroupMapper.selectOne(new QueryWrapper<PlatformGroup>().lambda() .eq(PlatformGroup::getIsdeleted,Constants.ZERO) .eq(PlatformGroup::getType,Constants.ONE) .last("limit 1") );//查询卸货月台组编码 job.setPlatformGroupId(group!=null?group.getId():null); platformJobMapper.insert(job); return job; } @@ -170,6 +172,11 @@ job.setStatus(Constants.PlatformJobStatus.WAIT_CALL.getKey());//在园无作业状态，则自动【已签到】处理 } } PlatformGroup group = platformGroupMapper.selectOne(new QueryWrapper<PlatformGroup>().lambda() .eq(PlatformGroup::getIsdeleted,Constants.ZERO) .eq(PlatformGroup::getType,Constants.ZERO) .last("limit 1") );//查询装货月台组编码 job.setPlatformGroupId(group!=null?group.getId():null); platformJobMapper.insert(job); return job; }
