排产bugfix

src/main/java/com/baosight/hggp/hg/sc/sql/HGSC005A.xml

@@ -199,7 +199,7 @@
 				$orderBy$
 			</isNotEmpty>
 			<isEmpty property="orderBy">
-				product_type asc ,process_order desc
+				product_type asc , product_name, process_order desc
 			</isEmpty>
 		</dynamic>
 

src/main/java/com/baosight/hggp/hg/sc/sql/HGSC006A.xml

@@ -245,7 +245,7 @@
 				$orderBy$
 			</isNotEmpty>
 			<isEmpty property="orderBy">
-				product_type asc ,process_order desc
+				product_type asc, product_name, process_order desc
 			</isEmpty>
 		</dynamic>
 

src/main/java/com/baosight/hggp/hg/sc/sql/HGSC007.xml

@@ -224,7 +224,7 @@
 				$orderBy$
 			</isNotEmpty>
 			<isEmpty property="orderBy">
-				id desc, product_type asc ,process_order desc
+				id desc, product_type asc, product_name, process_order desc
 			</isEmpty>
 		</dynamic>
 

src/main/java/com/baosight/hggp/hg/sc/tools/HGSCTools.java

@@ -468,7 +468,7 @@ public class HGSCTools {
 
         public static int schedule(String planCode) {
             List<HGSC005A> hgsc005AList = queryByPlanCode(planCode);
-            hgsc005AList.sort(Comparator.comparing(HGSC005A::getProductType).thenComparing(HGSC005A::getProcessOrder,Comparator.reverseOrder()));
+//            hgsc005AList.sort(Comparator.comparing(HGSC005A::getProductType).thenComparing(HGSC005A::getProcessOrder,Comparator.reverseOrder()));
             //通过工序编码查询工序设置
             List<String> processCodes = hgsc005AList.stream().map(HGSC005A::getProcessCode).collect(Collectors.toList());
             List<HGSJ001> hgsj001List = HGSJTools.Hgsj001.queryByProcessCodes(processCodes);