violet/ensign
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "fix:合同签章申请"

Browse Source 
This reverts commit b55fecb7fa.
This commit is contained in:
ljw 2024-09-25 21:58:51 +08:00
parent b55fecb7fa
commit 8050609cad
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/yem/ia/intebilllogon/Utils/ObjectToJsonUtils.java
View File

@ -164,7 +164,7 @@ public class ObjectToJsonUtils {
} }
//是否附件 //是否附件
if (yem_isattachment) { if (yem_isattachment) {
JSONArray jsonArray = CommonUtils.GetAttachment(entityName, pkid, yem_attachmentkey, dataEntity); JSONArray jsonArray = CommonUtils.GetAttachment(entityName, pkid, yem_attachmentkey,dataEntity);
if (jsonArray != null && jsonArray.size() > 0) { if (jsonArray != null && jsonArray.size() > 0) {
widgetValueObject.put(yem_iaformid, jsonArray); widgetValueObject.put(yem_iaformid, jsonArray);
} }
@ -240,7 +240,7 @@ public class ObjectToJsonUtils {
} }
jsonArray.add(entityObject); jsonArray.add(entityObject);
} }
} else { }else{
JSONObject entityObject = new JSONObject(); JSONObject entityObject = new JSONObject();
for (int j = 0; j < yem_subentryentity.size(); j++) { for (int j = 0; j < yem_subentryentity.size(); j++) {
DynamicObject subentryentity = yem_subentryentity.get(j); DynamicObject subentryentity = yem_subentryentity.get(j);

8
src/main/java/com/yem/wm/bc/bill/op/SalesorderSignatureOp.java
View File

@ -150,7 +150,7 @@ public class SalesorderSignatureOp extends AbstractOperationServicePlugIn {
String name = dynamicObject.getDynamicObjectType().getName(); String name = dynamicObject.getDynamicObjectType().getName();
if ("yem_es_salesorder".equals(name)) { if ("yem_es_salesorder".equals(name)) {
qFilter.and(new QFilter("billno", QCP.equals, "WXHT-YZJ")); qFilter.and(new QFilter("billno", QCP.equals, "WXHT-YZJ"));
} else if ("yem_es_xsalesorder".equals(name)) { }else if ("yem_es_xsalesorder".equals(name)){
qFilter.and(new QFilter("billno", QCP.equals, "WXHTBG-GZSP")); qFilter.and(new QFilter("billno", QCP.equals, "WXHTBG-GZSP"));
} }
DynamicObject yem_ia_intebilllogon = BusinessDataServiceHelper.loadSingle("yem_ia_intebilllogon", "id", qFilter.toArray()); DynamicObject yem_ia_intebilllogon = BusinessDataServiceHelper.loadSingle("yem_ia_intebilllogon", "id", qFilter.toArray());
@ -159,11 +159,7 @@ public class SalesorderSignatureOp extends AbstractOperationServicePlugIn {
//查询单据注册数据 //查询单据注册数据
DynamicObject data = BusinessDataServiceHelper.loadSingle(intebilllogonID, "yem_ia_intebilllogon"); DynamicObject data = BusinessDataServiceHelper.loadSingle(intebilllogonID, "yem_ia_intebilllogon");
if (data != null && pkid != null && pkid != "") { if (data != null && pkid != null && pkid != "") {
if ("yem_es_xsalesorder".equals(name) || "yem_es_salesorder".equals(name)) { Object = ObjectToJsonUtils.ToJson(data, pkid, name, ObjectToJsonUtils.getpostcreator());
Object = ObjectToJsonUtils.ToJson(data, pkid, name, dynamicObject.getString("yem_operator.useropenid"));
} else {
Object = ObjectToJsonUtils.ToJson(data, pkid, name, ObjectToJsonUtils.getpostcreator());
}
} }
} else { } else {
this.operationResult.addErrorInfo(new ValidationErrorInfo("", pkid, this.operationResult.addErrorInfo(new ValidationErrorInfo("", pkid,