From e608073f05f955bf168a5e42ecfb8200b57a77e3 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 23 八月 2023 09:23:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeApplyPanelFor410ActionListener.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeApplyPanelFor410ActionListener.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeApplyPanelFor410ActionListener.java
index 0b977594..db1ae5c 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeApplyPanelFor410ActionListener.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeApplyPanelFor410ActionListener.java
@@ -110,15 +110,28 @@
codeOrderSecDTO.setSecValue(keyValue.getValue());
secDTOList.add(codeOrderSecDTO);
});
+ codeOrderDTO.setLcStatus("Released");
codeOrderDTO.setSecDTOList(secDTOList);
codeOrderDTO.setData(dataMap);
Object object = JSONObject.toJSON(codeOrderDTO);
Map<String,String> headerMap=new HashMap<>();
headerMap.put("content-type","application/json");
headerMap.put("Blade-Auth",this.owner.getTokenUserObject().getAccess_token());
- R r= HttpUtil.sendPost(url+"/addSaveCode",object.toString(),headerMap);
- //R r= HttpUtil.sendPost(url+"/addSaveCode",object.toString(),headerMap);
String code="";
+ //鏍￠獙鍏抽敭灞炴�у瓨鍦ㄧ殑鏁版嵁鐩存帴杩斿洖缂栫爜
+ R checkKeyAttrOnOrderR= HttpUtil.sendPost(url+"/checkKeyAttrOnOrderFordatas",object.toString(),headerMap);
+ if(checkKeyAttrOnOrderR.isSuccess()){
+ List<Map> list=(List)checkKeyAttrOnOrderR.getData();
+ if(!CollectionUtils.isEmpty(list)) {
+ code=list.get(0).get("ID")!=null?list.get(0).get("ID").toString():"";
+ this.owner.setApplyCode(code);
+ this.owner.getApplyTxt().requestFocusInWindow();
+ this.owner.getApplyTxt().selectAll();
+ this.owner.setAttrNameAndValMap(attrNameAndValMap);
+ return;
+ }
+ }
+ R r= HttpUtil.sendPost(url+"/addSaveCode",object.toString(),headerMap);
if(r.isSuccess()){
code=r.getData().toString();
this.owner.setApplyCode(code);
--
Gitblit v1.9.3