weiyunlong
/
dobe_comic8
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
陈绍鑫 2024-11-18 14:07:31 +08:00
parent 52c16c7e5a 7db54d3369
commit a98edc8d6e
6 changed files with 148 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
main/java/shkd/repc/recon/formplugin/ContractFormPlugin.java
View File

@ -165,9 +165,9 @@ public class ContractFormPlugin extends AbstractFormPlugin implements UploadLis
if ("qeug_attachmentpanelap".equals(key)) { if ("qeug_attachmentpanelap".equals(key)) {
boolean b = deleteList(); boolean b = deleteList();
if (b) { // if (b) {
this.getView().showSuccessNotification("已同步删除明细数据"); //// this.getView().showSuccessNotification("已同步删除明细数据");
} // }
} }
} }
/** /**
@ -199,10 +199,13 @@ public class ContractFormPlugin extends AbstractFormPlugin implements UploadLis
} }
} }
} }
int size = qeug_invoiceentryinfos.size();
//删除单据体数据 //删除单据体数据
qeug_invoiceentryinfos.clear(); for (int i = 0; i < size; i++) {
SaveServiceHelper.save(new DynamicObject[]{this.getModel().getDataEntity()}); this.getView().getModel().deleteEntryRow("qeug_invoiceentryinfo",0);
}
// SaveServiceHelper.save(new DynamicObject[]{this.getModel().getDataEntity(true)});
this.getView().invokeOperation("save");
// 删除完成之后刷新界面 // 删除完成之后刷新界面
this.getView().invokeOperation("refresh"); this.getView().invokeOperation("refresh");
return result; return result;
@ -269,7 +272,7 @@ public class ContractFormPlugin extends AbstractFormPlugin implements UploadLis
// return; // return;
this.getView().invokeOperation("save");//调用保存 this.getView().invokeOperation("save");//调用保存
} }
List<Map<String, Object>> attachmentes = AttachmentServiceHelper.getAttachments("recon_contractbill", this.getModel().getValue("id"), "qeug_attachmentpanelap"); List<Map<String, Object>> attachmentes = AttachmentServiceHelper.getAttachments(billtype, this.getModel().getValue("id"), "qeug_attachmentpanelap");
for (Map<String, Object> attachment : attachmentes) { for (Map<String, Object> attachment : attachmentes) {
String url = attachment.get("url").toString(); String url = attachment.get("url").toString();
try { try {
@ -365,15 +368,25 @@ public class ContractFormPlugin extends AbstractFormPlugin implements UploadLis
break; break;
case 10: case 10:
if (StringUtils.isNotEmpty(cell.toString())) { if (StringUtils.isNotEmpty(cell.toString())) {
contractsummarylist.set("qeug_artificial",BigDecimal.valueOf(Double.parseDouble(cell.toString())));//人工费 contractsummarylist.set("qeug_artificial",BigDecimal.valueOf(Double.parseDouble(cell.toString())));//人工单价
} }
break; break;
case 12: case 12:
if (StringUtils.isNotEmpty(cell.toString())) { if (StringUtils.isNotEmpty(cell.toString())) {
contractsummarylist.set("qeug_provisional",BigDecimal.valueOf(Double.parseDouble(cell.toString())));//材料及工程设备暂估价 contractsummarylist.set("qeug_provisional",BigDecimal.valueOf(Double.parseDouble(cell.toString())));//辅材单价
} }
break; break;
case 13: case 13:
if (StringUtils.isNotEmpty(cell.toString())) {
contractsummarylist.set("qeug_unitpriceofmainmater",BigDecimal.valueOf(Double.parseDouble(cell.toString())));//主材单价
}
break;
case 14:
if (StringUtils.isNotEmpty(cell.toString())) {
contractsummarylist.set("qeug_mechanicalunitprice",BigDecimal.valueOf(Double.parseDouble(cell.toString())));//机械,设备单价
}
break;
case 15:
if (StringUtils.isNotEmpty(cell.toString())) { if (StringUtils.isNotEmpty(cell.toString())) {
contractsummarylist.set("qeug_remarks",cell);//备注 contractsummarylist.set("qeug_remarks",cell);//备注
} }

2
main/java/shkd/repc/recon/formplugin/ReconPayreqFormPlugin.java
View File

@ -369,7 +369,7 @@ public class ReconPayreqFormPlugin extends AbstractFormPlugin implements BeforeF
recon_invoicebill.set("bizdate",qeug_bizdate);//开票日期 recon_invoicebill.set("bizdate",qeug_bizdate);//开票日期
// todo----编码规则待维护 // todo----编码规则待维护
//发票编码 //发票编码
recon_invoicebill.set("billno","测试数据勿删!!");//----编码规则待维护 recon_invoicebill.set("billno",qeug_invoiceno);//----编码规则待维护，目前与发票号码一致
//付款申请单 payreqentrys //付款申请单 payreqentrys
DynamicObjectCollection payreqentrys = recon_invoicebill.getDynamicObjectCollection("payreqentrys"); DynamicObjectCollection payreqentrys = recon_invoicebill.getDynamicObjectCollection("payreqentrys");

71
main/java/shkd/repc/recon/formplugin/WorkloadcfmbillFormPlugin.java
View File

@ -61,36 +61,54 @@ public class WorkloadcfmbillFormPlugin extends AbstractFormPlugin implements Tab
getListShowParamer(this.getView(), this.getModel(),String.valueOf(id)); getListShowParamer(this.getView(), this.getModel(),String.valueOf(id));
break; break;
case "audit": case "audit":
//产值确认--清单明细 updateCumulativeProgress("audit",id);
DynamicObjectCollection invoiceentryinfos = this.getModel().getDataEntity(true).getDynamicObjectCollection("qeug_invoiceentryinfo"); break;
//产值确认审核时,将所有明细的完成百分比覆盖掉合同看的清单 case "unaudit":
for (DynamicObject invoiceentryinfo : invoiceentryinfos) { updateCumulativeProgress("unaudit",id);
QFilter q3 = new QFilter("qeug_sheetname", QCP.equals, invoiceentryinfo.getString("qeug_summarycontent"));
QFilter q4 = new QFilter("qeug_contractid",QCP.equals, String.valueOf(id));
QFilter q5 = new QFilter("qeug_workloadcfmid",QCP.equals, String.valueOf(this.getModel().getDataEntity().getPkValue()));
DynamicObject[] recon_contractbills = BusinessDataServiceHelper.load("qeug_contractsummarylist",
"id,qeug_seq,qeug_seqs,qeug_projectnumber,qeug_projectname,qeug_featuredescript,qeug_engincontent," +
"qeug_unit,qeug_decimalqty,qeug_unitprice,qeug_amounttotal,qeug_artificial,qeug_provisional," +
"qeug_remarks,qeug_contractid,qeug_sheetname,qeug_cumulativepreofpro", new QFilter[]{q3,q4,q5});
if (recon_contractbills.length > 0) {
for (int i = 0; i < recon_contractbills.length; i++) {
DynamicObject contractsummarylist = recon_contractbills[i];
QFilter q6 = new QFilter("qeug_workloadcfmid",QCP.equals, "");//未作产值确认时的清单
QFilter q7 = new QFilter("qeug_seqs",QCP.equals, contractsummarylist.getBigDecimal("qeug_seqs"));//项目编码
DynamicObject add = BusinessDataServiceHelper.loadSingle("qeug_contractsummarylist", new QFilter[]{q3, q4, q6, q7});
if (null != add) {
add.set("qeug_cumulativepreofpro",contractsummarylist.getBigDecimal("qeug_cumulativepreofpro"));//累计进度百分比(%)
SaveServiceHelper.save(new DynamicObject[]{add});
}
}
}
}
break; break;
default: default:
break; break;
} }
} }
private void updateCumulativeProgress(String operation,long id) {
// 产值确认--清单明细
DynamicObjectCollection invoiceEntryInfos = this.getModel().getDataEntity(true).getDynamicObjectCollection("qeug_invoiceentryinfo");
for (DynamicObject invoiceEntryInfo : invoiceEntryInfos) {
QFilter qSheetName = new QFilter("qeug_sheetname", QCP.equals, invoiceEntryInfo.getString("qeug_summarycontent"));
QFilter qContractId = new QFilter("qeug_contractid", QCP.equals, String.valueOf(id));
QFilter qWorkloadCfmId = new QFilter("qeug_workloadcfmid", QCP.equals, String.valueOf(this.getModel().getDataEntity().getPkValue()));
DynamicObject[] contractBills = BusinessDataServiceHelper.load("qeug_contractsummarylist",
"id,qeug_seq,qeug_seqs,qeug_projectnumber,qeug_projectname,qeug_featuredescript,qeug_engincontent," +
"qeug_unit,qeug_decimalqty,qeug_unitprice,qeug_amounttotal,qeug_artificial,qeug_provisional," +
"qeug_remarks,qeug_contractid,qeug_sheetname,qeug_cumulativepreofpro,qeug_thisprogress",
new QFilter[]{qSheetName, qContractId, qWorkloadCfmId});
for (DynamicObject contractSummary : contractBills) {
QFilter qNoConfirm = new QFilter("qeug_workloadcfmid", QCP.equals, ""); // 未作产值确认时的清单
QFilter qSeqs = new QFilter("qeug_seqs", QCP.equals, contractSummary.getBigDecimal("qeug_seqs")); // 项目编码
DynamicObject add = BusinessDataServiceHelper.loadSingle("qeug_contractsummarylist", new QFilter[]{qSheetName, qContractId, qNoConfirm, qSeqs});
if (add != null) {
BigDecimal cumulativeProgress = add.getBigDecimal("qeug_cumulativepreofpro"); // 累计进度百分比
BigDecimal thisProgress = contractSummary.getBigDecimal("qeug_thisprogress"); // 本次进度百分比(%)
if ("audit".equals(operation)) {
cumulativeProgress = cumulativeProgress.add(thisProgress); // 累加
} else if ("unaudit".equals(operation)) {
cumulativeProgress = cumulativeProgress.subtract(thisProgress); // 减去
}
add.set("qeug_cumulativepreofpro", cumulativeProgress); // 更新累计进度百分比(%)
SaveServiceHelper.save(new DynamicObject[]{add});
}
}
}
}
/** /**
* 打开列表展示清单详情页 * 打开列表展示清单详情页
* @param formView 页面 * @param formView 页面
@ -165,7 +183,8 @@ public class WorkloadcfmbillFormPlugin extends AbstractFormPlugin implements Tab
DynamicObject[] recon_contractbills = BusinessDataServiceHelper.load("qeug_contractsummarylist", DynamicObject[] recon_contractbills = BusinessDataServiceHelper.load("qeug_contractsummarylist",
"id,qeug_seqs,qeug_projectnumber,qeug_projectname,qeug_featuredescript,qeug_engincontent," + "id,qeug_seqs,qeug_projectnumber,qeug_projectname,qeug_featuredescript,qeug_engincontent," +
"qeug_unit,qeug_decimalqty,qeug_unitprice,qeug_amounttotal,qeug_artificial,qeug_provisional," + "qeug_unit,qeug_decimalqty,qeug_unitprice,qeug_amounttotal,qeug_artificial,qeug_provisional," +
"qeug_remarks,qeug_contractid,qeug_sheetname,qeug_cumulativepreofpro", new QFilter[]{q3,q4,q5}); "qeug_remarks,qeug_contractid,qeug_sheetname,qeug_cumulativepreofpro,qeug_mechanicalunitprice," +
"qeug_unitpriceofmainmater", new QFilter[]{q3,q4,q5});
if (recon_contractbills.length > 0) { if (recon_contractbills.length > 0) {
for (int i = 0; i < recon_contractbills.length; i++) { for (int i = 0; i < recon_contractbills.length; i++) {
DynamicObject contractsummarylist = recon_contractbills[i]; DynamicObject contractsummarylist = recon_contractbills[i];
@ -181,6 +200,8 @@ public class WorkloadcfmbillFormPlugin extends AbstractFormPlugin implements Tab
add.set("qeug_amounttotal", contractsummarylist.getBigDecimal("qeug_amounttotal")); add.set("qeug_amounttotal", contractsummarylist.getBigDecimal("qeug_amounttotal"));
add.set("qeug_artificial", contractsummarylist.getBigDecimal("qeug_artificial")); add.set("qeug_artificial", contractsummarylist.getBigDecimal("qeug_artificial"));
add.set("qeug_provisional", contractsummarylist.getBigDecimal("qeug_provisional")); add.set("qeug_provisional", contractsummarylist.getBigDecimal("qeug_provisional"));
add.set("qeug_unitpriceofmainmater", contractsummarylist.getBigDecimal("qeug_unitpriceofmainmater"));
add.set("qeug_mechanicalunitprice", contractsummarylist.getBigDecimal("qeug_mechanicalunitprice"));
add.set("qeug_remarks", contractsummarylist.getString("qeug_remarks")); add.set("qeug_remarks", contractsummarylist.getString("qeug_remarks"));
add.set("qeug_contractid", contractsummarylist.getString("qeug_contractid")); add.set("qeug_contractid", contractsummarylist.getString("qeug_contractid"));
add.set("qeug_sheetname", contractsummarylist.getString("qeug_sheetname")); add.set("qeug_sheetname", contractsummarylist.getString("qeug_sheetname"));

3
main/java/shkd/repc/recon/opplugin/IntroduceContractPlugin.java
View File

@ -45,8 +45,9 @@ public class IntroduceContractPlugin extends BatchImportPlugin {
bd3 = new BigDecimal(qeug_cumulativepreofpro); bd3 = new BigDecimal(qeug_cumulativepreofpro);
} }
BigDecimal bd4 = bd2.subtract(bd3); BigDecimal bd4 = bd2.subtract(bd3);
data.put("qeug_thisprogress",bd4);//本次进度百分比(%)
BigDecimal result = bd1.multiply(bd4).multiply(BigDecimal.valueOf(0.01)); BigDecimal result = bd1.multiply(bd4).multiply(BigDecimal.valueOf(0.01));
data.put("qeug_bcdecimalqtys",result); data.put("qeug_bcdecimalqtys",result);//本次完工量
if (StringUtils.isNotEmpty(qeug_preofpro)) { if (StringUtils.isNotEmpty(qeug_preofpro)) {
preofpro = new BigDecimal(qeug_preofpro); preofpro = new BigDecimal(qeug_preofpro);
} }

56
main/java/shkd/repc/resm/formplugin/ContractListDateFilterPlugin.java
View File

@ -8,6 +8,8 @@ import kd.bos.dataentity.resource.ResManager;
import kd.bos.dataentity.utils.StringUtils; import kd.bos.dataentity.utils.StringUtils;
import kd.bos.entity.EntityMetadataCache; import kd.bos.entity.EntityMetadataCache;
import kd.bos.entity.datamodel.IDataModel; import kd.bos.entity.datamodel.IDataModel;
import kd.bos.entity.datamodel.events.ChangeData;
import kd.bos.entity.datamodel.events.PropertyChangedArgs;
import kd.bos.form.container.Tab; import kd.bos.form.container.Tab;
import kd.bos.form.control.Control; import kd.bos.form.control.Control;
import kd.bos.orm.query.QCP; import kd.bos.orm.query.QCP;
@ -102,16 +104,26 @@ public class ContractListDateFilterPlugin extends AbstractBillPlugIn implements
if (contractEntries.isEmpty()) { if (contractEntries.isEmpty()) {
this.getView().showTipNotification(ResManager.loadKDString("没有符合条件的合同，请检查。", "EvalPlanEdit_13", "repc-resm-formplugin", new Object[0])); this.getView().showTipNotification(ResManager.loadKDString("没有符合条件的合同，请检查。", "EvalPlanEdit_13", "repc-resm-formplugin", new Object[0]));
Tab tabap = (Tab)this.getView().getControl("tabap"); Tab tabap = (Tab) this.getView().getControl("tabap");
tabap.activeTab("tab_info"); tabap.activeTab("tab_info");
return; }
}
} }
for (int i = 0; i < contractEntries.size(); i++) { @Override
DynamicObject contractEntry = contractEntries.get(i); public void propertyChanged(PropertyChangedArgs e) {
DynamicObject eyContract = contractEntry.getDynamicObject("ey_contract"); String name = e.getProperty().getName();
if (eyContract != null) { if ("ey_contract".equals(name)) {
DynamicObject contract = BusinessDataServiceHelper.loadSingle(eyContract.getPkValue(), "resm_contract_book", "id,sign_date,contract,ismaincontract,maincontract"); IDataModel model = this.getModel();
ChangeData changeData = e.getChangeSet()[0];
int rowIndex = changeData.getRowIndex();
DynamicObject eyContract = (DynamicObject) model.getValue("ey_contract", rowIndex);
if (eyContract == null) {
model.setValue("qeug_sign_date", null, rowIndex);
model.setValue("qeug_bizdate", null, rowIndex);
} else {
DynamicObject contract = BusinessDataServiceHelper.loadSingle(eyContract.getPkValue(), "resm_contract_book", "id,sign_date,contract,ismaincontract,maincontract,bizstatus");
Date signDate = contract.getDate("sign_date");// 签约日期 Date signDate = contract.getDate("sign_date");// 签约日期
Calendar calendar = Calendar.getInstance(); Calendar calendar = Calendar.getInstance();
calendar.setTime(signDate); calendar.setTime(signDate);
@ -120,10 +132,16 @@ public class ContractListDateFilterPlugin extends AbstractBillPlugIn implements
calendar.set(Calendar.SECOND, 0); calendar.set(Calendar.SECOND, 0);
calendar.set(Calendar.MILLISECOND, 0); calendar.set(Calendar.MILLISECOND, 0);
signDate = calendar.getTime(); signDate = calendar.getTime();
model.setValue("qeug_sign_date", signDate, i); model.setValue("qeug_sign_date", signDate, rowIndex);
String evalTypeNum = contractEntry.getString("ey_eval_type.number");// 评估类型 String evalType = "";
if (!"007".equals(evalTypeNum)) continue; List<DynamicObject> evalTypeList = this.getEvalTypeByContract(contract);
if (!evalTypeList.isEmpty()) {
DynamicObject dynamicObject = evalTypeList.get(0);
if (dynamicObject != null) evalType = dynamicObject.getString("number");
}
if (!"007".equals(evalType)) return;
DynamicObject contractSettle; DynamicObject contractSettle;
boolean isMainContract = contract.getBoolean("ismaincontract"); boolean isMainContract = contract.getBoolean("ismaincontract");
@ -140,10 +158,26 @@ public class ContractListDateFilterPlugin extends AbstractBillPlugIn implements
} }
if (contractSettle != null) { if (contractSettle != null) {
Date bizDate = contractSettle.getDate("bizdate");// 结算日期 Date bizDate = contractSettle.getDate("bizdate");// 结算日期
model.setValue("qeug_bizdate", bizDate, i); model.setValue("qeug_bizdate", bizDate, rowIndex);
} }
} }
} }
} }
protected List<DynamicObject> getEvalTypeByContract(DynamicObject contract) {
String bizStatus = contract.getString("bizstatus");
QFilter qFilter = new QFilter("enable", "=", true);
qFilter.and("stage", "=", "2");
DynamicObject[] evalTypeArr = BusinessDataServiceHelper.load("resm_evaltype", "stage,bizstatus", qFilter.toArray(), "number");
List<DynamicObject> evalTypeList = (List)Arrays.stream(evalTypeArr).filter((item) -> {
return item.getString("bizstatus").contains(bizStatus);
}).collect(Collectors.toList());
if (evalTypeList.isEmpty()) {
evalTypeList = (List)Arrays.stream(evalTypeArr).filter((item) -> {
return StringUtils.isEmpty(item.getString("bizstatus"));
}).collect(Collectors.toList());
}
return evalTypeList;
} }
} }

12
main/java/shkd/repc/task/DobeDWprojectTask.java
View File

@ -104,7 +104,7 @@ public class DobeDWprojectTask extends AbstractTask implements Plugin {
project_getdate = json_body.getDate("project_getdate"); project_getdate = json_body.getDate("project_getdate");
project_stage = json_body.getString("project_stage"); project_stage = json_body.getString("project_stage");
fdwid = json_body.getString("project_id"); fdwid = json_body.getString("project_id");
if(DobeDWUtils.isEmpty(fbillno) || DobeDWUtils.isEmpty(fbillname) || DobeDWUtils.isEmpty(forgid) || DobeDWUtils.isEmpty(fdwid)){ if(DobeDWUtils.isEmpty(fbillno) || DobeDWUtils.isEmpty(fbillname) || DobeDWUtils.isEmpty(fdwid)){
log.info(String.format("项目接口入参为空异常：%s", json_body.toJSONString())); log.info(String.format("项目接口入参为空异常：%s", json_body.toJSONString()));
continue; continue;
} }
@ -118,6 +118,8 @@ public class DobeDWprojectTask extends AbstractTask implements Plugin {
continue; continue;
} }
//已存在，做更新 名称 阶段 版本号等信息；组织、编号、是否叶子节点不能更新；需要前台操作 //已存在，做更新 名称 阶段 版本号等信息；组织、编号、是否叶子节点不能更新；需要前台操作
projectinfo.set("billno", fbillno);
projectinfo.set("longnumber", fbillno);//长编码
projectinfo.set("billname", fbillname); projectinfo.set("billname", fbillname);
projectinfo.set("fullname", fbillname);//项目全称 projectinfo.set("fullname", fbillname);//项目全称
// if(projectstageinfo != null){ // if(projectstageinfo != null){
@ -126,9 +128,9 @@ public class DobeDWprojectTask extends AbstractTask implements Plugin {
projectinfo.set("address", faddress); projectinfo.set("address", faddress);
projectinfo.set("acquiredate", project_getdate); projectinfo.set("acquiredate", project_getdate);
// projectinfo.set("billstatus", "A");//单据状态 A保存 B已提交 C已审核 // projectinfo.set("billstatus", "A");//单据状态 A保存 B已提交 C已审核
projectinfo.set("showflag", true);//是否列表显示 // projectinfo.set("showflag", true);//是否列表显示
projectinfo.set("enable", 1);//是否启用 // projectinfo.set("enable", 1);//是否启用
projectinfo.set("islatestversion", true);//是否最新版 // projectinfo.set("islatestversion", true);//是否最新版
projectinfo.set("mainprojectid", projectinfo.getLong("id"));//主项目ID projectinfo.set("mainprojectid", projectinfo.getLong("id"));//主项目ID
if("新拓园区".equals(project_stage)){ if("新拓园区".equals(project_stage)){
projectinfo.set("qeug_combofield", "xintuo"); projectinfo.set("qeug_combofield", "xintuo");
@ -168,7 +170,9 @@ public class DobeDWprojectTask extends AbstractTask implements Plugin {
} }
projectinfo.set("isleaf", true); projectinfo.set("isleaf", true);
projectinfo.set("enable", 1);//是否启用 projectinfo.set("enable", 1);//是否启用
// projectinfo.set("islatestversion", true);//是否最新版-审核之后系统控制的，不需要在此处设置
projectinfo.set("billstatus", "A");//单据状态 A保存 B已提交 C已审核 projectinfo.set("billstatus", "A");//单据状态 A保存 B已提交 C已审核
projectinfo.set("versionnum", "V1.0");//版本号 默认值
projectinfo.set("creator", 43007523L);//创建人默认指定为金小蝶 projectinfo.set("creator", 43007523L);//创建人默认指定为金小蝶
if("新拓园区".equals(project_stage)){ if("新拓园区".equals(project_stage)){
projectinfo.set("qeug_combofield", "xintuo"); projectinfo.set("qeug_combofield", "xintuo");