|
|
|
@ -6,13 +6,16 @@ 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.controller.BaseController;
|
|
|
|
|
import com.glxp.api.entity.collect.IoCollectOrder;
|
|
|
|
|
import com.glxp.api.req.collect.CollectOrderCodeManRequest;
|
|
|
|
|
import com.glxp.api.req.collect.IoCollectCodeRequest;
|
|
|
|
|
import com.glxp.api.res.PageSimpleResponse;
|
|
|
|
|
import com.glxp.api.res.collect.CollectOrderCodeManResponse;
|
|
|
|
|
import com.glxp.api.res.collect.IoCollectCodeResponse;
|
|
|
|
|
import com.glxp.api.service.collect.IoCollectCodeService;
|
|
|
|
|
import com.glxp.api.service.collect.IoCollectOrderService;
|
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
|
import org.apache.poi.ss.formula.functions.Offset;
|
|
|
|
|
import org.springframework.validation.BindingResult;
|
|
|
|
|
import org.springframework.web.bind.annotation.GetMapping;
|
|
|
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
|
@ -29,6 +32,9 @@ public class IoCollectCodeController extends BaseController {
|
|
|
|
|
@Resource
|
|
|
|
|
IoCollectCodeService collectCodeService;
|
|
|
|
|
|
|
|
|
|
@Resource
|
|
|
|
|
IoCollectOrderService collectOrderService;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 追溯码查询
|
|
|
|
|
* @param
|
|
|
|
@ -46,6 +52,11 @@ public class IoCollectCodeController extends BaseController {
|
|
|
|
|
if (StrUtil.isEmpty(ioCollectCodeResponse.getManufactory())) {
|
|
|
|
|
ioCollectCodeResponse.setManufactory(ioCollectCodeResponse.getYlqxzcrbarmc());
|
|
|
|
|
}
|
|
|
|
|
IoCollectOrder byBillNo = collectOrderService.getByBillNo(ioCollectCodeResponse.getBillNo());
|
|
|
|
|
ioCollectCodeResponse.setBillTime(byBillNo.getBillTime());
|
|
|
|
|
if (byBillNo.getRemark() != null){
|
|
|
|
|
ioCollectCodeResponse.setRemark(byBillNo.getRemark());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
PageInfo<IoCollectCodeResponse> pageInfo = new PageInfo<>(collectOrderCodeManResponses);
|
|
|
|
|
PageSimpleResponse<IoCollectCodeResponse> pageSimpleResponse = new PageSimpleResponse<>();
|
|
|
|
|