diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java index 6396be032..0e1d2841c 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java @@ -16,6 +16,8 @@ import com.glxp.api.constant.Constant; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.dao.auth.InvWarehouseDao; import com.glxp.api.dao.basic.SysWorkplaceBusMapper; +import com.glxp.api.dao.collect.IoCollectCodeBackMapper; +import com.glxp.api.dao.collect.IoCollectCodeMapper; import com.glxp.api.dao.collect.IoCollectOrderBackupMapper; import com.glxp.api.dao.inout.IoCodeTempDao; import com.glxp.api.entity.auth.AuthAdmin; @@ -49,6 +51,7 @@ import com.glxp.api.service.inout.IoOrderService; import com.glxp.api.service.system.SystemParamConfigService; import com.glxp.api.util.*; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; @@ -136,7 +139,8 @@ public class IoCollectOrderBackupService extends ServiceImpl().eq("billNo", collectOrder.getBillNo())); } - + @Resource + private IoCollectCodeBackMapper ioCollectCodeBackMapper; public List combieOrderDetail(CollectOrderBizRequest collectOrderBizRequest) { List list = ioCollectOrderBizBackupService.filterList(collectOrderBizRequest); @@ -167,6 +171,18 @@ public class IoCollectOrderBackupService extends ServiceImpl ioCollectCodeBackupList = ioCollectCodeBackMapper.selectList(new QueryWrapper() + .eq("billNo",collectOrderBizRequest.getOrderIdFk()) + ); + if(CollUtil.isNotEmpty(ioCollectCodeBackupList)){ + for (IoCollectCodeBackup ioCollectCodeBackup : ioCollectCodeBackupList) { + collectOrderBizResponse.setFinishUdiCode(StrUtil.trimToEmpty(collectOrderBizResponse.getSplitUdiCode()) + "," + ioCollectCodeBackup.getCode()); + } + + } + } collectOrderBizResponses.add(collectOrderBizResponse); }