From 92bc5df34e405cf295a6506dec5ff30799e9f8a0 Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Wed, 31 Aug 2022 11:03:32 +0800
Subject: [PATCH] =?UTF-8?q?bug=E6=94=B6=E5=B0=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../glxp/sale/admin/controller/inout/StockOrderController.java | 2 +-
 .../glxp/sale/admin/controller/inout/WareHouseController.java  | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java
index 70b2919..3e31e59 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java
@@ -434,7 +434,7 @@ public class StockOrderController {
                                 supplementCode.setFromCorp(originOrder.getFromCorp());
                                 supplementCode.setLocStorageCode(originOrder.getLocStorageCode());
                                 supplementCode.setInvWarehouseCode(originOrder.getInvWarehouseCode());
-                                supplementCode.setOrderId(supplementOrderNo);
+                                supplementCode.setOrderId(originOrder.getId());
                                 //查询补单设置
                                 supplementCode.setAction(originOrder.getAction());
                                 supplementCode.setMainAction(originOrder.getMainAction());
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java
index aa273e6..16ab2e2 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java
@@ -606,9 +606,9 @@ public class WareHouseController {
         String code = addOrderRequest.getCode();
         if (StringUtils.isBlank(code)) return ResultVOUtils.error(ResultEnum.DATA_ERROR);
         UdiEntity udiEntity = FilterUdiUtils.getUdi(code);
+
         if (udiEntity == null)
             return ResultVOUtils.error(500, "无效条码！");
-
         if (StrUtil.isNotEmpty(addOrderRequest.getBatchNo())) {
             udiEntity.setBatchNo(addOrderRequest.getBatchNo());
         }
@@ -637,7 +637,6 @@ public class WareHouseController {
             return ResultVOUtils.error(500, "批次号不能为空！");
         }
         String orderId = addOrderRequest.getOrderId();
-//        String isCheck = systemParamConfigService.selectValueByParamKey("code_fill_check");
 
         //三期校验
         if (addOrderRequest.isCodeFillCheck()) {