From f8f258f645c674694abfe11165b65190bb87298d Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 25 一月 2024 10:09:44 +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 | 66 +++++++++++++++++++++++++++-----
1 files changed, 55 insertions(+), 11 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 d262684..2dab987 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;
@@ -25,6 +25,7 @@
private LinkedHashMap<String, Runnable> actionMaps = new LinkedHashMap<String, Runnable>();
boolean codeAlreadExist = false;
private String url= ConfigUtils.getConfigValue("410.code.url","http://127.0.0.1:36014/codeApplySwingController");
+ private String classifyGroupCode= ConfigUtils.getConfigValue("410.code.codeApply.classifyGroupCode");
public CodeApplyPanelFor410ActionListener(CodeApplyPanelFor410 owner){
this.owner = owner;
this.initActionMap();
@@ -103,12 +104,12 @@
codeOrderDTO.setTemplateOid(codeClassifyTemplateVO.getOid());
codeOrderDTO.setCodeRuleOid(codeRuleVO.getOid());
List<CodeOrderSecDTO> secDTOList=new ArrayList<>();
- keyValueList.stream().forEach(keyValue -> {
+ for (KeyValue keyValue : keyValueList) {
CodeOrderSecDTO codeOrderSecDTO=new CodeOrderSecDTO();
codeOrderSecDTO.setSecOid(keyValue.getKey());
codeOrderSecDTO.setSecValue(keyValue.getValue());
secDTOList.add(codeOrderSecDTO);
- });
+ }
codeOrderDTO.setLcStatus("Released");
codeOrderDTO.setSecDTOList(secDTOList);
codeOrderDTO.setData(dataMap);
@@ -116,13 +117,36 @@
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",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();
@@ -133,6 +157,24 @@
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, "闆嗗洟鐮佺敵璇峰け璐ワ紝"+applyResult.getMsg());
+ }else{
+ VCIOptionPane.showMessage(this.owner, "淇濆瓨鏁版嵁鎴愬姛锛岀瓑寰呴泦鍥㈢爜鐢宠锛�");
+ }
+ }
+ }else{
+ code="";
+ VCIOptionPane.showMessage(this.owner,"鏍￠獙璇ュ垎绫绘槸鍚﹀彇闆嗗洟鐮佸け璐ワ紒");
+ }
this.owner.setApplyCode(code);
this.owner.getApplyTxt().requestFocusInWindow();
this.owner.getApplyTxt().selectAll();
@@ -140,6 +182,7 @@
}else{
VCIOptionPane.showMessage(this.owner,r.getMsg());
}
+
}
private Map<String, String> getAttrMap(String[][] inputValues) {
@@ -161,7 +204,8 @@
CodeApplyFor410MainPanel rightMainPanel2 = this.owner.getRightMainPanel();
LinkedHashMap<String, JComponent> attrInnerNameToCtrlMaps = rightMainPanel2.getAttrInnerNameToCtrlMaps();
if(attrInnerNameToCtrlMaps!=null&&attrInnerNameToCtrlMaps.size()>0){
- attrInnerNameToCtrlMaps.forEach((key,component)->{
+ for(String key : attrInnerNameToCtrlMaps.keySet()){
+ JComponent component = attrInnerNameToCtrlMaps.get(key);
if(component instanceof JTextComponent){
if(((JTextComponent) component).isEnabled())
((JTextComponent) component).setText("");
@@ -169,7 +213,7 @@
if(((VCIJComboBox) component).isEnabled())
((VCIJComboBox) component).setSelectedIndex(0);
}
- });
+ }
}
String applyCode = this.owner.getApplyCode();
if(StringUtils.isBlank(applyCode)) {
--
Gitblit v1.9.3