From 4922ea0f6e2b48b2e6d5ad0c757946b7a025525c Mon Sep 17 00:00:00 2001 From: songxiaopeng <1393756821@qq.com> Date: Thu, 16 May 2024 14:25:10 +0800 Subject: [PATCH] =?UTF-8?q?update=EF=BC=9A=E4=BF=AE=E6=94=B9=E8=B4=B4?= =?UTF-8?q?=E6=A0=87=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../acs/service/impl/AcsToWmsServiceImpl.java | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index a6af9e1..2f0081e 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -527,25 +527,20 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { String singleWeightStr = baseMaterial.getSingle_weight(); BigDecimal singleWeight = BigDecimal.valueOf(Double.parseDouble(singleWeightStr)); BigDecimal totalWeight = singleWeight.multiply(BigDecimal.valueOf(groupInfo.getMaterial_qty())); - // 获取工单 - PdmBdWorkorder workorder = workorderService.selectApplyLabelInfo(groupInfo.getWorkorder_code()); - if (null == workorder){ - return ApplyTaskResponse.responseError(requestNo, "未查询到工单信息!"); - } - MdCsCustomerbase customerbase = mdCsCustomerbaseService.getById(workorder.getCustomer()); + MdCsCustomerbase customerbase = mdCsCustomerbaseService.getById(groupInfo.getCustomer()); if (null == customerbase){ return ApplyTaskResponse.responseError(requestNo, "未查询到客户信息!"); } // 组合 sb.append(customerbase.getCust_name()).append("##") - .append(workorder.getMaterial_name()).append("##") - .append(workorder.getMaterial_spec()).append("##") - .append(workorder.getMaterial_code()).append("##") + .append(baseMaterial.getMaterial_name()).append("##") + .append(baseMaterial.getMaterial_spec()).append("##") + .append(baseMaterial.getMaterial_code()).append("##") .append(singleWeight).append("##") .append(groupInfo.getMaterial_qty()).append("##") .append(totalWeight).append("##") - .append(workorder.getProduct_code()).append("##") - .append(workorder.getMaterial_model()).append("##") + .append(baseMaterial.getProduct_code()).append("##") + .append(baseMaterial.getMaterial_model()).append("##") .append(DateUtil.format(DateUtil.parse(DateUtil.today()), "yyyy/MM/dd")); return ApplyTaskResponse.responseOk(requestNo, sb.toString()); }