From 8381325223bee254168855b1b697db31fc591b9e Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 19 九月 2023 09:28:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyPanelFor410ActionListener.java | 80 ++++++++++++++++++++++++----------------
1 files changed, 48 insertions(+), 32 deletions(-)
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyPanelFor410ActionListener.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyPanelFor410ActionListener.java
index 793fb25..f1c0217 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyPanelFor410ActionListener.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyPanelFor410ActionListener.java
@@ -1,19 +1,19 @@
package com.vci.rmip.code.client.codeapply.Apply410;
-import com.alibaba.cloud.commons.lang.StringUtils;
import com.alibaba.fastjson.JSONObject;
import com.vci.base.ui.swing.VCIOptionPane;
import com.vci.base.ui.swing.components.VCIJComboBox;
import com.vci.rmip.code.client.codeapply.Apply410.object.CodeClassify;
+import com.vci.rmip.code.client.codeapply.Apply410.object.CodeClassifyTemplateVO;
import com.vci.rmip.code.client.codeapply.Apply410.object.R;
-import com.vci.ubcs.code.dto.CodeOrderDTO;
-import com.vci.ubcs.code.dto.CodeOrderSecDTO;
-import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateVO;
-import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;
+import com.vci.rmip.code.client.codeapply.Apply410.object.ubcscode.dto.CodeOrderDTO;
+import com.vci.rmip.code.client.codeapply.Apply410.object.ubcscode.dto.CodeOrderSecDTO;
+import com.vci.rmip.code.client.codeapply.Apply410.object.ubcscode.vo.CodeRuleVO;
+import com.vci.rmip.code.client.codeapply.Apply410.object.ubcscode.vo.KeyValue;
import com.vci.rmip.code.client.codeapply.Apply410.utils.ConfigUtils;
import com.vci.rmip.code.client.codeapply.Apply410.utils.HttpUtil;
-import com.vci.ubcs.starter.web.pagemodel.KeyValue;
import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang.StringUtils;
import javax.swing.*;
import javax.swing.text.JTextComponent;
@@ -117,35 +117,64 @@
Map<String,String> headerMap=new HashMap<>();
headerMap.put("content-type","application/json");
headerMap.put("Blade-Auth",this.owner.getTokenUserObject().getAccess_token());
- String code="";
+ String code="";
//鏍￠獙鍏抽敭灞炴�у瓨鍦ㄧ殑鏁版嵁鐩存帴杩斿洖缂栫爜
R checkKeyAttrOnOrderR= HttpUtil.sendPost(url+"/checkKeyAttrOnOrderFordatas",object.toString(),headerMap);
+
+
+ Map<String,String>parmarMap=new HashMap<String, String>();
+ parmarMap.put("oid", codeClassify.getOid());
+ parmarMap.put("classifyGroupCode",classifyGroupCode);
//鏌ヨ褰撳墠鐢宠缂栫爜鐨勭被鍨�
- R checkGroupCode= HttpUtil.sendGet(url+"/checkGroupCode?oid="+codeClassify.getOid()+
- "&classifyGroupCode="+classifyGroupCode,null,headerMap);
+ /*R checkGroupCode= HttpUtil.sendGet(url+"/checkGroupCode?oid="+codeClassify.getOid()+
+ "&classifyGroupCode="+classifyGroupCode,null,headerMap);*/
+ R checkGroupCode= HttpUtil.sendGet(url+"/checkGroupCode",parmarMap,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():"";
+ if(checkGroupCode.isSuccess()){
+ if(checkGroupCode.getData().equals("true")){
+ code="";
+ code=list.get(0).get("GROUPCODE")!=null?list.get(0).get("GROUPCODE").toString():"";
+ if(StringUtils.isBlank(code)){
+ VCIOptionPane.showMessage(this.owner, "鏍规嵁鍏抽敭灞炴�ф牎楠岋紝绯荤粺涓瓨鍦ㄨ鏁版嵁锛岄渶绛夊緟闆嗗洟鐢宠闆嗗洟鐮侊細"+code);
+ }else{
+ code=list.get(0).get("ID")!=null?list.get(0).get("ID").toString():"";
+ }
+ }
+ }else {
+ code="";
+ VCIOptionPane.showMessage(this.owner,"鏍￠獙璇ュ垎绫绘槸鍚﹀彇闆嗗洟鐮佸け璐ワ紒");
+ }
this.owner.setApplyCode(code);
this.owner.getApplyTxt().requestFocusInWindow();
this.owner.getApplyTxt().selectAll();
this.owner.setAttrNameAndValMap(attrNameAndValMap);
- if(checkGroupCode.isSuccess()){
- if(checkGroupCode.getData().equals("true")){
- VCIOptionPane.showMessage(this.owner, "褰撳墠鍒嗙被鐨勪紒涓氱紪鐮佷负锛�"+list.get(0).get("GROUPCODE"));
- }else{
- VCIOptionPane.showMessage(this.owner, "褰撳墠缂栫爜鍒嗙被鏈壘鍒扮浉搴旂殑闆嗗洟锛岃妫�鏌ワ紒锛�");
- }
- }else {
- VCIOptionPane.showMessage(this.owner, "杩滅▼璋冪敤澶辫触锛岃閲嶈瘯锛�");
- }
return;
}
}
R r= HttpUtil.sendPost(url+"/addSaveCode",object.toString(),headerMap);
if(r.isSuccess()){
code=r.getData().toString();
+ if(checkGroupCode.isSuccess()){
+ if(checkGroupCode.getData().equals("true")){
+ code="";
+ Map<String,String> applyMap = new HashMap<>();
+ applyMap.put("oids",codeClassify.getOid());
+ applyMap.put("btmName",codeClassify.getBtmname());
+ Object applyGroupCodeData = JSONObject.toJSON(applyMap);
+ R applyResult= HttpUtil.sendPost(url+"/DockingPreApplyCode/applyGroupCode",applyGroupCodeData.toString(),headerMap);
+ if(!applyResult.isSuccess()){
+ VCIOptionPane.showMessage(this.owner, "闆嗗洟鐮佺敵璇峰け璐ワ紝"+r.getMsg());
+ }else{
+ VCIOptionPane.showMessage(this.owner, "淇濆瓨鏁版嵁鎴愬姛锛岀瓑寰呴泦鍥㈢爜鐢宠锛�");
+ }
+ }
+ }else{
+ code="";
+ VCIOptionPane.showMessage(this.owner,"鏍￠獙璇ュ垎绫绘槸鍚﹀彇闆嗗洟鐮佸け璐ワ紒");
+ }
this.owner.setApplyCode(code);
this.owner.getApplyTxt().requestFocusInWindow();
this.owner.getApplyTxt().selectAll();
@@ -153,20 +182,7 @@
}else{
VCIOptionPane.showMessage(this.owner,r.getMsg());
}
- if(checkGroupCode.isSuccess()){
- if(checkGroupCode.getData().equals("false")){
- Map<String,String> applyMap = new HashMap<>();
- applyMap.put("oids",codeClassify.getOid());
- applyMap.put("btmName",codeClassify.getBtmname());
- Object applyGroupCodeData = JSONObject.toJSON(applyMap);
- R applyResult= HttpUtil.sendPost(url+"/DockingPreApplyCode/applyGroupCode",applyGroupCodeData.toString(),headerMap);
- if(!applyResult.isSuccess()){
- VCIOptionPane.showMessage(this.owner, r.getMsg());
- }
- }
- }else {
- VCIOptionPane.showMessage(this.owner, "杩滅▼璋冪敤澶辫触锛岃娉ㄦ剰锛�");
- }
+
}
private Map<String, String> getAttrMap(String[][] inputValues) {
--
Gitblit v1.9.3