diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java index 48d66a2be..a275ed0da 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java @@ -418,11 +418,11 @@ public class IoCollectOrderController extends BaseController { */ @PostMapping("/udiwms/basic/collect/order/bizConfirm") @Transactional(rollbackFor = Exception.class) - public BaseResponse bizConfirmOrder(@RequestBody CollectOrderRequest collectOrderRequest) { + public BaseResponse bizConfirmOrder(@RequestBody IoCollectOrderBiz confirmOrderBiz) { /** * 取货确认 */ - splitCodeService.confirmBizAutiTagCode(collectOrderRequest); + splitCodeService.confirmBizAutiTagCode(confirmOrderBiz); return ResultVOUtils.success("确认成功!"); } diff --git a/src/main/java/com/glxp/api/controller/inv/InvPreinOrderController.java b/src/main/java/com/glxp/api/controller/inv/InvPreinOrderController.java index a15058644..8a1a77732 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvPreinOrderController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvPreinOrderController.java @@ -19,6 +19,7 @@ import com.glxp.api.res.inv.InvPreinDetailResponse; import com.glxp.api.res.inv.InvPreinOrderResponse; import com.glxp.api.service.auth.InvWarehouseService; import com.glxp.api.service.basic.IBasicBussinessTypeService; +import com.glxp.api.service.inout.IoCodeTempService; import com.glxp.api.service.inout.impl.IoCodeService; import com.glxp.api.service.inv.InvPreinDetailService; import com.glxp.api.service.inv.InvPreinOrderService; diff --git a/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java b/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java index 094b9946a..7a8802331 100644 --- a/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java +++ b/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java @@ -159,6 +159,6 @@ public class CollectOrderBizResponse { private boolean splitUnCheck; - + private Boolean getConfirm; } diff --git a/src/main/java/com/glxp/api/service/collect/RelCodeDetailService.java b/src/main/java/com/glxp/api/service/collect/RelCodeDetailService.java index 36fd0344c..797df1e56 100644 --- a/src/main/java/com/glxp/api/service/collect/RelCodeDetailService.java +++ b/src/main/java/com/glxp/api/service/collect/RelCodeDetailService.java @@ -15,6 +15,7 @@ import com.glxp.api.util.udi.FilterUdiUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.Collections; import java.util.Currency; import java.util.List; @@ -129,4 +130,29 @@ public class RelCodeDetailService extends ServiceImpl getAllNext(String code) { + List list = new ArrayList<>(); + fetchAllChildren(code, list); + return list; + } + + private void fetchAllChildren(String code, List list) { + List relCodeDetails = this.baseMapper.selectList( + new LambdaQueryWrapper().eq(RelCodeDetail::getParentCode, code)); + + if (CollUtil.isNotEmpty(relCodeDetails)) { + list.addAll(relCodeDetails); + for (RelCodeDetail relCodeDetail : relCodeDetails) { + fetchAllChildren(relCodeDetail.getCurCode(), list); + } + } + } + + } diff --git a/src/main/java/com/glxp/api/service/forthird/impl/ForThirdSysApiService.java b/src/main/java/com/glxp/api/service/forthird/impl/ForThirdSysApiService.java index 6900d80a2..d496e3a3a 100644 --- a/src/main/java/com/glxp/api/service/forthird/impl/ForThirdSysApiService.java +++ b/src/main/java/com/glxp/api/service/forthird/impl/ForThirdSysApiService.java @@ -33,6 +33,7 @@ import com.glxp.api.service.basic.UdiRelevanceService; import com.glxp.api.service.basic.UdiRlSupService; import com.glxp.api.service.inout.IoAddInoutService; import com.glxp.api.service.inout.IoCheckInoutService; +import com.glxp.api.service.inout.IoCodeTempService; import com.glxp.api.service.inout.IoOrderService; import com.glxp.api.service.inout.impl.IoCodeService; import com.glxp.api.service.inv.impl.InvProductService; diff --git a/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java b/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java index 435b95b14..af5190791 100644 --- a/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java +++ b/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java @@ -380,14 +380,13 @@ public class IoSplitCodeService extends ServiceImpl SELECT icob.*, - bp.nameCode diCode, + bp.nameCode diCode, bp.zczbhhzbapzbh, bp.manufactory, bp.bzgg @@ -35,6 +35,7 @@ group by icob.id + ORDER BY icob.getConfirm, icob.id desc diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index d398d8cbf..48348cd74 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -4669,7 +4669,7 @@ CALL Pro_Temp_ColumnWork('sys_workplace_queue', 'freightCode', CALL Pro_Temp_ColumnWork('io_collect_order_biz', 'getConfirm', - ' tinyint NULL DEFAULT b''1''COMMENT ''取货确认状态''', + ' tinyint NULL DEFAULT b''0''COMMENT ''取货确认状态''', 1);