diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/MaterialInBillSubmitValidatorOp.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/MaterialInBillSubmitValidatorOp.java index 50154e6..7695bdf 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/MaterialInBillSubmitValidatorOp.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/MaterialInBillSubmitValidatorOp.java @@ -60,11 +60,12 @@ public class MaterialInBillSubmitValidatorOp extends AbstractOperationServicePlu boolean hasNonSpecialInvoice = false; for (DynamicObject entryEntity : entryEntityCollection) { DynamicObject invoice = entryEntity.getDynamicObject("zcgj_invoice"); // 发票号码 + boolean zcgj_freight_invoice = entryEntity.getBoolean("zcgj_freight_invoice");//运费发票 if (invoice == null) continue; DynamicObject invoiceTypeId = invoice.getDynamicObject("invoicetypeid"); // 发票类型 if (invoiceTypeId == null) continue; String invoiceTypeIdName = invoiceTypeId.getString("name"); - if (!invoiceTypeIdName.contains("专")) { + if (!invoiceTypeIdName.contains("专") && !zcgj_freight_invoice) { hasNonSpecialInvoice = true; for (DynamicObject entryEntity2 : entryEntity2Collection) { DynamicObject entryTaxRate = entryEntity2.getDynamicObject("entrytaxrate"); // 税率名称