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