From 5987bf561f6a83bbcae8cab88273ebcc99f37493 Mon Sep 17 00:00:00 2001 From: x_z Date: Mon, 18 Jul 2022 16:10:44 +0800 Subject: [PATCH] =?UTF-8?q?1.=E9=80=89=E6=8B=A9=E4=B8=9A=E5=8A=A1=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=E6=A0=A1=E9=AA=8C=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=BD=93?= =?UTF-8?q?=E5=89=8D=E5=88=86=E5=BA=93=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/inout/OrderDetailController.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderDetailController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderDetailController.java index db86e57..57f010a 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderDetailController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderDetailController.java @@ -9,8 +9,6 @@ import com.glxp.sale.admin.controller.inout.utils.ContrastErpUtil; import com.glxp.sale.admin.controller.inout.utils.DataTransUtil; import com.glxp.sale.admin.entity.auth.AuthAdmin; import com.glxp.sale.admin.entity.basic.BussinessTypeEntity; -import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity; -import com.glxp.sale.admin.entity.info.CompanyEntity; import com.glxp.sale.admin.entity.inout.*; import com.glxp.sale.admin.entity.param.SystemParamConfigEntity; import com.glxp.sale.admin.entity.thrsys.ThrOrderDetailEntity; @@ -426,8 +424,6 @@ public class OrderDetailController { @AuthRuleAnnotation("") @PostMapping("/warehouse/selectErpOrder") public BaseResponse selectErpOrder(@RequestBody ImportErpOrderRequest importErpOrderRequest, BindingResult bindingResult) { - - if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } @@ -482,6 +478,9 @@ public class OrderDetailController { return ResultVOUtils.error(500, "所选业务单据当前仓库不一致!"); } + if (!temp.getInvWarehouseCode().equals(erpOrderEntities.get(i).getInvWarehouseCode())) { + return ResultVOUtils.error(500, "所选业务单据当前分库不一致!"); + } if (!temp.getInvWarehouseCode().equals(erpOrderEntities.get(i).getInvWarehouseCode())) { return ResultVOUtils.error(500, "所选业务单据当前分库不一致!"); @@ -491,7 +490,6 @@ public class OrderDetailController { return ResultVOUtils.error(500, "所选单据类型不一致!"); } - }