1.合并代码解决冲突

src/main/java/com/baosight/hggp/hg/sc/service/ServiceHGSC006B.java

@@ -13,6 +13,7 @@ import com.baosight.hggp.hg.sc.constant.HgScSqlConstant;
 import com.baosight.hggp.hg.sc.domain.HGSC006;
 import com.baosight.hggp.hg.sc.domain.HGSC006A;
 import com.baosight.hggp.hg.sc.domain.HGSC007;
+import com.baosight.hggp.hg.sc.domain.HGSC008;
 import com.baosight.hggp.hg.sc.domain.HGSC098;
 import com.baosight.hggp.hg.sc.tools.HGSCTools;
 import com.baosight.hggp.hg.sc.util.HgScUtils;
@@ -33,9 +34,11 @@ import org.springframework.beans.BeanUtils;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
@@ -348,11 +351,11 @@ public class ServiceHGSC006B extends ServiceBase {
 		// 0.未派工，1.部分派工，2.全部派工
 		AssignStatusEnum orderDetailAssignStatus ;
 		if (jhNum - totalNum==0) {
-			orderDetailAssignStatus = ASSIGNED;
+			orderDetailAssignStatus = AssignStatusEnum.ASSIGNED;
 		} else if (totalNum>0) {
-			orderDetailAssignStatus = PARTIAL_ASSIGN;
+			orderDetailAssignStatus = AssignStatusEnum.PARTIAL_ASSIGN;
 		} else {
-			orderDetailAssignStatus = UNASSIGN;
+			orderDetailAssignStatus = AssignStatusEnum.UNASSIGN;
 		}
 		updateMap.put(HGSC006A.FIELD_assign_status, orderDetailAssignStatus.getCode());
 		DaoUtils.update(HGSC006A.UPDATE_ASSIGN_NUM, updateMap);
@@ -373,19 +376,19 @@ public class ServiceHGSC006B extends ServiceBase {
 		switch (orderDetailAssignStatus){
 			case UNASSIGN:
 				if(unassignQuantity == totalQuantity){
-					orderAssignStatus = UNASSIGN;
+					orderAssignStatus = AssignStatusEnum.UNASSIGN;
 				}else{
-					orderAssignStatus = PARTIAL_ASSIGN;
+					orderAssignStatus = AssignStatusEnum.PARTIAL_ASSIGN;
 				}
 				break;
 			case PARTIAL_ASSIGN:
-				orderAssignStatus = PARTIAL_ASSIGN;
+				orderAssignStatus = AssignStatusEnum.PARTIAL_ASSIGN;
 				break;
 			case ASSIGNED:
 				if(assignQuantity == totalQuantity){
-					orderAssignStatus = ASSIGNED;
+					orderAssignStatus = AssignStatusEnum.ASSIGNED;
 				}else{
-					orderAssignStatus = PARTIAL_ASSIGN;
+					orderAssignStatus = AssignStatusEnum.PARTIAL_ASSIGN;
 				}
 				break;
 			default: