diff --git a/src/main/java/com/yem/wm/es/shippingdetails/validator/ShippingDetailSubmitValidator.java b/src/main/java/com/yem/wm/es/shippingdetails/validator/ShippingDetailSubmitValidator.java index 841cb307..97352b7b 100644 --- a/src/main/java/com/yem/wm/es/shippingdetails/validator/ShippingDetailSubmitValidator.java +++ b/src/main/java/com/yem/wm/es/shippingdetails/validator/ShippingDetailSubmitValidator.java @@ -24,23 +24,26 @@ public class ShippingDetailSubmitValidator extends AbstractValidator { ExtendedDataEntity[] dataEntities = this.getDataEntities(); for(ExtendedDataEntity dataEntitie : dataEntities){ DynamicObject dataEntity = dataEntitie.getDataEntity(); + long aLong = dataEntity.getLong("yem_sourcebillid"); + String selectfield = DynamicObjectUtil.getSelectfields("yem_es_salesorder", false); + String selectfields = DynamicObjectUtil.getEntrySelectfields(selectfield, "yem_es_salesorder", "yem_es_materialinfo", false); + DynamicObject yemEsSaleorder = BusinessDataServiceHelper.loadSingle("yem_es_salesorder", selectfields, new QFilter[]{new QFilter("id", QCP.equals, aLong)}); DynamicObjectCollection materialInfos = dataEntity.getDynamicObjectCollection("yem_es_materialinfo"); - String billtype = dataEntity.getString("yem_billtype.number"); +// String billtype = dataEntity.getString("yem_billtype.number"); // if("yem_shippingdetails_zj".equals(billtype)||"yem_shippingdetails_nmzj".equals(billtype)){ -// for (int i = 0; i < materialInfos.size(); i++) { -// DynamicObject materialInfo = materialInfos.get(i); + for (int i = 0; i < materialInfos.size(); i++) { + DynamicObject materialInfo = materialInfos.get(i); // String businesssort = materialInfo.getString("yem_businesssort"); // if ("Z".equals(businesssort)){ -// BigDecimal qty = materialInfo.getBigDecimal("yem_qty"); -// DynamicObject resourceNog = materialInfo.getDynamicObject("yem_resourcenog"); -// String resourceNogNumber = YEM.isNotEmpty(resourceNog)?resourceNog.getString("number"):""; -// DynamicObjectCollection completeProductions = materialInfo.getDynamicObjectCollection("yem_es_salesorder_z"); + BigDecimal qty = materialInfo.getBigDecimal("yem_qty"); + DynamicObject resourceNog = materialInfo.getDynamicObject("yem_resourcenog"); + DynamicObjectCollection completeProductions = materialInfo.getDynamicObjectCollection("yem_es_salesorder_z"); // int completeProductionRows = completeProductions.size(); // if(qty.compareTo(new BigDecimal(completeProductionRows)) != 0){ -// this.addErrorMessage(dataEntitie,String.format("明细信息第%s行%s资源号的出运数量与对应的整机数量不一致,请检查数据后,点击保存,在点击提交!!",i+1,resourceNogNumber)); +// this.addErrorMessage(dataEntitie,"明细信息第%s行%s资源号的出运数量与对应的整机数量不一致,请检查数据后,点击保存,在点击提交!!"); // } // } -// } + } // } vehicleNoSingle(dataEntitie); validateTaxRefundRate(dataEntitie);