ubcs.git - Gitblit

			@@ -365,7 +365,7 @@
			switchSecValue(secVO, secValueMap, classifyFullInfoBO, serialSecVOList, attrSecVOList, serialUnitList, secValueList);
			}
			//å¤çå±æ§ç æ®µåæµæ°´ç æ®µ
			Map<String/æµæ°´ç æ®µçä¸»é®/, Map<String/æµæ°´ä¾æ®/, Double>> lastMaxSerialValueMap = new HashMap<>();
			Map<String/æµæ°´ç æ®µçä¸»é®/, Map<String/æµæ°´ä¾æ®/, String>> lastMaxSerialValueMap = new HashMap<>();
			List<CodeAllCode> allCodeDOList = new ArrayList<>();

			//å·²ç»åå¨çæå¤§æµæ°´å·çåå®¹
			@@ -390,7 +390,7 @@
			switchAttrSecValue(attrSecVOList, cbo, thisSecValueList, attrSevIsSerialDepend, thisSerialUnitList);

			String serialUnitString = thisSerialUnitList.size() == 0 ? EMPTY_SERIAL_UNIT : thisSerialUnitList.stream().collect(Collectors.joining(SERIAL_UNIT_SPACE));
			switchSerialSecValue(serialSecVOList, attrSevIsSerialDepend, finalRuleVO, serialUnitString, maxSerialValueMap, thisSecValueList, lastMaxSerialValueMap, i == 0);
			switchSerialSecValue(cbo,serialSecVOList, attrSevIsSerialDepend, finalRuleVO, serialUnitString, maxSerialValueMap, thisSecValueList, lastMaxSerialValueMap, i == 0);

			//ç»è£ç¼ç çå¼
			cbo.setId(thisSecValueList.stream().collect(Collectors.joining()));
			@@ -399,9 +399,9 @@
			//æç æ®µéé¢é½æ¾ä¸ä¸æµæ°´å·
			for (int j = 0; j < serialSecVOList.size(); j++) {
			CodeBasicSecVO secVO = serialSecVOList.get(j);
			Double serialValue = lastMaxSerialValueMap.getOrDefault(secVO.getOid(), new HashMap<>()).getOrDefault(serialUnitString, 0d);
			String serialValue = lastMaxSerialValueMap.getOrDefault(secVO.getOid(), new HashMap<>()).getOrDefault(serialUnitString, "");
			if (serialValue != null) {
			sb.append(String.valueOf(serialValue.longValue())).append(SERIAL_VALUE_SPACE);
			sb.append(serialValue).append(SERIAL_VALUE_SPACE);
			}
			}
			//è¦åå¨æåçå¨é¨allcode
			@@ -528,10 +528,10 @@
			* @param lastMaxSerialValueMap å°è£å
			* @param firstData æ¯å¦ä¸ºç¬¬ä¸æ¡æ°æ®
			*/
			private void switchSerialSecValue(List<CodeBasicSecVO> serialSecVOList,boolean attrSevIsSerialDepend,
			private void switchSerialSecValue(BaseModel cbo, List<CodeBasicSecVO> serialSecVOList,boolean attrSevIsSerialDepend,
			CodeRuleVO ruleVO,String serialUnitString,
			Map<String/ç æ®µçä¸»é®/,Map<String/æµæ°´ä¾æ®/,CodeSerialValue>> maxSerialValueMap,List<String> thisSecValueList,
			Map<String/ç æ®µçä¸»é®/,Map<String/æµæ°´ä¾æ®/, Double>> lastMaxSerialValueMap,boolean firstData){
			Map<String/ç æ®µçä¸»é®/,Map<String/æµæ°´ä¾æ®/, String>> lastMaxSerialValueMap,boolean firstData){
			if (!CollectionUtils.isEmpty(serialSecVOList)) {
			Map<String,String> secIdserialValueMap=new LinkedHashMap<>();
			for (int j = 0; j < serialSecVOList.size(); j++) {
			@@ -610,7 +610,7 @@
			//é²æ¢å¨æ·»å çå°æ¹æ²¡ææ§å¶æ£ç¡®
			fillLength = VciBaseUtil.getInt(secVO.getCodeSecLength());
			}
			String serialString = String.valueOf(thisSerialValue.longValue());
			serialString = thisSerialValue;
			serialString = fillString(fillLength, OsCodeFillTypeEnum.forValue(secVO.getCodeFillType()), serialString, secVO.getCodeFillSeparator());

			for (int z = 0; z < thisSecValueList.size(); z++) {

	Source/UBCS-WEB/dist/css/app.d0623413.css	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Source/UBCS-WEB/dist/css/chunk-74613652.418a3170.css	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Source/UBCS-WEB/dist/js/app.e531c9b4.js	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Source/UBCS-WEB/dist/js/chunk-74613652.bf501607.js	27 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史