diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index 49a2c558d..a8b528523 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -35,6 +35,7 @@ import com.glxp.api.res.inout.AddCodeResult; import com.glxp.api.res.inout.AddEnterCodeResponse; import com.glxp.api.res.inout.IoCodeTempResponse; import com.glxp.api.res.inout.VailCodeResultResponse; +import com.glxp.api.res.sync.SpsSyncOrderResponse; import com.glxp.api.service.auth.InvWarehouseService; import com.glxp.api.service.auth.SysWorkplaceService; import com.glxp.api.service.basic.*; @@ -258,10 +259,17 @@ public class IoCodeTempController extends BaseController { response.setData(collectOrder); return response; } else if (addEnterCodeRequest.getBusType().startsWith("SC")) { - BaseResponse baseResponse2 = collectOrderService.importSpmsUdi(collectOrderRequest); + BaseResponse baseResponse2 = collectOrderService.importSpmsUdi(collectOrderRequest); if (baseResponse2.getCode() == 20000) { collectOrder = collectOrderService.unionSearch(null, null, code); //=============================================// + SpsSyncOrderResponse data = baseResponse2.getData(); + List orderEntities = data.getOrderEntities(); + + if (collectOrder == null && CollUtil.isNotEmpty(orderEntities)) { + collectOrder = collectOrderService.unionSearch(null, null, orderEntities.get(0).getBillNo()); + } + if (collectOrder != null) { collectOrder.setWorkPlaceCode(addEnterCodeRequest.getWorkPlaceCode()); collectOrder.setBusType(addEnterCodeRequest.getBusType()); diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java index 424e804c2..6e8b9a7fa 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java @@ -397,10 +397,12 @@ public class IoCollectOrderService extends ServiceImpl