diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/entity/RequisitionEntity.xml b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/entity/RequisitionEntity.xml
index d16f2f62..761578ec 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/entity/RequisitionEntity.xml
+++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/entity/RequisitionEntity.xml
@@ -108,22 +108,22 @@
-
- update v_hzya_u9c_pr_pr set
-
- dataStatus = #{dataStatus},
- dataMsg = #{dataMsg},
-
- where id = #{id}
-
-
-
+
-
-
+
+
+
+
+ update PR_PR set
+
+ DescFlexField_PrivateDescSeg2 = #{dataStatus},
+ DescFlexField_PrivateDescSeg1 = #{dataMsg},
+
+ where id = #{id}
+
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/service/impl/U9CPluginServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/service/impl/U9CPluginServiceImpl.java
index 36d36170..4c73c6d8 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/service/impl/U9CPluginServiceImpl.java
+++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/service/impl/U9CPluginServiceImpl.java
@@ -256,14 +256,14 @@ public class U9CPluginServiceImpl implements IU9CPluginService {
String res = null;
Boolean flag = false;
try {
- //1、获取token
- JSONObject nouserToken = getToken(null, "800045", "8000450000");
- if (nouserToken.getBoolean("flag")) {
+ ////1、获取token
+ //JSONObject nouserToken = getToken(null, "800045", "8000450000");
+ //if (nouserToken.getBoolean("flag")) {
//2、根据电话获取code
- JSONObject usercode = getUsercode(nouserToken.getString("token"), prepayment.getUserPhone(), "800045", "8000450005");
- if (usercode.getBoolean("flag")) {
+ //JSONObject usercode = getUsercode(nouserToken.getString("token"), prepayment.getUserPhone(), "800045", "8000450005");
+ //if (usercode.getBoolean("flag")) {
//3、根据code，再次获取token
- JSONObject token = getToken(usercode.getString("code"), "800045", "8000450000");
+ JSONObject token = getToken(prepayment.getUserPhone(), "800045", "8000450000");
if (token.getBoolean("flag")) {
res = invokeEsb(param, "800045", "8000450001", token.getString("token"));
JSONObject jsonObject = JSONObject.parseObject(res);
@@ -271,12 +271,12 @@ public class U9CPluginServiceImpl implements IU9CPluginService {
} else {
res = token.getString("msg");
}
- } else {
- res = usercode.getString("msg");
- }
- } else {
- res = nouserToken.getString("msg");
- }
+ //} else {
+ // res = usercode.getString("msg");
+ //}
+ //} else {
+ // res = nouserToken.getString("msg");
+ //}
} catch (Exception e) {
logger.error("调用oa接口出错:{}", e);
res = e.getMessage();
@@ -353,148 +353,144 @@ public class U9CPluginServiceImpl implements IU9CPluginService {
if (CollectionUtils.isNotEmpty(requisitionList)) {
//1、获取token
- for (RequisitionEntity requisition : requisitionList) {
- //查询u9c请购单明细
- RequisitionDetailEntity requisitionDetail = new RequisitionDetailEntity();
- requisitionDetail.setPr(requisition.getId());
- requisitionDetail.setDataSourceCode(datasourceCode);
- List requisitionDetailList = requisitionDetailServiceImpl.queryDetails(requisitionDetail);
- if (CollectionUtils.isNotEmpty(requisitionDetailList)) {
- //主表
- JSONObject formmain_0652 = new JSONObject();
- //单据类型
- formmain_0652.put("field0001", requisition.getpRDocTypeName());
- //需求人员
- formmain_0652.put("field0005", requisition.getReqEmployeeName());
- //单号
- formmain_0652.put("field0007", requisition.getDocNo());
- //需求部门
- formmain_0652.put("field0008", requisition.getReqDepartmentName());
- //日期
- formmain_0652.put("field0010", requisition.getBusinessDate());
- //厂区
- formmain_0652.put("field0012", requisitionDetailList.get(0).getFactoryName());
- //状态
- formmain_0652.put("field0013", requisition.getStatusName());
- String res = null;
- Boolean flag = false;
+ for (RequisitionEntity requisition : requisitionList) {
+ //查询u9c请购单明细
+ RequisitionDetailEntity requisitionDetail = new RequisitionDetailEntity();
+ requisitionDetail.setPr(requisition.getId());
+ requisitionDetail.setDataSourceCode(datasourceCode);
+ List requisitionDetailList = requisitionDetailServiceImpl.queryDetails(requisitionDetail);
+ if (CollectionUtils.isNotEmpty(requisitionDetailList)) {
+ //主表
+ JSONObject formmain_0652 = new JSONObject();
+ //单据类型
+ formmain_0652.put("field0001", requisition.getpRDocTypeName());
+ //需求人员
+ formmain_0652.put("field0005", requisition.getReqEmployeeName());
+ //单号
+ formmain_0652.put("field0007", requisition.getDocNo());
+ //需求部门
+ formmain_0652.put("field0008", requisition.getReqDepartmentName());
+ //日期
+ formmain_0652.put("field0010", requisition.getBusinessDate());
+ //厂区
+ formmain_0652.put("field0012", requisitionDetailList.get(0).getFactoryName());
+ //状态
+ formmain_0652.put("field0013", requisition.getStatusName());
+
+ //发起人
+ //formmain_0652.put("field0002", token.getString("name"));
+ //发起部门
+ //formmain_0652.put("field0003", token.getString("bm"));
+ //发起时间
+ formmain_0652.put("field0004", DateUtil.now());
+ //来源类型 不要
+ //formmain_0652.put("field0006",requisition.getSourceTypeName());
+ //来源单号 不要
+ //formmain_0652.put("field0009",requisitionDetailList.get(0).getSrcDocNo());
+ ////项目 不要
+ //formmain_0652.put("field0011",requisitionDetailList.get(0).getProjectName());
+ //请购数量合计 不要
+ //formmain_0652.put("field0030","");
+ //子表
+ List formsonList = new LinkedList<>();
+ for (RequisitionDetailEntity detail : requisitionDetailList) {
+ JSONObject formson_0653 = new JSONObject();
+ //行号
+ formson_0653.put("field0014", detail.getDocLineNo());
+ //需求分类
+ formson_0653.put("field0015", detail.getDemandCode());
+ //厂区明细
+ formson_0653.put("field0016", detail.getFactoryName());
+ //项目明细
+ formson_0653.put("field0017", detail.getProjectName());
+ //料号
+ formson_0653.put("field0018", detail.getMaterialCode());
+ //品名
+ formson_0653.put("field0021", detail.getMaterialName());
+ //规格
+ formson_0653.put("field0022", detail.getSpecs());
+ //请购数量
+ formson_0653.put("field0023", detail.getReqQtyTU());
+ //单位
+ formson_0653.put("field0024", detail.getStoreUOM());
+ //单据备注
+ formson_0653.put("field0025", detail.getMemo());
+ ////需求交货日期
+ //formson_0653.put("field0026", detail.getRequiredDeliveryDate());
+ ////来源单号明细
+ //formson_0653.put("field0027", detail.getSrcDocNo());
+ ////库存可用量
+ //formson_0653.put("field0028", detail.getpRInvQty());
+ //状态明细
+ formson_0653.put("field0029", detail.getStatus());
+ formsonList.add(formson_0653);
+ }
+ JSONObject formData = new JSONObject();
+ formData.put("formmain_0673", formmain_0652);
+ formData.put("formson_0674", formsonList);
+ JSONObject data = new JSONObject();
+ data.put("templateCode", "formmain_0673");
+ data.put("draft", "0");
+ data.put("data", formData);
+ JSONObject param = new JSONObject();
+ param.put("appName", "collaboration");
+ param.put("data", data);
+ String paramStr = param.toString();
+ logger.info("u9c请购单发起OA流程请求参数:{}", paramStr);
+ String res = null;
+ Boolean flag = false;
+ try {
JSONObject token = getToken(requisition.getSendPhone(), "800045", "8000450000");
//3、根据code，再次获取token
if (token.getBoolean("flag")) {
- //发起人
- formmain_0652.put("field0002", token.getString("name"));
- //发起部门
- formmain_0652.put("field0003", token.getString("bm"));
- //发起时间
- formmain_0652.put("field0004", DateUtil.now());
- //来源类型 不要
- //formmain_0652.put("field0006",requisition.getSourceTypeName());
- //来源单号 不要
- //formmain_0652.put("field0009",requisitionDetailList.get(0).getSrcDocNo());
- ////项目 不要
- //formmain_0652.put("field0011",requisitionDetailList.get(0).getProjectName());
- //请购数量合计 不要
- //formmain_0652.put("field0030","");
- //子表
- List formsonList = new LinkedList<>();
- for (RequisitionDetailEntity detail : requisitionDetailList) {
- JSONObject formson_0653 = new JSONObject();
- //行号
- formson_0653.put("field0014", detail.getDocLineNo());
- //需求分类
- formson_0653.put("field0015", detail.getDemandCode());
- //厂区明细
- formson_0653.put("field0016", detail.getFactoryName());
- //项目明细
- formson_0653.put("field0017", detail.getProjectName());
- //料号
- formson_0653.put("field0018", detail.getMaterialCode());
- //品名
- formson_0653.put("field0021", detail.getMaterialName());
- //规格
- formson_0653.put("field0022", detail.getSpecs());
- //请购数量
- formson_0653.put("field0023", detail.getReqQtyTU());
- //单位
- formson_0653.put("field0024", detail.getStoreUOM());
- //单据备注
- formson_0653.put("field0025", detail.getMemo());
- ////需求交货日期
- //formson_0653.put("field0026", detail.getRequiredDeliveryDate());
- ////来源单号明细
- //formson_0653.put("field0027", detail.getSrcDocNo());
- ////库存可用量
- //formson_0653.put("field0028", detail.getpRInvQty());
- //状态明细
- formson_0653.put("field0029", detail.getStatus());
- formsonList.add(formson_0653);
- }
- JSONObject formData = new JSONObject();
- formData.put("formmain_0673", formmain_0652);
- formData.put("formson_0674", formsonList);
- JSONObject data = new JSONObject();
- data.put("templateCode", "formmain_0673");
- data.put("draft", "0");
- data.put("data", formData);
- JSONObject param = new JSONObject();
- param.put("appName", "collaboration");
- param.put("data", data);
- String paramStr = param.toString();
- logger.info("u9c请购单发起OA流程请求参数:{}", paramStr);
- try {
- //3、根据code，再次获取token
- if (token.getBoolean("flag")) {
- res = invokeEsb(param, "800045", "8000450002", token.getString("token"));
- JSONObject jsonObject = JSONObject.parseObject(res);
- flag = jsonObject.getBoolean("flag");
- } else {
- res = token.getString("msg");
- }
- } catch (Exception e) {
- logger.error("调用oa接口出错:{}", e);
- res = e.getMessage();
- }
- //保存日志
- IntegrationTaskLivingDetailsEntity taskLivingDetail = new IntegrationTaskLivingDetailsEntity();
- taskLivingDetail.setCreate_time(new Date());
- taskLivingDetail.setModify_time(new Date());
- taskLivingDetail.setRootAppPk(requisition.getId());
- taskLivingDetail.setRootAppBill(requisition.getDocNo());
- taskLivingDetail.setPluginId("U9CRequisitionPlugin");
- taskLivingDetail.setRootAppNewData(paramStr);
- taskLivingDetail.setNewTransmitInfo(res);
- taskLivingDetail.setNewPushDate(new Date());
- saveLog(taskId, flag, taskLivingDetail);
- logger.info("u9c请购单发起OA流程返回结果:{}", res);
- // 发送完成修改主表状态 已完成或发送失败 flag判断
+ res = invokeEsb(param, "800045", "8000450002", token.getString("token"));
+ JSONObject jsonObject = JSONObject.parseObject(res);
+ flag = jsonObject.getBoolean("flag");
} else {
res = token.getString("msg");
}
- if (flag) {
- RequisitionEntity updateRequisition = new RequisitionEntity();
- updateRequisition.setDataSourceCode(datasourceCode);
- updateRequisition.setId(requisition.getId());
- updateRequisition.setDataStatus("1");
- updateRequisition.setDataMsg("成功");
- requisitionService.updateStatus(updateRequisition);
- } else {
- RequisitionEntity updateRequisition = new RequisitionEntity();
- updateRequisition.setDataSourceCode(datasourceCode);
- updateRequisition.setId(requisition.getId());
- updateRequisition.setDataStatus("2");
- updateRequisition.setDataMsg("失败：" + res);
- requisitionService.updateStatus(updateRequisition);
- }
- } else {
- // 没有明细不发送，修改数据状态，已完成，没有明细不发送
+ } catch (Exception e) {
+ logger.error("调用oa接口出错:{}", e);
+ res = e.getMessage();
+ }
+ //保存日志
+ IntegrationTaskLivingDetailsEntity taskLivingDetail = new IntegrationTaskLivingDetailsEntity();
+ taskLivingDetail.setCreate_time(new Date());
+ taskLivingDetail.setModify_time(new Date());
+ taskLivingDetail.setRootAppPk(requisition.getId());
+ taskLivingDetail.setRootAppBill(requisition.getDocNo());
+ taskLivingDetail.setPluginId("U9CRequisitionPlugin");
+ taskLivingDetail.setRootAppNewData(paramStr);
+ taskLivingDetail.setNewTransmitInfo(res);
+ taskLivingDetail.setNewPushDate(new Date());
+ saveLog(taskId, flag, taskLivingDetail);
+ logger.info("u9c请购单发起OA流程返回结果:{}", res);
+ // 发送完成修改主表状态 已完成或发送失败 flag判断
+ if (flag) {
RequisitionEntity updateRequisition = new RequisitionEntity();
updateRequisition.setDataSourceCode(datasourceCode);
updateRequisition.setId(requisition.getId());
updateRequisition.setDataStatus("1");
- updateRequisition.setDataMsg("成功，没有明细不发送");
+ updateRequisition.setDataMsg("成功");
+ requisitionService.updateStatus(updateRequisition);
+ } else {
+ RequisitionEntity updateRequisition = new RequisitionEntity();
+ updateRequisition.setDataSourceCode(datasourceCode);
+ updateRequisition.setId(requisition.getId());
+ updateRequisition.setDataStatus("2");
+ updateRequisition.setDataMsg("失败：" + res);
requisitionService.updateStatus(updateRequisition);
}
+ } else {
+ // 没有明细不发送，修改数据状态，已完成，没有明细不发送
+ RequisitionEntity updateRequisition = new RequisitionEntity();
+ updateRequisition.setDataSourceCode(datasourceCode);
+ updateRequisition.setId(requisition.getId());
+ updateRequisition.setDataStatus("1");
+ updateRequisition.setDataMsg("成功，没有明细不发送");
+ requisitionService.updateStatus(updateRequisition);
}
+ }
}
@@ -560,7 +556,7 @@ public class U9CPluginServiceImpl implements IU9CPluginService {
String res = null;
String token = null;
Boolean flag = false;
- String bm = null;
+ //String bm = null;
String name = null;
try {
res = invokeEsb(param, appId, apiCode, null);
@@ -568,7 +564,7 @@ public class U9CPluginServiceImpl implements IU9CPluginService {
flag = jsonObject.getBoolean("flag");
if (flag) {
token = jsonObject.getJSONObject("attribute").getString("id");
- bm = jsonObject.getJSONObject("attribute").getJSONObject("bindingUser").getString("orgDepartmentName");
+ //bm = jsonObject.getJSONObject("attribute").getJSONObject("bindingUser").getString("orgDepartmentName");
name = jsonObject.getJSONObject("attribute").getJSONObject("bindingUser").getString("name");
}
} catch (Exception e) {
@@ -578,7 +574,7 @@ public class U9CPluginServiceImpl implements IU9CPluginService {
if (flag) {
returnData.put("flag", "true");
returnData.put("token", token);
- returnData.put("bm", bm);
+ //returnData.put("bm", bm);
returnData.put("name", name);
} else {
returnData.put("flag", "false");