From 0e5ba7238d31dc8fb5015001661811dceab55c42 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期三, 13 九月 2023 09:02:33 +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 | 36 ++++++++++++++++++++++++++++++++----
1 files changed, 32 insertions(+), 4 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..793fb25 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
@@ -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);
@@ -119,6 +120,9 @@
String code="";
//鏍￠獙鍏抽敭灞炴�у瓨鍦ㄧ殑鏁版嵁鐩存帴杩斿洖缂栫爜
R checkKeyAttrOnOrderR= HttpUtil.sendPost(url+"/checkKeyAttrOnOrderFordatas",object.toString(),headerMap);
+ //鏌ヨ褰撳墠鐢宠缂栫爜鐨勭被鍨�
+ R checkGroupCode= HttpUtil.sendGet(url+"/checkGroupCode?oid="+codeClassify.getOid()+
+ "&classifyGroupCode="+classifyGroupCode,null,headerMap);
if(checkKeyAttrOnOrderR.isSuccess()){
List<Map> list=(List)checkKeyAttrOnOrderR.getData();
if(!CollectionUtils.isEmpty(list)) {
@@ -127,6 +131,15 @@
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;
}
}
@@ -139,6 +152,20 @@
this.owner.setAttrNameAndValMap(attrNameAndValMap);
}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, "杩滅▼璋冪敤澶辫触锛岃娉ㄦ剰锛�");
}
}
@@ -161,7 +188,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 +197,7 @@
if(((VCIJComboBox) component).isEnabled())
((VCIJComboBox) component).setSelectedIndex(0);
}
- });
+ }
}
String applyCode = this.owner.getApplyCode();
if(StringUtils.isBlank(applyCode)) {
--
Gitblit v1.9.3