bug修复

code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/ContractPublicBillPlugin.java

@@ -6,6 +6,7 @@ import kd.bos.dataentity.entity.LocaleString;
 import kd.bos.entity.datamodel.events.PropertyChangedArgs;
 import kd.bos.form.field.ComboEdit;
 import kd.bos.form.field.ComboItem;
+import kd.bos.form.field.FieldEdit;
 import kd.sdk.plugin.Plugin;
 
 import java.util.ArrayList;
@@ -71,8 +72,10 @@ public class ContractPublicBillPlugin extends AbstractBillPlugIn implements Plug
                 String priceType = pricetype.toString();
                 if(priceType.equals("gddj")){
                     this.getModel().setValue("isonlist", true);
+                    ((FieldEdit)this.getView().getControl("treeprice")).setMustInput(true);
                 }else {
                     this.getModel().setValue("isonlist", false);
+                    ((FieldEdit)this.getView().getControl("treeprice")).setMustInput(true);
                 }
             }
         }

code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EquipmentCardListPlugin.java

@@ -6,6 +6,7 @@ import kd.bos.dataentity.entity.DynamicObjectCollection;
 import kd.bos.entity.datamodel.ListSelectedRow;
 import kd.bos.entity.datamodel.ListSelectedRowCollection;
 import kd.bos.entity.operate.result.OperationResult;
+import kd.bos.form.IFormView;
 import kd.bos.form.control.events.BeforeItemClickEvent;
 import kd.bos.form.control.events.ItemClickEvent;
 import kd.bos.form.events.BeforeDoOperationEventArgs;
@@ -55,6 +56,8 @@ public class EquipmentCardListPlugin extends AbstractListPlugin implements Plugi
             Object[] save = SaveServiceHelper.save(equipments);
             System.out.println();
             this.getView().showMessage("闲置成功！");
+            IFormView view = this.getView();
+            view.invokeOperation("refresh");
         } else if (itemKey.equals("zcgj_asset")) {//同步资产卡片
             List<String> strings = new ArrayList<>();
             strings.add("100104");
@@ -78,7 +81,10 @@ public class EquipmentCardListPlugin extends AbstractListPlugin implements Plugi
                 Date prodate = realcard.getDate("zcgj_prodate");//出场日期
                 DynamicObject storeplace = realcard.getDynamicObject("storeplace");//存放地点
                 DynamicObject storeplaceinfo = BusinessDataServiceHelper.loadSingle("fa_storeplace", new QFilter[]{new QFilter("id", QCP.equals, storeplace.getLong("id"))});
-                String fulladdress = storeplaceinfo.getString("fulladdress");
+                String fulladdress = null;
+                if(storeplaceinfo!=null){
+                    fulladdress = storeplaceinfo.getString("fulladdress");
+                }
                 DynamicObject creator = realcard.getDynamicObject("creator");//创建人
                 Date createtime = realcard.getDate("createtime");//创建时间
                 DynamicObject modifier = realcard.getDynamicObject("modifier");//修改人

code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/OutContractFromPlugin.java

@@ -42,9 +42,13 @@ public class OutContractFromPlugin extends AbstractBillPlugIn implements Plugin
                 comboList.add(new ComboItem(new LocaleString("全部租赁"), "C"));
                 comboList.add(new ComboItem(new LocaleString("部分租赁"), "D"));
                 comboList.add(new ComboItem(new LocaleString("零星租赁"), "F"));
+                comboList1.add(new ComboItem(new LocaleString("固定单价"), "gddj"));
+                comboList1.add(new ComboItem(new LocaleString("总价包干"), "zjbg"));
             } else if (number.equals("ZCHLX02")) {
                 comboList1.add(new ComboItem(new LocaleString("固定单价"), "gddj"));
                 comboList1.add(new ComboItem(new LocaleString("不定量不定价"), "bdlbdj"));
+                comboList.add(new ComboItem(new LocaleString("全面合作"), "A"));
+                comboList.add(new ComboItem(new LocaleString("局部合作"), "B"));
                 Object pricetype = this.getModel().getValue("zcgj_pricetype");
                 if (pricetype!=null){
                     if (pricetype.toString().equals("bdlbdj")){
@@ -54,7 +58,6 @@ public class OutContractFromPlugin extends AbstractBillPlugIn implements Plugin
                 }
             } else{
                 comboList1.add(new ComboItem(new LocaleString("固定单价"), "gddj"));
-                comboList1.add(new ComboItem(new LocaleString("不定量不定价"), "bdlbdj"));
                 comboList1.add(new ComboItem(new LocaleString("总价包干"), "zjbg"));
                 comboList.add(new ComboItem(new LocaleString("全面合作"), "A"));
                 comboList.add(new ComboItem(new LocaleString("局部合作"), "B"));

code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/MaintenanceAckOp.java

@@ -10,4 +10,6 @@ public class MaintenanceAckOp extends AbstractOperationServicePlugIn {
         super.onAddValidators(e);
         e.getValidators().add(0, new MaintenanceAckValidator());
     }
+
+
 }