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

Merge remote-tracking branch 'orinin/main'

Browse Source 
# Conflicts:
#	.gitignore
#	src/main/java/com/yem/rf/salescommission/SalesOfRoyaltyParts.java
#	src/main/java/com/yem/tws/task/CusdecToDeclaredocxTask.java
#	src/main/java/com/yem/wm/es/salescontrac/op/SalesContracUnauditOp.java
#	src/main/java/com/yem/wm/es/salesorder/from/SalesOrderPJEdit.java
#	src/main/java/com/yem/wm/es/salesorder/from/SalesOrderZJEdit.java
#	src/main/java/com/yem/wm/es/salesorder/op/SalesOrderAuditOp.java
#	src/main/java/com/yem/wm/es/salesorder/utils/SalesOrderUtils.java
#	src/main/java/com/yem/wm/es/shippingdetails/op/ShippingDetailsAuditOp.java
#	src/main/java/com/yem/wm/es/shippingdetails/op/XshippingDetailsSaveOp.java
#	src/main/java/com/yem/wm/im/csrCreditLine/task/CsrCreditLineTask.java
#	src/main/java/com/yem/wm/im/inquirylist/op/InquirylistAudit.java
#	src/main/java/com/yem/wm/syn/eas/api/OperationalUniversal.java
#	src/main/java/com/yem/wm/sys/utils/NewVersionHelper.java
#	src/main/java/com/yem/wm/utils/ContactSignUtils.java
This commit is contained in:
ljw 2024-11-19 18:09:21 +08:00
commit fad828255f
11 changed files with 146 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
font/fonts.properties/yxzg-topview-dev/simsun.ttc Normal file
View File

Binary file not shown.

85
src/main/java/com/yem/or/api/AssepcDynamic.java
View File

