wenlukang1
/
CTSK_DEV
1
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:
陈绍鑫 2025-07-02 17:42:45 +08:00
parent 1dc2e9e50a 814398f340
commit 353b35dfd4
2 changed files with 8 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/shkd-sys-sys/src/main/java/shkd/sys/sys/mservice/PlanningService.java
View File

@ -104,7 +104,9 @@ public class PlanningService {
String result = reportDataSDKService.batchSaveReportData(qParam); String result = reportDataSDKService.batchSaveReportData(qParam);
// 4. 反序列化响应结果 // 4. 反序列化响应结果
FpmResponse<Void> responseObject = SerializationUtils.deSerializeFromBase64(result); FpmResponse<Void> responseObject = SerializationUtils.deSerializeFromBase64(result);
logger.info("是否成功：{}\n消息列表：{}", responseObject.isSuccess(), responseObject.getMessage());
logger.info("是否成功：{}\n消息列表：{}\n反序列化对象：{}",
responseObject.isSuccess(), responseObject.getMessage(), responseObject.getData());
return responseObject; return responseObject;
} }
@ -170,7 +172,8 @@ public class PlanningService {
reportAdjustBillBatchSaveResDTO.getSuccessSize();// 成功写入的调整单据总数 reportAdjustBillBatchSaveResDTO.getSuccessSize();// 成功写入的调整单据总数
reportAdjustBillBatchSaveResDTO.getFailSize();// 失败写入的调整单据总数 reportAdjustBillBatchSaveResDTO.getFailSize();// 失败写入的调整单据总数
List<String> adjustBillNoList = reportAdjustBillBatchSaveResDTO.getAdjustBillNoList();// 调整单据编号列表 List<String> adjustBillNoList = reportAdjustBillBatchSaveResDTO.getAdjustBillNoList();// 调整单据编号列表
logger.info("是否成功：{}\n消息列表：{}", responseObject.isSuccess(), responseObject.getMessage()); logger.info("是否成功：{}\n消息列表：{}\n反序列化对象：{}",
responseObject.isSuccess(), responseObject.getMessage(), responseObject.getData());
if (responseObject.isSuccess()) { if (responseObject.isSuccess()) {
logger.info("调整单据编号列表：{}", adjustBillNoList); logger.info("调整单据编号列表：{}", adjustBillNoList);
}else { }else {

35
sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/PaymentProcessingBillPlugin.java
View File

@ -1,29 +1,9 @@
package shkd.sys.sys.plugin.form; package shkd.sys.sys.plugin.form;
import dm.jdbc.util.StringUtil;
import kd.bos.bill.AbstractBillPlugIn; import kd.bos.bill.AbstractBillPlugIn;
import kd.bos.data.BusinessDataReader;
import kd.bos.dataentity.OperateOption;
import kd.bos.dataentity.entity.DynamicObject; import kd.bos.dataentity.entity.DynamicObject;
import kd.bos.dataentity.entity.DynamicObjectCollection;
import kd.bos.dataentity.metadata.IDataEntityType;
import kd.bos.entity.botp.ConvertBill;
import kd.bos.entity.botp.ConvertOpType;
import kd.bos.entity.botp.ConvertRuleCache;
import kd.bos.entity.botp.ConvertRuleElement;
import kd.bos.entity.botp.runtime.ConvertOpParameter;
import kd.bos.entity.botp.runtime.ConvertOpRule;
import kd.bos.entity.botp.runtime.ConvertOperationResult;
import kd.bos.entity.botp.runtime.DrawArgs;
import kd.bos.entity.datamodel.IBillModel;
import kd.bos.entity.datamodel.IRefrencedataProvider;
import kd.bos.entity.datamodel.ListSelectedRow;
import kd.bos.entity.datamodel.ListSelectedRowCollection;
import kd.bos.entity.datamodel.events.ChangeData;
import kd.bos.entity.datamodel.events.PropertyChangedArgs;
import kd.bos.entity.operate.result.OperationResult; import kd.bos.entity.operate.result.OperationResult;
import kd.bos.form.FormShowParameter; import kd.bos.form.FormShowParameter;
import kd.bos.form.IPageCache;
import kd.bos.form.control.Control; import kd.bos.form.control.Control;
import kd.bos.form.control.Toolbar; import kd.bos.form.control.Toolbar;
import kd.bos.form.control.events.AfterShowTipsEvent; import kd.bos.form.control.events.AfterShowTipsEvent;
@ -31,28 +11,19 @@ import kd.bos.form.control.events.BeforeShowTipsEvent;
import kd.bos.form.control.events.ItemClickEvent; import kd.bos.form.control.events.ItemClickEvent;
import kd.bos.form.control.events.TipsListener; import kd.bos.form.control.events.TipsListener;
import kd.bos.form.events.AfterDoOperationEventArgs; import kd.bos.form.events.AfterDoOperationEventArgs;
import kd.bos.form.events.BeforeDoOperationEventArgs;
import kd.bos.form.field.FieldEdit; import kd.bos.form.field.FieldEdit;
import kd.bos.form.field.RefBillEdit;
import kd.bos.form.field.events.BeforeF7SelectEvent;
import kd.bos.form.field.events.BeforeF7SelectListener;
import kd.bos.form.operate.AbstractOperate;
import kd.bos.form.operate.botp.Push;
import kd.bos.list.ListShowParameter;
import kd.bos.logging.Log; import kd.bos.logging.Log;
import kd.bos.logging.LogFactory; import kd.bos.logging.LogFactory;
import kd.bos.orm.query.QCP; import kd.bos.orm.query.QCP;
import kd.bos.orm.query.QFilter; import kd.bos.orm.query.QFilter;
import kd.bos.servicehelper.BusinessDataServiceHelper; import kd.bos.servicehelper.BusinessDataServiceHelper;
import kd.bos.servicehelper.botp.ConvertServiceHelper;
import kd.bos.servicehelper.operation.OperationServiceHelper;
import kd.bos.servicehelper.operation.SaveServiceHelper; import kd.bos.servicehelper.operation.SaveServiceHelper;
import kd.fi.cas.util.EmptyUtil;
import kd.sdk.plugin.Plugin; import kd.sdk.plugin.Plugin;
import kd.tmc.cdm.common.constant.CdmEntityConst;
import shkd.sys.sys.mservice.ApiService; import shkd.sys.sys.mservice.ApiService;
import java.util.*; import java.util.ArrayList;
import java.util.EventObject;
import java.util.List;
import static kd.bos.servicehelper.workflow.WorkflowServiceHelper.abandonByBusienssKey; import static kd.bos.servicehelper.workflow.WorkflowServiceHelper.abandonByBusienssKey;