bug收尾

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());

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()) {