8/27 字段调整

workplace
wangwei 11 months ago
parent 75d81b507f
commit 8dd7213182

@ -1,5 +1,6 @@
package com.glxp.api.controller.collect;
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;
@ -41,6 +42,11 @@ public class IoCollectCodeController extends BaseController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
List<IoCollectCodeResponse> collectOrderCodeManResponses = collectCodeService.filterList(IoCollectCodeRequest);
for (IoCollectCodeResponse ioCollectCodeResponse : collectOrderCodeManResponses){
if (StrUtil.isEmpty(ioCollectCodeResponse.getManufactory())) {
ioCollectCodeResponse.setManufactory(ioCollectCodeResponse.getYlqxzcrbarmc());
}
}
PageInfo<IoCollectCodeResponse> pageInfo = new PageInfo<>(collectOrderCodeManResponses);
PageSimpleResponse<IoCollectCodeResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());

@ -46,6 +46,9 @@ public class IoSplitFifoInvController extends BaseController {
if (StrUtil.isEmpty(ioSplitCodeResponse.getMeasname())) {
ioSplitCodeResponse.setMeasname(ioSplitCodeResponse.getUseLevelUnit());
}
if (StrUtil.isEmpty(ioSplitCodeResponse.getManufactory())) {
ioSplitCodeResponse.setManufactory(ioSplitCodeResponse.getYlqxzcrbarmc());
}
}
PageInfo<IoSplitInvResponse> pageInfo = new PageInfo<>(splitCodeEntities);
PageSimpleResponse<IoSplitInvResponse> pageSimpleResponse = new PageSimpleResponse<>();

@ -98,10 +98,11 @@ public class IoCollectCodeResponse {
private String workplaceName;
private String busTypeName;
// private String nameCode;
private String nameCode;
private String cpmctymc;
private String ggxh;
private String zczbhhzbapzbh;
private String manufactory;
private String ylqxzcrbarmc;
}

@ -122,6 +122,7 @@ public class IoSplitInvResponse {
private String zxxsdycpbs;
private String bzgg;
private String useLevelUnit;
private String nameCode;
private Integer remindState;

@ -8,6 +8,7 @@
bp.cpmctymc,
COALESCE(bp.ggxh, bp.bzgg) AS ggxh,
bp.zczbhhzbapzbh,
bp.ylqxzcrbarmc,
bp.manufactory
from io_collect_code icc
left join sys_workplace sw on sw.workplaceId = icc.workPlaceCode

@ -34,6 +34,7 @@
bp.bzgg,
bu.useLevelUnit,
bp.ylqxzcrbarmc,
bp.nameCode,
bp.manufactory,
bp.measname,
bp.zczbhhzbapzbh,

Loading…
Cancel
Save