@ -33,6 +33,10 @@ import java.math.BigDecimal;
import java.text.ParseException; import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
/** /**
* @author zhouc * @author zhouc
@ -434,8 +438,8 @@ public class AssepcDynamic {
List<Map<String, Object>> result = new ArrayList<>(); List<Map<String, Object>> result = new ArrayList<>();
QFilter qFilter = new QFilter("yem_customer.number", QCP.equals, number); QFilter qFilter = new QFilter("yem_customer.number", QCP.equals, number);
qFilter.and("status", QCP.equals, "C"); qFilter.and("status", QCP.equals, "C");
ORM orm = ORM.create(); String selectfields = DynamicObjectUtil.getSelectfields("yem_em_devicefiles");
DynamicObjectCollection load = orm.query("yem_em_devicefiles", qFilter.toArray()); DynamicObjectCollection load = ORM.create().query("yem_em_devicefiles", selectfields + ",id", qFilter.toArray());
for (DynamicObject dynamicObject : load) { for (DynamicObject dynamicObject : load) {
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
map.put("id", dynamicObject.getPkValue()); map.put("id", dynamicObject.getPkValue());
@ -450,7 +454,7 @@ public class AssepcDynamic {
DynamicObject group = dynamicObject.getDynamicObject("group"); DynamicObject group = dynamicObject.getDynamicObject("group");
if (group != null) { if (group != null) {
map.put("yem_products_number", group.getString("number")); map.put("yem_products_number", group.getString("number"));
DynamicObject single = BusinessDataServiceHelper.loadSingle(group.getLong("id"), "yem_em_electronicgroup"); DynamicObject single = BusinessDataServiceHelper.loadSingleFromCache(group.getLong("id"), "yem_em_electronicgroup", "id, yem_model, yem_modelname, yem_modelenname");
map.put("productnumber", single.getString("yem_model")); map.put("productnumber", single.getString("yem_model"));
map.put("productname", single.getString("yem_modelname")); map.put("productname", single.getString("yem_modelname"));
map.put("productenname", single.getString("yem_modelenname")); map.put("productenname", single.getString("yem_modelenname"));
@ -463,7 +467,7 @@ public class AssepcDynamic {
map.put("number", dynamicObject.getString("number")); map.put("number", dynamicObject.getString("number"));
DynamicObject model = dynamicObject.getDynamicObject("yem_model"); DynamicObject model = dynamicObject.getDynamicObject("yem_model");
if (model != null) { if (model != null) {
DynamicObject modelObj = BusinessDataServiceHelper.loadSingle(model.getPkValue(), "yem_bd_basemodelib"); DynamicObject modelObj = BusinessDataServiceHelper.loadSingleFromCache(model.getPkValue(), "yem_bd_basemodelib", "id, number, yem_zhdescription, yem_endescription");
map.put("yem_modelno", modelObj.getString("number")); map.put("yem_modelno", modelObj.getString("number"));
String zhdescription = modelObj.getString("yem_zhdescription"); String zhdescription = modelObj.getString("yem_zhdescription");
map.put("zhdescription", zhdescription); map.put("zhdescription", zhdescription);
@ -500,6 +504,7 @@ public class AssepcDynamic {
result.add(map); result.add(map);
} }
return CustomApiResult.success(result); return CustomApiResult.success(result);
} }
@ -542,51 +547,59 @@ public class AssepcDynamic {
@ApiParam("每一页个数") int number) { @ApiParam("每一页个数") int number) {
material = material.trim(); material = material.trim();
JSONArray jsonArray = new JSONArray(); JSONArray jsonArray = new JSONArray();
QFilter qFilter = new QFilter("yem_productclass.number", QCP.equals, modnumber + "PJ"); QFilter qFilter = new QFilter("yem_productclass.number", QCP.equals, modnumber + "PJ").and(new QFilter("yem_accessory.yem_material.number", QCP.equals, material));
qFilter.and(new QFilter("yem_accessory.yem_material.number", QCP.equals, material)); qFilter.or(new QFilter("yem_productclass.number", QCP.equals, modnumber + "PJ").and(new QFilter("yem_accessory.yem_material.name", QCP.like, "%" + material + "%")));
// QFilter qFilter = new QFilter("yem_productclass.number", QCP.equals, modnumber + "PJ").and(new QFilter("yem_accessory.yem_material.name", QCP.like, "%" + material + "%"));
String selectfield = DynamicObjectUtil.getSelectfields("yem_pricelibrary", false); String selectfield = DynamicObjectUtil.getSelectfields("yem_pricelibrary", false);
String selectfields = DynamicObjectUtil.getEntrySelectfields(selectfield, "yem_pricelibrary", "yem_accessory", false); String selectfields = DynamicObjectUtil.getEntrySelectfields(selectfield, "yem_pricelibrary", "yem_accessory", false);
DynamicObject[] loaded = BusinessDataServiceHelper.load("yem_pricelibrary", selectfields, new QFilter[]{qFilter}, "auditdate desc"); DynamicObject[] loaded = BusinessDataServiceHelper.load("yem_pricelibrary", selectfields, qFilter.toArray(), "auditdate desc");
JSONObject object = new JSONObject(); JSONObject object = new JSONObject();
Map<String, Date> map = new HashMap<>(); // Map<String, Date> map = new HashMap<>();
List<String> stringList = new ArrayList<>(); List<String> stringList = new ArrayList<>();
int i = 0; int i = 0;
if (loaded.length > 0) { if (loaded.length > 0) {
for (DynamicObject dynamicObject : loaded) { for (DynamicObject dynamicObject : loaded) {
Date yemBizdate = dynamicObject.getDate("auditdate"); // Date yemBizdate = dynamicObject.getDate("auditdate");
DynamicObjectCollection dynamicObjectCollection = dynamicObject.getDynamicObjectCollection("yem_accessory"); DynamicObjectCollection dynamicObjectCollection = dynamicObject.getDynamicObjectCollection("yem_accessory");
if (dynamicObjectCollection.size() > 0) { if (dynamicObjectCollection.size() > 0) {
for (DynamicObject collection : dynamicObjectCollection) { for (DynamicObject collection : dynamicObjectCollection) {
DynamicObject yemMaterial = collection.getDynamicObject("yem_material"); DynamicObject yemMaterial = collection.getDynamicObject("yem_material");
if (yemMaterial != null) { // if (yemMaterial != null) {
String yemMaterialString = yemMaterial.getString("number"); // String yemMaterialString = yemMaterial.getString("number");
if (map.get(yemMaterialString) == null) { // if (map.get(yemMaterialString) == null) {
map.put(yemMaterialString, yemBizdate); // map.put(yemMaterialString, yemBizdate);
JSONObject jsonObject = new JSONObject(); // JSONObject jsonObject = new JSONObject();
int i1 = number * (page - 1); // int i1 = number * (page - 1);
int i2 = number * page; // int i2 = number * page;
stringList.add(yemMaterialString); // stringList.add(yemMaterialString);
String string = ""; // String string = "";
for (String s : stringList) { // for (String s : stringList) {
if (s.equals(material)) { // if (s.equals(material)) {
string = s; // string = s;
} // }
} // }
if (string.equals(yemMaterialString)) { // if (string.equals(yemMaterialString)) {
if (i >= i1 && i < i2) { //
jsonObject.put("material", collection.getString("yem_material.number")); // }
jsonObject.put("materialename", collection.getString("yem_materialename")); //// jsonObjectS.put("total", i);//总数
jsonObject.put("markup", collection.getString("yem_markup")); // }
jsonObject.put("standsalesprice", collection.getBigDecimal("yem_standsalesprice")); // }
jsonObject.put("remark_a", collection.getString("yem_remark_a")); if (material.equals(yemMaterial.getString("number")) || yemMaterial.getString("name").contains(material)) {
jsonObject.put("easentryid", collection.getString("yem_easentryid")); JSONObject jsonObject = new JSONObject();
jsonArray.add(jsonObject); int i1 = number * (page - 1);
} int i2 = number * page;
i++; if (i >= i1 && i < i2) {
} jsonObject.put("material", collection.getString("yem_material.number"));
// jsonObjectS.put("total", i);//总数 jsonObject.put("materialename", collection.getString("yem_materialename"));
jsonObject.put("markup", collection.getString("yem_markup"));
jsonObject.put("standsalesprice", collection.getBigDecimal("yem_standsalesprice"));
jsonObject.put("remark_a", collection.getString("yem_remark_a"));
jsonObject.put("easentryid", collection.getString("yem_easentryid"));
jsonArray.add(jsonObject);
} }
i++;
} }
} }
} }
} }

2
src/main/java/com/yem/rf/salescommission/SalesOfRoyaltyParts.java
View File

@ -55,7 +55,7 @@ public class SalesOfRoyaltyParts extends AbstractReportListDataPlugin {
.finish(); .finish();
//CASE WHEN yem_es_materialinfo.yem_ifgift = '1' THEN (yem_es_materialinfo.yem_fobprice * yem_qty) ELSE yem_es_materialinfo.yem_afterfrontdisamt END yem_actualsalesamount //CASE WHEN yem_es_materialinfo.yem_ifgift = '1' THEN (yem_es_materialinfo.yem_fobprice * yem_qty) ELSE yem_es_materialinfo.yem_afterfrontdisamt END yem_actualsalesamount
resDataSet = resDataSet.select(String.join(",",RptUtil.getDataSetFiledAlias(resDataSet))+ resDataSet = resDataSet.select(String.join(",",RptUtil.getDataSetFiledAlias(resDataSet))+
",CASE WHEN yem_ifgift = '1' THEN (yem_fobprice * yem_qty) ELSE (yem_afterfrontdisprice * yem_qty) END yem_actualsalesamount"); ",CASE WHEN yem_ifgift = true THEN (yem_fobprice * yem_qty) ELSE (yem_afterfrontdisprice * yem_qty) END yem_actualsalesamount");
DataSet select = resDataSet.select(String.join(",", RptUtil.getDataSetFiledAlias(resDataSet)) + DataSet select = resDataSet.select(String.join(",", RptUtil.getDataSetFiledAlias(resDataSet)) +
",yem_actualsalesamount * yem_exchangerate yem_outboundamount" + ",yem_actualsalesamount * yem_exchangerate yem_outboundamount" +
",CASE WHEN yem_salcontractclaamt >= yem_offeramount THEN claimstate ELSE '' END yem_payments" + ",CASE WHEN yem_salcontractclaamt >= yem_offeramount THEN claimstate ELSE '' END yem_payments" +

21
src/main/java/com/yem/wm/demo.java Normal file
View File

@ -0,0 +1,21 @@
package com.yem.wm;
import kd.bos.bill.AbstractBillPlugIn;
import kd.bos.form.control.QRCode;
import java.util.EventObject;
/**
* @author zhouc
* @date 2024/8/30 19:04
* @className demo
* @description
*/
public class demo extends AbstractBillPlugIn {
@Override
public void afterBindData(EventObject e) {
super.afterBindData(e);
QRCode code = this.getView().getControl("yem_qrcodeap");
code.setUrl("https://www.baidu.com/");
}
}

