Merge remote-tracking branch 'origin/dev' into dev

code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/form/DailyapplybillPlugin.java

@@ -0,0 +1,40 @@
+package zcgj.zcdev.zcdev.fs.plugin.form;
+
+import kd.bos.bill.AbstractBillPlugIn;
+import kd.bos.dataentity.entity.DynamicObject;
+import kd.bos.dataentity.entity.LocaleString;
+import kd.bos.form.field.ComboEdit;
+import kd.bos.form.field.ComboItem;
+import kd.sdk.plugin.Plugin;
+
+import java.util.ArrayList;
+import java.util.EventObject;
+import java.util.List;
+
+/**
+ * 费用申请单插件
+ */
+public class DailyapplybillPlugin extends AbstractBillPlugIn implements Plugin {
+
+    @Override
+    public void afterBindData(EventObject e) {
+        super.afterBindData(e);
+        DynamicObject costcompany = (DynamicObject) this.getModel().getValue("costcompany");
+        if(costcompany != null) {
+            if("10007186".equals(costcompany.getString("number"))){
+                List<ComboItem> comboList = new ArrayList<>();
+                comboList.add(new ComboItem(new LocaleString("采购申请"), "purchase_apply"));
+                comboList.add(new ComboItem(new LocaleString("固定资产采购申请"), "gdzc_apply"));
+                comboList.add(new ComboItem(new LocaleString("车辆维修保养申请"), "vehicle_maintain"));
+                comboList.add(new ComboItem(new LocaleString("维修保养申请-非车辆"), "maintain_apply"));
+                comboList.add(new ComboItem(new LocaleString("租车申请"), "car_rental"));
+                comboList.add(new ComboItem(new LocaleString("派车单"), "dispatch_car"));
+                comboList.add(new ComboItem(new LocaleString("费用申请单(兖州机关）"), "zc_morren"));
+                comboList.add(new ComboItem(new LocaleString("工会经费申请"), "union_funding"));
+                ComboEdit comboEdit = getView().getControl("zcgj_apply_type");
+                comboEdit.setComboItems(comboList);
+            }
+        }
+
+    }
+}

code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/form/TradefundsPlugin.java

@@ -0,0 +1,56 @@
+package zcgj.zcdev.zcdev.fs.plugin.form;
+
+import kd.bos.bill.AbstractBillPlugIn;
+import kd.bos.dataentity.entity.DynamicObject;
+import kd.bos.dataentity.entity.LocaleString;
+import kd.bos.dataentity.metadata.IDataEntityProperty;
+import kd.bos.form.field.BasedataEdit;
+import kd.bos.form.field.ComboEdit;
+import kd.bos.form.field.ComboItem;
+import kd.bos.form.field.RefBillEdit;
+import kd.bos.form.field.events.BeforeF7SelectEvent;
+import kd.bos.form.field.events.BeforeF7SelectListener;
+import kd.bos.list.ListShowParameter;
+import kd.bos.orm.query.QCP;
+import kd.bos.orm.query.QFilter;
+import kd.sdk.plugin.Plugin;
+
+import java.util.ArrayList;
+import java.util.EventObject;
+import java.util.List;
+
+/**
+ * 工会经费申请单插件
+ */
+public class TradefundsPlugin extends AbstractBillPlugIn implements BeforeF7SelectListener {
+
+    @Override
+    public void registerListener(EventObject e) {
+        super.registerListener(e);
+        BasedataEdit project = this.getView().getControl("zcgj_funding_apply");//设备维修确认单
+        project.addBeforeF7SelectListener(this);
+
+    }
+
+    @Override
+    public void beforeF7Select(BeforeF7SelectEvent beforeF7SelectEvent) {
+        ListShowParameter formShowParameter = (ListShowParameter) beforeF7SelectEvent.getFormShowParameter();
+        IDataEntityProperty property = beforeF7SelectEvent.getProperty();//过滤字段信息
+        String propertyName = property.getName();//过滤字段标识
+
+        if("zcgj_funding_apply".equals(propertyName)){ //经费申请过滤
+            DynamicObject costcompany = (DynamicObject)this.getModel().getValue("createorg");//创建组织过滤
+            List<QFilter> qFilter = new ArrayList<>();
+
+            /*if(costcompany!=null){
+                Long companyId = costcompany.getLong("id");
+                qFilter.add(new QFilter("zcgj_costcompany", QCP.equals, companyId));
+            }*/
+
+
+            qFilter.add(new QFilter("zcgj_billstatus", QCP.equals, "E"));
+            qFilter.add(new QFilter("zcgj_apply_type", QCP.equals, "union_funding"));
+            formShowParameter.getListFilterParameter().setQFilters(qFilter);
+        }
+    }
+}

