- [ ] 拉取SAP新增业务大类业务小类

- [ ] 优化付款单成本中心利润中心校验必填失效
--s

main/java/shjh/jhzj7/fi/fi/plugin/form/SappzFormPlugin.java

@@ -238,6 +238,10 @@ public class SappzFormPlugin extends AbstractFormPlugin {
 //                                        break;
 //                                }
 
+                                this.getModel().setValue("shjh_ywdlnumber", it_list.getString("ZYWDLCODE"), i);//业务大类编码
+                                this.getModel().setValue("shjh_ywdlname", it_list.getString("ZYWDLNAME"), i);//业务大类描述
+                                this.getModel().setValue("shjh_ywxlnumber", it_list.getString("ZYWXLCODE"), i);//业务小类编码
+                                this.getModel().setValue("shjh_ywxlname", it_list.getString("ZYWXLNAME"), i);//业务小类描述
                                 String uuid = it_list.getString("XBLNR");
                                 this.getModel().setValue("shjh_uuid", uuid, i);//单据号
                                 this.getModel().setValue("shjh_bktxt", it_list.getString("BKTXT"), i);//凭证抬头文本
@@ -724,6 +728,19 @@ public class SappzFormPlugin extends AbstractFormPlugin {
                         //凭证抬头文本
                         String shjh_bktxt = (String) this.getModel().getValue("shjh_bktxt", selectRow);
                         ap_payapply.set("shjh_voucherheadertext", shjh_bktxt);
+                        //业务大类
+                        String bizbig = (String) this.getModel().getValue("shjh_ywdlnumber", selectRow);
+                        if (kd.bos.util.StringUtils.isNotEmpty(bizbig)) {
+                            DynamicObject dynamicObject = BusinessDataServiceHelper.loadSingle("shjh_bizbigtype", new QFilter[]{new QFilter("shjh_fknumber", QCP.equals, bizbig)});
+                            ap_payapply.set("shjh_bizbig", dynamicObject);
+                        }
+                        //业务小类
+                        String bizsmall = (String) this.getModel().getValue("shjh_ywxlnumber", selectRow);
+                        if (kd.bos.util.StringUtils.isNotEmpty(bizsmall)) {
+                            DynamicObject dynamicObject = BusinessDataServiceHelper.loadSingle("shjh_bizsmalltype", new QFilter[]{new QFilter("shjh_fknumber", QCP.equals, bizsmall)});
+                            ap_payapply.set("shjh_basedatafield", dynamicObject);
+                        }
+
                         //SAP凭证来源
                         //单据号
                         String uuid = (String) this.getModel().getValue("shjh_uuid", selectRow);

main/java/shjh/jhzj7/fi/fi/plugin/form/TextFieldDemo.java

@@ -1,10 +1,14 @@
 package shjh.jhzj7.fi.fi.plugin.form;
 
+import kd.bos.entity.property.BasedataProp;
+import kd.bos.entity.property.BooleanProp;
+import kd.bos.entity.property.TextProp;
 import kd.bos.form.control.Label;
 import kd.bos.dataentity.entity.DynamicObject;
 import kd.bos.entity.datamodel.events.PropertyChangedArgs;
 import kd.bos.form.ClientProperties;
 import kd.bos.form.field.BasedataEdit;
+import kd.bos.form.field.TextEdit;
 import kd.bos.form.plugin.AbstractFormPlugin;
 import kd.bos.servicehelper.BusinessDataServiceHelper;
 
@@ -44,13 +48,16 @@ public class TextFieldDemo extends AbstractFormPlugin {
         DynamicObject shjhBizsmall = (DynamicObject)this.getView().getModel().getValue("shjh_bizsmall");
         if (null != shjhBizsmall) {
             shjhBizsmall = BusinessDataServiceHelper.loadSingle(shjhBizsmall.getPkValue(),"shjh_bizsmalltype");
-            // 获取成本中心和利润中心的必填配置
+            // 获取成本中心的必填配置
             boolean shjhCc = shjhBizsmall.getBoolean("shjh_cc");
-            boolean shjhPc = shjhBizsmall.getBoolean("shjh_pc");
+            BasedataProp tp = (BasedataProp) shjh_costcenter.getProperty();
-            // 设置成本中心必填状态
             shjh_costcenter.setMustInput(shjhCc);
-            // 设置利润中心必填状态
+            tp.setMustInput(shjhCc);
+            // 获取利润中心的必填配置
+            boolean shjhPc = shjhBizsmall.getBoolean("shjh_pc");
+            BasedataProp td = (BasedataProp) shjh_profitcenter.getProperty();
             shjh_profitcenter.setMustInput(shjhPc);
+            td.setMustInput(shjhPc);
         }else {
             shjh_costcenter.setMustInput(false);
             shjh_profitcenter.setMustInput(false);
@@ -70,13 +77,16 @@ public class TextFieldDemo extends AbstractFormPlugin {
         DynamicObject shjhBizsmall = (DynamicObject)this.getView().getModel().getValue("shjh_bizsmall");
         if (null != shjhBizsmall) {
             shjhBizsmall = BusinessDataServiceHelper.loadSingle(shjhBizsmall.getPkValue(),"shjh_bizsmalltype");
-            // 获取成本中心和利润中心的必填配置
+            // 获取成本中心的必填配置
             boolean shjhCc = shjhBizsmall.getBoolean("shjh_cc");
-            boolean shjhPc = shjhBizsmall.getBoolean("shjh_pc");
+            BasedataProp tp = (BasedataProp) shjh_costcenter.getProperty();
-            // 设置成本中心必填状态
             shjh_costcenter.setMustInput(shjhCc);
-            // 设置利润中心必填状态
+            tp.setMustInput(shjhCc);
+            // 获取利润中心的必填配置
+            boolean shjhPc = shjhBizsmall.getBoolean("shjh_pc");
+            BasedataProp td = (BasedataProp) shjh_profitcenter.getProperty();
             shjh_profitcenter.setMustInput(shjhPc);
+            td.setMustInput(shjhPc);
         }else {
             shjh_costcenter.setMustInput(false);
             shjh_profitcenter.setMustInput(false);

main/java/shjh/jhzj7/fi/fi/plugin/task/QuerySapCreatePayApplyTask.java

@@ -474,6 +474,17 @@ public class QuerySapCreatePayApplyTask extends AbstractTask {
             }
             String uuid = it_list.getString("XBLNR");//单据号
             ap_payapply.set("shjh_fkdjbh", uuid);
+            String bizbig = it_list.getString("ZYWDLCODE");//业务大类编
+            String bizsmall = it_list.getString("ZYWXLCODE");//业务小类编码
+            //业务大类，业务小类
+            if (kd.bos.util.StringUtils.isNotEmpty(bizbig)) {
+                DynamicObject dynamicObject = BusinessDataServiceHelper.loadSingle("shjh_bizbigtype", new QFilter[]{new QFilter("shjh_fknumber", QCP.equals, bizbig)});
+                ap_payapply.set("shjh_bizbig", dynamicObject);
+            }
+            if (kd.bos.util.StringUtils.isNotEmpty(bizsmall)) {
+                DynamicObject dynamicObject = BusinessDataServiceHelper.loadSingle("shjh_bizsmalltype", new QFilter[]{new QFilter("shjh_fknumber", QCP.equals, bizsmall)});
+                ap_payapply.set("shjh_basedatafield", dynamicObject);
+            }
             String department = it_list.getString("ZREQ_DEPT");
             QFilter q8 = new QFilter("number", QCP.equals, department);
             DynamicObject adminorg = BusinessDataServiceHelper.loadSingle("bos_adminorg", new QFilter[]{q8});

main/java/shjh/jhzj7/fi/fi/webapi/ApplyAdjustBillControler.java

@@ -478,6 +478,8 @@ public class ApplyAdjustBillControler {
         String vouchertype = it_list.getString("BLART");// 凭证类型_凭证类型
         String paymentterms = it_list.getString("ZTERM");// 付款条件_付款条件代码
         String refertoinvoicenumber = it_list.getString("XBLNR");// 参照发票号
+        String bizbig = it_list.getString("ZYWDLCODE");//业务大类编
+        String bizsmall = it_list.getString("ZYWXLCODE");//业务小类编码
 
 
         // 防重校验
@@ -549,6 +551,16 @@ public class ApplyAdjustBillControler {
         if (StringUtils.isNotEmpty(s1)) {
             return s1;
         }
+        //业务大类，业务小类
+        if (kd.bos.util.StringUtils.isNotEmpty(bizbig)) {
+            DynamicObject dynamicObject = BusinessDataServiceHelper.loadSingle("shjh_bizbigtype", new QFilter[]{new QFilter("shjh_fknumber", QCP.equals, bizbig)});
+            ap_payapply.set("shjh_bizbig", dynamicObject);
+        }
+        if (kd.bos.util.StringUtils.isNotEmpty(bizsmall)) {
+            DynamicObject dynamicObject = BusinessDataServiceHelper.loadSingle("shjh_bizsmalltype", new QFilter[]{new QFilter("shjh_fknumber", QCP.equals, bizsmall)});
+            ap_payapply.set("shjh_basedatafield", dynamicObject);
+        }
+
         String uuid = it_list.getString("XBLNR");//单据号
         ap_payapply.set("shjh_fkdjbh", uuid);
         //凭证抬头文本