9
src/main/java/com/yem/wm/es/shippingdetails/op/ShippingDetailSaveOp.java
View File

@ -2,27 +2,22 @@ package com.yem.wm.es.shippingdetails.op;
import com.alibaba.druid.support.logging.Log; import com.alibaba.druid.support.logging.Log;
import com.alibaba.druid.support.logging.LogFactory; import com.alibaba.druid.support.logging.LogFactory;
import com.kingdee.cosmic.ctrl.common.CtrlUtil;
import com.yem.wm.bc.companytitle.form.CompanyTitleEdit; import com.yem.wm.bc.companytitle.form.CompanyTitleEdit;
import com.yem.wm.es.Util.BoxTypeDataGen; import com.yem.wm.es.Util.BoxTypeDataGen;
import com.yem.wm.utils.DynamicObjectUtil; import com.yem.wm.utils.DynamicObjectUtil;
import com.yem.wm.utils.YEM; import com.yem.wm.utils.YEM;
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.entity.DynamicObjectCollection;
import kd.bos.entity.operate.result.OperationResult;
import kd.bos.entity.plugin.AbstractOperationServicePlugIn; import kd.bos.entity.plugin.AbstractOperationServicePlugIn;
import kd.bos.entity.plugin.PreparePropertysEventArgs; import kd.bos.entity.plugin.PreparePropertysEventArgs;
import kd.bos.entity.plugin.args.EndOperationTransactionArgs; import kd.bos.entity.plugin.args.EndOperationTransactionArgs;
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.operation.OperationServiceHelper;
import kd.bos.servicehelper.operation.SaveServiceHelper; import kd.bos.servicehelper.operation.SaveServiceHelper;
import java.math.BigDecimal; import java.util.ArrayList;
import java.math.RoundingMode; import java.util.List;
import java.util.*;
/** /**
* @author 张立攀 * @author 张立攀

32
src/main/java/com/yem/wm/es/xsalesorder/from/XSalesOrderFromEdit.java
View File

@ -1,9 +1,11 @@
package com.yem.wm.es.xsalesorder.from; package com.yem.wm.es.xsalesorder.from;
import com.yem.wm.utils.DynamicObjectUtil;
import com.yem.wm.utils.FunctionalCommon; import com.yem.wm.utils.FunctionalCommon;
import com.yem.wm.utils.YEM; import com.yem.wm.utils.YEM;
import kd.bos.bill.AbstractBillPlugIn; import kd.bos.bill.AbstractBillPlugIn;
import kd.bos.dataentity.entity.DynamicObject; import kd.bos.dataentity.entity.DynamicObject;
import kd.bos.dataentity.entity.DynamicObjectCollection;
import kd.bos.entity.botp.runtime.BFRow; import kd.bos.entity.botp.runtime.BFRow;
import kd.bos.entity.datamodel.IDataModel; import kd.bos.entity.datamodel.IDataModel;
import kd.bos.entity.datamodel.RowDataEntity; import kd.bos.entity.datamodel.RowDataEntity;
@ -92,12 +94,32 @@ public class XSalesOrderFromEdit extends AbstractBillPlugIn {
if ("yem_es_materialinfo".equals(name)) { if ("yem_es_materialinfo".equals(name)) {
for(int rowIndex : rowIndexs){ for(int rowIndex : rowIndexs){
Long yem_sourceentryid = (Long)model.getValue("yem_sourceentryid",rowIndex); Long yem_sourceentryid = (Long)model.getValue("yem_sourceentryid",rowIndex);
List<BFRow> loadSourceRowIds = BFTrackerServiceHelper.loadSourceRowIds("yem_es_salesorder", name,new Long[]{yem_sourceentryid} ); // List<BFRow> loadSourceRowIds = BFTrackerServiceHelper.loadSourceRowIds("yem_es_salesorder", name,new Long[]{yem_sourceentryid} );
List<BFRow> loadTargetRowIds = BFTrackerServiceHelper.loadTargetRowIds("yem_es_salesorder", name,new Long[]{yem_sourceentryid} ); // List<BFRow> loadTargetRowIds = BFTrackerServiceHelper.loadTargetRowIds("yem_es_salesorder"
if(loadTargetRowIds.size() > 0) { // , name,new Long[]{(long)model.getValue("yem_masterid")},new Long[]{yem_sourceentryid} ,null);
e.setCancel(true);//阻断增行 String selectfield = DynamicObjectUtil.getSelectfields("yem_es_salesorder", false);
view.showTipNotification("该分录已存在下游，禁止删除。"); String selectfields = DynamicObjectUtil.getEntrySelectfields(selectfield, "yem_es_salesorder", "yem_es_materialinfo", false);
DynamicObject loadSingle = BusinessDataServiceHelper.loadSingle("yem_es_salesorder", selectfields
, new QFilter[]{new QFilter("id", QCP.equals, model.getValue("yem_masterid"))});
if (loadSingle!=null) {
DynamicObjectCollection yemEsMaterialinfo = loadSingle.getDynamicObjectCollection("yem_es_materialinfo");
if (!yemEsMaterialinfo.isEmpty()){
for (DynamicObject dynamicObject : yemEsMaterialinfo) {
long aLong = dynamicObject.getLong("id");
if (aLong == yem_sourceentryid){
String yemIntauditbusano = dynamicObject.getString("yem_intauditbusano");
if (!"".equals(yemIntauditbusano)){
e.setCancel(true);//阻断增行
view.showTipNotification("第"+(rowIndex+1)+"行分录已存在下游，禁止删除。");
}
}
}
}
} }
// if(loadTargetRowIds.size() > 0) {
// e.setCancel(true);//阻断增行
// view.showTipNotification("该分录已存在下游，禁止删除。");
// }
} }
} }
} }

7
src/main/java/com/yem/wm/fm/gathering/from/GatheringEcit.java
View File

@ -85,11 +85,7 @@ public class GatheringEcit extends AbstractBillPlugIn implements BeforeF7SelectL
rowCount += receiptdetail.size(); rowCount += receiptdetail.size();
} }
if (rowCount > 0) { view.setEnable(rowCount <= 0, "yem_comegoman");
view.setEnable(false, "yem_comegoman");
} else {
view.setEnable(true, "yem_comegoman");
}
} }
@Override @Override
@ -1249,7 +1245,6 @@ public class GatheringEcit extends AbstractBillPlugIn implements BeforeF7SelectL
} }
if (result == MessageBoxResult.No) { if (result == MessageBoxResult.No) {
view.invokeOperation("refresh"); view.invokeOperation("refresh");
return;
} }
} }
} }

2
src/main/java/com/yem/wm/im/debcrednotenew/validator/DebCredNewAuditValidatorOp.java
View File

@ -134,7 +134,7 @@ public class DebCredNewAuditValidatorOp extends AbstractValidator {
DynamicObjectCollection data11 = null; DynamicObjectCollection data11 = null;
if (YEM.isNotEmpty(getaccamtusetype)) { if (YEM.isNotEmpty(getaccamtusetype)) {
QFilter qFilter1 = new QFilter("yem_contracttype", QCP.equals, getaccamtusetype.getString("yem_billtype.number"));//合同类型 QFilter qFilter1 = new QFilter("yem_contracttype", QCP.equals, getaccamtusetype.getString("yem_billtype.number"));//合同类型
qFilter1.and(new QFilter("yem_accamtusetype", QCP.equals, getaccamtusetype.getString("yem_fundusetype"))); qFilter1.and(new QFilter("yem_accamtusetype", QCP.equals, getaccamtusetype.getString("yem_accamtusetype")));
qFilter1.and(new QFilter("yem_billbusstype.number", QCP.equals, getaccamtusetype.getString("yem_billbusstype.number"))); qFilter1.and(new QFilter("yem_billbusstype.number", QCP.equals, getaccamtusetype.getString("yem_billbusstype.number")));
qFilter1.and(new QFilter("enable", QCP.equals, "1")); qFilter1.and(new QFilter("enable", QCP.equals, "1"));
String selectfield1 = DynamicObjectUtil.getSelectfields("yem_bd_credittypeconfig", false); String selectfield1 = DynamicObjectUtil.getSelectfields("yem_bd_credittypeconfig", false);

26
src/main/java/com/yem/wm/rpt/PaymentDetailsFormPlugIn.java Normal file
View File

@ -0,0 +1,26 @@
package com.yem.wm.rpt;
import kd.bos.bill.AbstractBillPlugIn;
import kd.bos.dataentity.entity.DynamicObject;
import kd.bos.form.FormShowParameter;
import java.util.EventObject;
import java.util.Map;
/**
* @author zhouc
* @date 2024/6/18 12:15
* @className PaymentDetailsFormPlugIn
* @description 外汇来款明细表单插件
*/
public class PaymentDetailsFormPlugIn extends AbstractBillPlugIn {
@Override
public void afterBindData(EventObject e) {
super.afterBindData(e);
FormShowParameter showParameter = this.getView().getFormShowParameter();
Map<String, Object> customParas = showParameter.getCustomParams();
DynamicObject dataEntity = this.getModel().getDataEntity(true);
Object pkValue = dataEntity.getPkValue();
}
}