code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/operate/PublicBillRecAccountCkOp.java

@@ -26,6 +26,10 @@ public class PublicBillRecAccountCkOp extends AbstractOperationServicePlugIn {
         super.onPreparePropertys(e);
         e.getFieldKeys().add("costcompany");
         e.getFieldKeys().add("accountentry");
+
+        e.getFieldKeys().add("zcgj_prepay");//冲销预付
+        e.getFieldKeys().add("writeoffmoney");//冲销预付
+
     }
 
     @Override
@@ -95,6 +99,13 @@ public class PublicBillRecAccountCkOp extends AbstractOperationServicePlugIn {
                             }
 
                         }
+
+                        //冲销预付检查
+                        String zcgjPrepay = dataEntity.getString("zcgj_prepay");
+                        DynamicObjectCollection writeoffmoney = dataEntity.getDynamicObjectCollection("writeoffmoney");
+                        if("YES".equals(zcgjPrepay) && writeoffmoney.isEmpty()){
+                            this.addFatalErrorMessage(extendedDataEntity, String.format("当前单据为冲销预付时，冲预付/借款分录不能为空！",i));
+                        }
                     }
                 }
             }

code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/workflow/OutContractSettleFiConfirmWorkFlowPlugin.java

@@ -92,6 +92,25 @@ public class OutContractSettleFiConfirmWorkFlowPlugin implements IWorkflowPlugin
                 }
             }
 
+            //发票信息
+            DynamicObjectCollection entryentity = outContractSettle.getDynamicObjectCollection("zcgj_entryentity");//支出合同结算单发票分录
+            DynamicObjectCollection fientryentity = outFinaceconfirm.getDynamicObjectCollection("zcgj_entryentity");//支出财务确认单-发票分录
+            fientryentity.clear();
+            for (DynamicObject dynamicObject : entryentity) {
+                DynamicObject dynamicObject1 = fientryentity.addNew();
+                dynamicObject1.set("zcgj_invoice",dynamicObject.getDynamicObject("zcgj_invoice"));
+                dynamicObject1.set("zcgj_invoiceamount",dynamicObject.getBigDecimal("zcgj_invoiceamount"));
+                dynamicObject1.set("zcgj_invoicetax",dynamicObject.getBigDecimal("zcgj_invoicetax"));
+                dynamicObject1.set("zcgj_oftaxinvoiceamount",dynamicObject.getBigDecimal("zcgj_oftaxinvoiceamount"));
+                dynamicObject1.set("zcgj_unapplyinvoftaxamt",dynamicObject.getBigDecimal("zcgj_unapplyinvoftaxamt"));
+                dynamicObject1.set("zcgj_unapplyinvtax",dynamicObject.getBigDecimal("zcgj_unapplyinvtax"));
+                dynamicObject1.set("zcgj_applyinvoftaxamt",dynamicObject.getBigDecimal("zcgj_applyinvoftaxamt"));
+                dynamicObject1.set("zcgj_applyinvamt",dynamicObject.getBigDecimal("zcgj_applyinvamt"));
+                dynamicObject1.set("zcgj_applyinvtax",dynamicObject.getBigDecimal("zcgj_applyinvtax"));
+                dynamicObject1.set("zcgj_invoicedescription",dynamicObject.getString("zcgj_invoicedescription"));
+                dynamicObject1.set("zcgj_invoicecurrency",dynamicObject.getDynamicObject("zcgj_invoicecurrency"));
+            }
+
             SaveServiceHelper.saveOperate("zcgj_ec_out_finaceconfirm", new DynamicObject[]{outFinaceconfirm}, null);//支出合同实体
             //生成支出财务确认单 end
         }

code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/workflow/OutContractSettleInvalidWorkFlowPlugin.java

@@ -93,6 +93,25 @@ public class OutContractSettleInvalidWorkFlowPlugin implements IWorkflowPlugin {
                 }
             }
 
