Compare commits

..

No commits in common. "0a67e7dc502a55988cadc870e488aee14cba5e44" and "33b114bcd9875a721f77dd4f40c6f59e9dd0e32a" have entirely different histories.

6 changed files with 297 additions and 920 deletions

View File

@ -8,6 +8,7 @@ import com.wms.annotation.MyLog;
import com.wms.constants.enums.ResponseCode; import com.wms.constants.enums.ResponseCode;
import com.wms.entity.app.ResponseEntity; import com.wms.entity.app.ResponseEntity;
import com.wms.entity.app.dto.PageDto; import com.wms.entity.app.dto.PageDto;
import com.wms.entity.app.dto.StandDto;
import com.wms.entity.app.request.StandQuery; import com.wms.entity.app.request.StandQuery;
import com.wms.entity.app.vo.StandVo; import com.wms.entity.app.vo.StandVo;
import com.wms.entity.app.wcs.DdjStatusChangeRequest; import com.wms.entity.app.wcs.DdjStatusChangeRequest;
@ -65,9 +66,7 @@ public class StandController {
.like(StringUtils.isNotEmpty(standQuery.getStandId()), Stand::getStandId, standQuery.getStandId()) .like(StringUtils.isNotEmpty(standQuery.getStandId()), Stand::getStandId, standQuery.getStandId())
.eq(standQuery.getStandStatus() != null, Stand::getStandStatus, standQuery.getStandStatus()) .eq(standQuery.getStandStatus() != null, Stand::getStandStatus, standQuery.getStandStatus())
.eq(standQuery.getIsLock() != null, Stand::getIsLock, standQuery.getIsLock()) .eq(standQuery.getIsLock() != null, Stand::getIsLock, standQuery.getIsLock())
.eq(standQuery.getStandType() != null, Stand::getStandType, standQuery.getStandType()) .eq(standQuery.getStandType() != null, Stand::getStandType, standQuery.getStandType());
.eq(standQuery.getAllowMwl() != null, Stand::getAllowMwl, standQuery.getAllowMwl())
.eq(standQuery.getAllowMg() != null, Stand::getAllowMg, standQuery.getAllowMg());
Page<Stand> standPage = standService.page(page, lambdaQueryWrapper); Page<Stand> standPage = standService.page(page, lambdaQueryWrapper);
PageDto<StandVo> pageDto = PageDto.of(standPage, stand -> BeanUtil.copyProperties(stand, StandVo.class)); PageDto<StandVo> pageDto = PageDto.of(standPage, stand -> BeanUtil.copyProperties(stand, StandVo.class));
@ -113,8 +112,6 @@ public class StandController {
.set(request.getLastUseTime() != null, Stand::getLastUseTime, request.getLastUseTime()) .set(request.getLastUseTime() != null, Stand::getLastUseTime, request.getLastUseTime())
.set(request.getPickVehicleCount() != null, Stand::getPickVehicleCount, request.getPickVehicleCount()) .set(request.getPickVehicleCount() != null, Stand::getPickVehicleCount, request.getPickVehicleCount())
.set(request.getAllowNoPlan() != null, Stand::getAllowNoPlan, request.getAllowNoPlan()) .set(request.getAllowNoPlan() != null, Stand::getAllowNoPlan, request.getAllowNoPlan())
.set(request.getAllowMwl() != null, Stand::getAllowMwl, request.getAllowMwl())
.set(request.getAllowMg() != null, Stand::getAllowMg, request.getAllowMg())
.eq(Stand::getStandId, request.getStandId()); .eq(Stand::getStandId, request.getStandId());
if (standService.update(lambdaUpdateWrapper)) { if (standService.update(lambdaUpdateWrapper)) {
logger.info("更新站台信息成功。"); logger.info("更新站台信息成功。");

View File

@ -99,14 +99,4 @@ public class StandQuery extends PageQuery {
*/ */
@JsonProperty("allowNoPlan") @JsonProperty("allowNoPlan")
private Integer allowNoPlan; private Integer allowNoPlan;
/**
* 允许做装载机
*/
@JsonProperty("allowMwl")
private Integer allowMwl;
/**
* 允许做平地机
*/
@JsonProperty("allowMg")
private Integer allowMg;
} }

View File

@ -97,14 +97,4 @@ public class StandVo {
*/ */
@JsonProperty("allowNoPlan") @JsonProperty("allowNoPlan")
private Integer allowNoPlan; private Integer allowNoPlan;
/**
* 允许做装载机
*/
@JsonProperty("allowMwl")
private Integer allowMwl;
/**
* 允许做平地机
*/
@JsonProperty("allowMg")
private Integer allowMg;
} }

View File

@ -96,14 +96,4 @@ public class Stand {
*/ */
@TableField("allow_no_plan") @TableField("allow_no_plan")
private Integer allowNoPlan; private Integer allowNoPlan;
/**
* 允许做装载机
*/
@TableField("allow_mwl")
private Integer allowMwl;
/**
* 允许做平地机
*/
@TableField("allow_mg")
private Integer allowMg;
} }

View File

@ -28,6 +28,4 @@ public interface IWorkService {
* 分配工作 * 分配工作
*/ */
void distributeWorks(); void distributeWorks();
void distributeWorksMethod2();
} }