11
src/main/java/com/yem/wm/utils/YunzhijiaUtils.java
View File

@ -42,6 +42,8 @@ import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.http.impl.client.HttpClients; import org.apache.http.impl.client.HttpClients;
import org.apache.http.message.BasicHeader; import org.apache.http.message.BasicHeader;
import org.apache.http.util.EntityUtils; import org.apache.http.util.EntityUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.commons.CommonsMultipartFile; import org.springframework.web.multipart.commons.CommonsMultipartFile;
@ -57,6 +59,9 @@ import java.util.List;
import java.util.Map; import java.util.Map;
public class YunzhijiaUtils { public class YunzhijiaUtils {
private final static Logger logger = LoggerFactory.getLogger(YunzhijiaUtils.class);
public static String yzjurl = "http://10.64.113.120:8080";//测试 public static String yzjurl = "http://10.64.113.120:8080";//测试
public static String getOpenId(String phonNum) throws IOException, NoSuchAlgorithmException, KeyManagementException { public static String getOpenId(String phonNum) throws IOException, NoSuchAlgorithmException, KeyManagementException {
String req ="{\"type\":0,\"array\":[\""+phonNum+"\"]}"; String req ="{\"type\":0,\"array\":[\""+phonNum+"\"]}";
@ -186,10 +191,10 @@ public class YunzhijiaUtils {
yemIalog.set("yem_success", success);//是否成功 yemIalog.set("yem_success", success);//是否成功
yemIalog.set("yem_req", json.toString());//请求参数 yemIalog.set("yem_req", json.toString());//请求参数
yemIalog.set("billstatus", "A");//请求参数 yemIalog.set("billstatus", "A");//请求参数
yemIalog.set("yem_response", s);//返回参数 yemIalog.set("yem_response", s);//返回参数
yemIalog.set("yem_flowinstid", flowInstId);//流程实例ID yemIalog.set("yem_flowinstid", flowInstId);//流程实例ID
yemIalog.set("yem_forminstid", formInstId);//表单实例ID yemIalog.set("yem_forminstid", formInstId);//表单实例ID
logger.info("成功");
SaveServiceHelper.save(new DynamicObject[]{yemIalog}); SaveServiceHelper.save(new DynamicObject[]{yemIalog});
passDataEntitys.add(dataEntity); passDataEntitys.add(dataEntity);
} else { } else {
@ -219,6 +224,7 @@ public class YunzhijiaUtils {
yemIalog.set("yem_billtype", yem_billtype);//单据类型 yemIalog.set("yem_billtype", yem_billtype);//单据类型
yemIalog.set("yem_success", false);//是否成功 yemIalog.set("yem_success", false);//是否成功
yemIalog.set("yem_req", json.toString());//请求参数 yemIalog.set("yem_req", json.toString());//请求参数
logger.error(ex.toString());
if (ex instanceof KDException) { if (ex instanceof KDException) {
yemIalog.set("yem_error", ((KDException) ex).getStackTraceMessage());//异常信息 yemIalog.set("yem_error", ((KDException) ex).getStackTraceMessage());//异常信息
addErrMessage(operationResult, dataEntity, "云之家接口调用异常：" + ((KDException) ex).getStackTraceMessage()); addErrMessage(operationResult, dataEntity, "云之家接口调用异常：" + ((KDException) ex).getStackTraceMessage());
@ -334,9 +340,10 @@ public class YunzhijiaUtils {
yemIalog.set("yem_error", ex.toString());//异常信息 yemIalog.set("yem_error", ex.toString());//异常信息
addErrMessage(operationResult, dynamicObject, "云之家接口调用异常：" + ex.toString()); addErrMessage(operationResult, dynamicObject, "云之家接口调用异常：" + ex.toString());
} }
// SaveServiceHelper.save(new DynamicObject[]{yemIalog});
} finally {
SaveServiceHelper.save(new DynamicObject[]{yemIalog}); SaveServiceHelper.save(new DynamicObject[]{yemIalog});
} }
SaveServiceHelper.save(new DynamicObject[]{yemIalog});
} }
/** /**
* 向操作结果，添加一条错误提示 * 向操作结果，添加一条错误提示

18
src/main/java/kd/cosmic/Application.java
View File

@ -20,17 +20,17 @@ public class Application {
cosmic.setWebPath("D:/Cosine/Comics_Debug/Comics_YXZG/YXZG-server/webapp"); cosmic.setWebPath("D:/Cosine/Comics_Debug/Comics_YXZG/YXZG-server/webapp");
////152 ////152
cosmic.setClusterNumber("yxzg-topview-dev"); // cosmic.setClusterNumber("yxzg-topview-dev");
cosmic.setTenantNumber("yxzg-topview-dev"); // cosmic.setTenantNumber("yxzg-topview-dev");
cosmic.setServerIP("10.64.112.152"); // cosmic.setServerIP("10.64.112.152");
cosmic.setFileServerPathIPAndPort("", ""); // cosmic.setFileServerPathIPAndPort("", "");
cosmic.setConfigUrl("10.64.112.152:2181", "zookeeper", "Cosmic@5092"); // cosmic.setConfigUrl("10.64.112.152:2181", "zookeeper", "Cosmic@5092");
System.setProperty("mq.debug.queue.tag", "wrxtest"); System.setProperty("mq.debug.queue.tag", "wrxtest");
////134 ////134
// cosmic.setClusterNumber("yxzg-prod"); cosmic.setClusterNumber("yxzg-prod");
// cosmic.setTenantNumber("yxzg-prod"); cosmic.setTenantNumber("yxzg-prod");
// cosmic.setServerIP("10.64.111.134"); cosmic.setServerIP("10.64.111.134");
// cosmic.setConfigUrl("10.64.111.134:2181","zookeeper","d@f*g:SGVsbG8==U4HRwjlqTOp0p9b60T+T8D2fQ8ThQgJLu/qgfLyLgknPa2RwYXNzd29yZA=="); cosmic.setConfigUrl("10.64.111.134:2181","zookeeper","d@f*g:SGVsbG8==U4HRwjlqTOp0p9b60T+T8D2fQ8ThQgJLu/qgfLyLgknPa2RwYXNzd29yZA==");
cosmic.setStartWithQing(false); cosmic.setStartWithQing(false);
cosmic.start(); cosmic.start();