Albania_Mes.git

			@@ -345,6 +345,14 @@
			return Result.success(map);
			}

			// 开始工程
			public Result StartChange(String flowcard) {
			homeMapper.StartChange(flowcard, 1);
			Map<String, Object> map = new HashMap<>();
			map.put("message", "200");
			return Result.success(map);
			}

			// 重新测量
			public Result AnewMeasure(String glassInfo) {
			// 读取DB105区文件
			@@ -372,7 +380,8 @@
			.filter(item -> (item.get("order") != null && item.get("glasstype") != null && item.get("tier") != null
			&&
			item.get("films") != null && item.get("base") != null && item.get("height") != null
			&& item.get("thickness") != null && item.get("quantity") != null&& item.get("matching") != null))
			&& item.get("thickness") != null && item.get("quantity") != null
			&& item.get("matching") != null))
			.collect(Collectors.toList());

			TypeDatas.forEach(item -> {
			@@ -381,11 +390,13 @@

			RemoveErrorData.forEach(item -> {
			String key=item.get("order").toString()+"_"+item.get("matching").toString();
			String keyCount=item.get("order").toString()+"_"+item.get("matching").toString()+"_"+item.get("tier").toString();
			String keyCount = item.get("order").toString() + "_" + item.get("matching").toString() + "_"
			+ item.get("tier").toString();
			String keyCountSum=item.get("order").toString()+"_"+item.get("matching").toString()+"_Sum";//订单总数
			if (OrderFinishedProduct.get(keyCount)!=null) {
			Integer count=OrderFinishedProduct.get(keyCount)+1;
			Integer sumcount=OrderFinishedProduct.get(keyCountSum)+Integer.parseInt(item.get("quantity").toString());
			Integer sumcount = OrderFinishedProduct.get(keyCountSum)
			+ Integer.parseInt(item.get("quantity").toString());
			OrderFinishedProduct.put(keyCount,count);
			OrderFinishedProduct.put(keyCountSum,sumcount);
			}else if(OrderFinishedProduct.get(keyCount)==null&&groupby.get(key)==null){
			@@ -435,8 +446,5 @@
			ResultCode.put("message", "200");
			return Result.success(ResultCode);
			}




			}