|
@@ -55,8 +55,6 @@ public class DispatchMidController implements Serializable {
|
|
|
if (StringUtils.isEmpty(errorCode) && StringUtils.isEmpty(errorChange)) {
|
|
|
//下推生成资产调拨单
|
|
|
Push(eobject, map);
|
|
|
- //生单后反写中间表,防止反复生单
|
|
|
- OncePush(eobject.getString("billno"));
|
|
|
}
|
|
|
// 错误拼接
|
|
|
appendErrorMessages(resultString, errorChange, errorCode);
|
|
@@ -193,7 +191,7 @@ public class DispatchMidController implements Serializable {
|
|
|
if ("0".equals(dispatchType)) {
|
|
|
DynamicObject dispatch = BusinessDataServiceHelper.newDynamicObject("fa_dispatch");
|
|
|
String nckd_card_real_code = jsonObject.getString("nckd_card_real_code");
|
|
|
- nckd_card_real_code = "A00100101900240600007";
|
|
|
+ nckd_card_real_code = "A00100101900240600005";
|
|
|
|
|
|
//单据头
|
|
|
dispatch.set("outuser", map.get("sendUser"));//调出申请人
|
|
@@ -234,13 +232,19 @@ public class DispatchMidController implements Serializable {
|
|
|
}
|
|
|
//执行保存-提交-审核
|
|
|
OperationResult saveResult = SaveServiceHelper.saveOperate("fa_dispatch", new DynamicObject[]{dispatch}, OperateHelper.createOperate());
|
|
|
- OperationResult submitResult = OperationServiceHelper.executeOperate("submit", "fa_dispatch",saveResult.getSuccessPkIds().toArray(),OperateHelper.createOperate());
|
|
|
- OperationResult auditResult = OperationServiceHelper.executeOperate("audit", "fa_dispatch",submitResult.getSuccessPkIds().toArray(),OperateHelper.createOperate());
|
|
|
+ if (saveResult.isSuccess()){
|
|
|
+ //生单后反写中间表,防止反复生单
|
|
|
+ OncePush(jsonObject.getString("billno"));
|
|
|
+ OperationResult submitResult = OperationServiceHelper.executeOperate("submit", "fa_dispatch",saveResult.getSuccessPkIds().toArray(),OperateHelper.createOperate());
|
|
|
+ OperationResult auditResult = OperationServiceHelper.executeOperate("audit", "fa_dispatch",submitResult.getSuccessPkIds().toArray(),OperateHelper.createOperate());
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
}//组织内,生成资产变更单
|
|
|
else if ("1".equals(dispatchType)) {
|
|
|
DynamicObject changeDept = BusinessDataServiceHelper.newDynamicObject("fa_change_dept");
|
|
|
String nckd_card_real_code = jsonObject.getString("nckd_card_real_code");
|
|
|
- nckd_card_real_code = "A00100101900240600004";
|
|
|
+ nckd_card_real_code = "A00100101900240600007";
|
|
|
DynamicObject orgInfo = queryOrg(map.get("orgId"));
|
|
|
//单据头
|
|
|
changeDept.set("org", orgInfo);//核算组织
|
|
@@ -314,10 +318,14 @@ public class DispatchMidController implements Serializable {
|
|
|
finentry1.set("bizdate", jsonObject.getDate("sendDate"));
|
|
|
|
|
|
}
|
|
|
-// //执行保存-提交-审核
|
|
|
+ //执行保存-提交-审核
|
|
|
OperationResult saveResult = SaveServiceHelper.saveOperate("fa_change_dept", new DynamicObject[]{changeDept}, OperateHelper.createOperate());
|
|
|
- OperationResult submitResult = OperationServiceHelper.executeOperate("submit", "fa_change_dept",saveResult.getSuccessPkIds().toArray(),OperateHelper.createOperate());
|
|
|
- OperationResult auditResult = OperationServiceHelper.executeOperate("audit", "fa_change_dept",submitResult.getSuccessPkIds().toArray(),OperateHelper.createOperate());
|
|
|
+ if (saveResult.isSuccess()) {
|
|
|
+ //生单后反写中间表,防止反复生单
|
|
|
+ OncePush(jsonObject.getString("billno"));
|
|
|
+ OperationResult submitResult = OperationServiceHelper.executeOperate("submit", "fa_change_dept",saveResult.getSuccessPkIds().toArray(),OperateHelper.createOperate());
|
|
|
+ OperationResult auditResult = OperationServiceHelper.executeOperate("audit", "fa_change_dept",submitResult.getSuccessPkIds().toArray(),OperateHelper.createOperate());
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
}
|