+            //发票信息
+            DynamicObjectCollection entryentity = outContractSettle.getDynamicObjectCollection("zcgj_entryentity");//支出合同结算单发票分录
+            DynamicObjectCollection fientryentity = outFinaceconfirm.getDynamicObjectCollection("zcgj_entryentity");//支出财务确认单-发票分录
+            fientryentity.clear();
+            for (DynamicObject dynamicObject : entryentity) {
+                DynamicObject dynamicObject1 = fientryentity.addNew();
+                dynamicObject1.set("zcgj_invoice",dynamicObject.getDynamicObject("zcgj_invoice"));
+                dynamicObject1.set("zcgj_invoiceamount",dynamicObject.getBigDecimal("zcgj_invoiceamount"));
+                dynamicObject1.set("zcgj_invoicetax",dynamicObject.getBigDecimal("zcgj_invoicetax"));
+                dynamicObject1.set("zcgj_oftaxinvoiceamount",dynamicObject.getBigDecimal("zcgj_oftaxinvoiceamount"));
+                dynamicObject1.set("zcgj_unapplyinvoftaxamt",dynamicObject.getBigDecimal("zcgj_unapplyinvoftaxamt"));
+                dynamicObject1.set("zcgj_unapplyinvtax",dynamicObject.getBigDecimal("zcgj_unapplyinvtax"));
+                dynamicObject1.set("zcgj_applyinvoftaxamt",dynamicObject.getBigDecimal("zcgj_applyinvoftaxamt"));
+                dynamicObject1.set("zcgj_applyinvamt",dynamicObject.getBigDecimal("zcgj_applyinvamt"));
+                dynamicObject1.set("zcgj_applyinvtax",dynamicObject.getBigDecimal("zcgj_applyinvtax"));
+                dynamicObject1.set("zcgj_invoicedescription",dynamicObject.getString("zcgj_invoicedescription"));
+                dynamicObject1.set("zcgj_invoicecurrency",dynamicObject.getDynamicObject("zcgj_invoicecurrency"));
+            }
+
             OperationResult zcgjEcOutFinaceconfirm = SaveServiceHelper.saveOperate("zcgj_ec_out_finaceconfirm", new DynamicObject[]{outFinaceconfirm}, null);//支出合同实体
             if(zcgjEcOutFinaceconfirm.isSuccess()){
                 String sourceBillId = outContractSettle.getString("zcgj_invalidbillid");

code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/workflow/OutContractSettleReversalWorkFlowPlugin.java

@@ -140,6 +140,26 @@ public class OutContractSettleReversalWorkFlowPlugin implements IWorkflowPlugin
                     NewExpenseItemEntry.set("zcgj_expenseitem",processAllocEntity.get("zcgj_expenseitem"));//费用项目
                 }
             }
+
+            //发票信息
+            DynamicObjectCollection entryentity = outContractSettle.getDynamicObjectCollection("zcgj_entryentity");//支出合同结算单发票分录
+            DynamicObjectCollection fientryentity = outFinaceconfirm.getDynamicObjectCollection("zcgj_entryentity");//支出财务确认单-发票分录
+            fientryentity.clear();
+            for (DynamicObject dynamicObject : entryentity) {
+                DynamicObject dynamicObject1 = fientryentity.addNew();
+                dynamicObject1.set("zcgj_invoice",dynamicObject.getDynamicObject("zcgj_invoice"));
+                dynamicObject1.set("zcgj_invoiceamount",dynamicObject.getBigDecimal("zcgj_invoiceamount"));
+                dynamicObject1.set("zcgj_invoicetax",dynamicObject.getBigDecimal("zcgj_invoicetax"));
+                dynamicObject1.set("zcgj_oftaxinvoiceamount",dynamicObject.getBigDecimal("zcgj_oftaxinvoiceamount"));
+                dynamicObject1.set("zcgj_unapplyinvoftaxamt",dynamicObject.getBigDecimal("zcgj_unapplyinvoftaxamt"));
+                dynamicObject1.set("zcgj_unapplyinvtax",dynamicObject.getBigDecimal("zcgj_unapplyinvtax"));
+                dynamicObject1.set("zcgj_applyinvoftaxamt",dynamicObject.getBigDecimal("zcgj_applyinvoftaxamt"));
+                dynamicObject1.set("zcgj_applyinvamt",dynamicObject.getBigDecimal("zcgj_applyinvamt"));
+                dynamicObject1.set("zcgj_applyinvtax",dynamicObject.getBigDecimal("zcgj_applyinvtax"));
+                dynamicObject1.set("zcgj_invoicedescription",dynamicObject.getString("zcgj_invoicedescription"));
+                dynamicObject1.set("zcgj_invoicecurrency",dynamicObject.getDynamicObject("zcgj_invoicecurrency"));
+            }
+
             SaveServiceHelper.saveOperate("zcgj_ec_out_finaceconfirm", new DynamicObject[]{outFinaceconfirm}, null);//支出合同实体
 
             //生成支出财务确认单 end