From c97f3749dd259fe497e13fc8a053b33ecbd83b13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=80=A1=E8=93=89?= <377046077@qq.com> Date: Fri, 12 Dec 2025 11:08:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E6=8C=81=E6=9C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/service/impl/ToWmsServiceImpl.java | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java index fce5b39..3833af6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java @@ -136,8 +136,8 @@ public class ToWmsServiceImpl implements IToWmsService { BasProduct basProduct = basProducts.get(0); - //todo 根据包装方式 主要包装方式 描述 长 宽 高 包装材积 - int size = getSize(basProduct); + + int size = Convert.toInt(basProduct.getSpare10()); //超大托盘不处理 直接返回 if (size == 5) { @@ -284,16 +284,7 @@ public class ToWmsServiceImpl implements IToWmsService { /** * 根据包装方式 主要包装方式 描述 长 宽 高 包装材积获取大小 */ - private int getSize(BasProduct basProduct) { - String remark = basProduct.getRemark(); - String packageType = basProduct.getSpare34(); - String mainPackageType = basProduct.getSpare35(); - String length = basProduct.getSpare36(); - String width = basProduct.getSpare37(); - String height = basProduct.getSpare38(); - String volume = basProduct.getSpare39(); - return 1; - } + @Override public AjaxResult selectMydoJobByEntranceId(RequestEnter requestEnter) { @@ -311,7 +302,7 @@ public class ToWmsServiceImpl implements IToWmsService { String productId = mydoJobDetail.getProductId(); BasProduct basProduct = basProductService.selectBasProductByProductId(productId); - int size = getSize(basProduct); + int size = Convert.toInt(basProduct.getSpare10()); //超大托盘不处理 直接返回 if (size == 5) { return new AjaxResult(3, "超大托盘"); @@ -475,7 +466,7 @@ public class ToWmsServiceImpl implements IToWmsService { BasProduct basProduct = basProducts.get(0); //根据包装方式 主要包装方式 描述 长 宽 高 包装材积 - int size = getSize(basProduct); + int size = Convert.toInt(basProduct.getSpare10()); //超大托盘不处理 直接返回 if (size == 5) {