zhangzhiguo
/
zhongcaiguoji
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
zhangzhiguo 2025-01-09 20:12:55 +08:00
parent 97fe253709 7ec830c713
commit afa260f40d
4 changed files with 57 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,10 +36,13 @@ public class OutContractFromPlugin extends AbstractBillPlugIn implements Plugin
DynamicObject contractType = (DynamicObject)changeData.getNewValue();
String number = contractType.getString("number");
List<ComboItem> comboList = new ArrayList<>();
comboList.add(new ComboItem(new LocaleString("全面合作"), "A"));
comboList.add(new ComboItem(new LocaleString("局部合作"), "B"));
if(number.equals("sbzl")){
comboList.add(new ComboItem(new LocaleString("零星租赁"), "C"));
comboList.add(new ComboItem(new LocaleString("全部租赁"), "C"));
comboList.add(new ComboItem(new LocaleString("部分租赁"), "D"));
comboList.add(new ComboItem(new LocaleString("零星租赁"), "F"));
}else{
comboList.add(new ComboItem(new LocaleString("全面合作"), "A"));
comboList.add(new ComboItem(new LocaleString("局部合作"), "B"));
}
ComboEdit comboEdit = getView().getControl("zcgj_cooperatemode");
comboEdit.setComboItems(comboList);

2
code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/ResourceFilterExtPlugin.java
View File

@ -31,7 +31,7 @@ public class ResourceFilterExtPlugin extends ResourceItemListPlugin {
if (contractType.toString().equals("wzcg01")) {//物资采购
this.setResourceTypeStyle("material");
this.afterSelectedTag("material");
} else if (contractType.toString().equals("sbcg")) {//设备采购
} else if (contractType.toString().equals("sbcg")||(contractType.toString().equals("sbzl"))) {//设备采购
this.setResourceTypeStyle("equipment");
this.afterSelectedTag("equipment");
}else if (contractType.toString().equals("qtcc") || contractType.toString().equals("lwlcc")|| contractType.toString().equals("ck")||

47
code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/OutContractBudgetExtOp.java Normal file
View File

@ -0,0 +1,47 @@
package zcgj.zcdev.zcdev.pr.plugin.operate;
import kd.bos.entity.plugin.AbstractOperationServicePlugIn;
import kd.bos.entity.plugin.AddValidatorsEventArgs;
import kd.bos.entity.plugin.PreparePropertysEventArgs;
import kd.ec.contract.opplugin.validator.InContractAmtControlValidator;
import kd.ec.contract.opplugin.validator.OutContractBoqControlValidator;
import kd.ec.contract.opplugin.validator.OutContractMustInputValidator;
public class OutContractBudgetExtOp extends AbstractOperationServicePlugIn {
public void onPreparePropertys(PreparePropertysEventArgs e) {
super.onPreparePropertys(e);
e.getFieldKeys().add("cbs");
e.getFieldKeys().add("project");
e.getFieldKeys().add("org");
e.getFieldKeys().add("billstatus");
e.getFieldKeys().add("billno");
e.getFieldKeys().add("currency");
e.getFieldKeys().add("originaloftaxamount");
e.getFieldKeys().add("originalamount");
e.getFieldKeys().add("editonunit");
e.getFieldKeys().add("unitproject");
e.getFieldKeys().add("contracttype");
e.getFieldKeys().add("isonlist");
e.getFieldKeys().add("listmodelentry");
e.getFieldKeys().add("sublistentry");
e.getFieldKeys().add("modelname");
e.getFieldKeys().add("listmodelid");
e.getFieldKeys().add("listunitproject");
e.getFieldKeys().add("cbsnumber");
e.getFieldKeys().add("isleaf");
e.getFieldKeys().add("incontract");
e.getFieldKeys().add("boqnumber");
e.getFieldKeys().add("qty");
e.getFieldKeys().add("price");
e.getFieldKeys().add("amount");
e.getFieldKeys().add("isincost");
}
public void onAddValidators(AddValidatorsEventArgs e) {
super.onAddValidators(e);
e.getValidators().add(new InContractAmtControlValidator());
e.getValidators().add(new OutContractMustInputValidator());
e.getValidators().add(new OutContractBoqControlValidator());
}
}

4
code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/SubmitInContractBillOp.java
View File

@ -1,14 +1,16 @@
package zcgj.zcdev.zcdev.pr.plugin.operate;
import com.apusic.juli.logging.Log;
import com.apusic.juli.logging.LogFactory;
import kd.bos.entity.plugin.AbstractOperationServicePlugIn;
import kd.bos.entity.plugin.AddValidatorsEventArgs;
import kd.bos.entity.validate.AbstractValidator;
import kd.ec.contract.opplugin.InContractBillOp;
import kd.ec.contract.opplugin.OutContractBudgetOp;
import kd.ec.contract.opplugin.validator.ContractValidator;
import java.util.List;
public class SubmitInContractBillOp extends InContractBillOp{
public class SubmitInContractBillOp extends AbstractOperationServicePlugIn {
private final static Log logger = LogFactory.getLog(SubmitInContractBillOp.class);
@Override