ERP_override.git

			@@ -15,6 +15,11 @@
			//工程信息
			List<Map<String, Object>> projectInfoMp(String projectNo);

			//工程信息流程卡
			List<Map<String, Object>> getProcessCardMp(String projectNo);

			//库存信息
			List<Map<String, Object>> materialStoreMp(String thickness, String model);

			//工单管理查询未转工单数据
			List<OrderGlassDetail> selectWordOrder(Date selectTime1, Date selectTime2, OrderGlassDetail orderGlassDetail);
			@@ -37,4 +42,33 @@

			//模拟计算流程卡详情
			List<Map<String, Object>> selectComputeDetailMp(String processId);


			//模拟计算保存钢化排版详情
			void addSimulation(Map<String, Object> object);
			//模拟计算保存钢化排版
			void addratioResult(Map<String, Object> object);
			//模拟计算保存工程信息
			void addratioProjectResult(Map<String, Object> object);
			//优化设置保存
			void optimizeParmsSave(String jsonString);

			//优化结果保存
			void optimizeResultSave(String jsonString);
			//优化结果查询
			List<Map<String, Object>> selectOptimizeResult(String processId);
			//优化结果调整
			void updateOptimizeResult(String jsonString,String processId);

			List<Map<String, Object>> getProcessCardDetailmMp(String processId, Integer technologyNumber);

			List<Map<String, Object>> selectGlassTypeMp();

			List<Map<String, Object>> getProjectIdSv();

			Boolean updateFlowCardProject(String processId, String technologyNumber, String projectId);

			Double getSelectArea(String processId, String technologyNumber);

			Boolean addProjectMp(String projectId, String projectNmae, String glassThickness, String glassType, Integer sumQuantity, Double sumArea, String userName);
			}