parent
53e6d53ace
commit
abef199c48
|
|
@ -73,7 +73,10 @@ public class FWBillStateUpdController {
|
||||||
DynamicObject bill = BusinessDataServiceHelper.loadSingle(billArr[0].getPkValue(), enetityNumber);
|
DynamicObject bill = BusinessDataServiceHelper.loadSingle(billArr[0].getPkValue(), enetityNumber);
|
||||||
if(state == 0){
|
if(state == 0){
|
||||||
bill.set("tqq9_issuccess", true);
|
bill.set("tqq9_issuccess", true);
|
||||||
|
bill.set("tqq9_fwstate", "C");
|
||||||
approveLog.set("tqq9_issuccess", true);
|
approveLog.set("tqq9_issuccess", true);
|
||||||
|
}else{
|
||||||
|
bill.set("tqq9_fwstate", "D");
|
||||||
}
|
}
|
||||||
SaveServiceHelper.save(new DynamicObject[]{bill});
|
SaveServiceHelper.save(new DynamicObject[]{bill});
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2202,8 +2202,8 @@ public class FWImpl {
|
||||||
String dhlxrdh = null;
|
String dhlxrdh = null;
|
||||||
DynamicObject providerlinkman = bill.getDynamicObject("providerlinkman");
|
DynamicObject providerlinkman = bill.getDynamicObject("providerlinkman");
|
||||||
if(providerlinkman != null){
|
if(providerlinkman != null){
|
||||||
providerlinkman = BusinessDataServiceHelper.loadSingle(providerlinkman.getPkValue(), providerlinkman.getDynamicObjectType().getName());
|
providerlinkman = BusinessDataServiceHelper.loadSingle(providerlinkman.getPkValue(), providerlinkman.getDynamicObjectType().getName(), "contactperson,id,phone,mobile");
|
||||||
dhlxr = providerlinkman.getString("name");
|
dhlxr = providerlinkman.getString("contactperson");
|
||||||
dhlxrdh = providerlinkman.getString("phone");
|
dhlxrdh = providerlinkman.getString("phone");
|
||||||
}
|
}
|
||||||
String dhlxdz = bill.getString("provideraddress");
|
String dhlxdz = bill.getString("provideraddress");
|
||||||
|
|
@ -4609,7 +4609,6 @@ public class FWImpl {
|
||||||
*/
|
*/
|
||||||
public static String pushFwMaterial(DynamicObject bill){
|
public static String pushFwMaterial(DynamicObject bill){
|
||||||
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
|
||||||
String tqq9_fwrequestid = bill.getString("tqq9_fwrequestid");
|
|
||||||
DynamicObject creator = bill.getDynamicObject("creator");
|
DynamicObject creator = bill.getDynamicObject("creator");
|
||||||
creator = BusinessDataServiceHelper.loadSingle(creator.getPkValue(), "bos_user", "tqq9_fwuserid,id,number");
|
creator = BusinessDataServiceHelper.loadSingle(creator.getPkValue(), "bos_user", "tqq9_fwuserid,id,number");
|
||||||
String sqr = creator.getString("tqq9_fwuserid");
|
String sqr = creator.getString("tqq9_fwuserid");
|
||||||
|
|
@ -4887,7 +4886,6 @@ public class FWImpl {
|
||||||
gd = height.toString();
|
gd = height.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//单头赋值
|
//单头赋值
|
||||||
JSONObject m1 = new JSONObject();
|
JSONObject m1 = new JSONObject();
|
||||||
m1.put("fieldName", "KDBillType");
|
m1.put("fieldName", "KDBillType");
|
||||||
|
|
@ -5031,13 +5029,23 @@ public class FWImpl {
|
||||||
m51.put("fieldName", "gd");
|
m51.put("fieldName", "gd");
|
||||||
m51.put("fieldValue", gd);
|
m51.put("fieldValue", gd);
|
||||||
|
|
||||||
|
//区分新建审核与修改审批
|
||||||
|
String requestName = "新增物料流程";
|
||||||
|
String wfID = ConfigUtils.getThirdConfigByNumber("FW_WFID_XZWL");
|
||||||
|
String requestid = bill.getString("tqq9_fwrequestid");
|
||||||
|
boolean tqq9_issuccess = bill.getBoolean("tqq9_issuccess");
|
||||||
|
if(tqq9_issuccess){
|
||||||
|
requestName = "变更物料流程";
|
||||||
|
wfID = ConfigUtils.getThirdConfigByNumber("FW_WFID_WLBG");
|
||||||
|
requestid = bill.getString("tqq9_fwupdid");
|
||||||
|
}
|
||||||
|
|
||||||
List<JSONObject> mlist = Arrays.asList(m1,m2,m3,m4,m5,m6,m7,m8,m9,m10,m11,m12,m13,m14,m15,m16,m17,m18,m19,m21,
|
List<JSONObject> mlist = Arrays.asList(m1,m2,m3,m4,m5,m6,m7,m8,m9,m10,m11,m12,m13,m14,m15,m16,m17,m18,m19,m21,
|
||||||
m22,m23,m24,m25,m26,m27,m28,m29,m31,m32,m33,m34,m35,m36,m37,m38,m39,m41,m42,m43,m44,m45,m46,m47,m48,m49,m51);
|
m22,m23,m24,m25,m26,m27,m28,m29,m31,m32,m33,m34,m35,m36,m37,m38,m39,m41,m42,m43,m44,m45,m46,m47,m48,m49,m51);
|
||||||
JSONArray mainArr = new JSONArray();
|
JSONArray mainArr = new JSONArray();
|
||||||
mainArr.addAll(mlist);
|
mainArr.addAll(mlist);
|
||||||
String fw_wfid_xzcgdd = ConfigUtils.getThirdConfigByNumber("FW_WFID_XZWL");
|
|
||||||
FWRestfulUtils fwRestfulUtils = new FWRestfulUtils();
|
FWRestfulUtils fwRestfulUtils = new FWRestfulUtils();
|
||||||
//如果单据上纯在泛微流程id,重新提交调用泛微提交接口,如果没有泛微流程id,就调用新增接口
|
//如果单据上纯在泛微流程id,重新提交调用泛微提交接口,如果没有泛微流程id,就调用新增接口
|
||||||
return fwRestfulUtils.doBillAction(mainArr, null, "物料新增流程", fw_wfid_xzcgdd, lcbh, tqq9_fwrequestid);
|
return fwRestfulUtils.doBillAction(mainArr, null, requestName, wfID, lcbh, requestid);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue