添加ardemandlstcache的项目id映射和修改变更类型的覆盖顺序

services/om/implments/ParsePortalWorkOrder.service.impl.go

@@ -542,14 +542,14 @@ func (impl *ParseMesWorkOrderServiceImplement) DealArtDemand(pid int,
 			artDemandHead.ChangeStatus = logModel.DemandChangeStatusTrue
 			artDemandHead.DemandCtrlPara4 = "OrderStatus"
 		}
-		if artDemandHead.DemandQty != workOrderQty.PlanQty {
-			artDemandHead.ChangeStatus = logModel.DemandChangeStatusTrue
-			artDemandHead.DemandCtrlPara4 = "PlanQty"
-		}
 		if artDemandHead.DemandCtrlPara1 != serial || artDemandHead.DemandCtrlPara2 != seq || artDemandHead.DemandCtrlPara5 != lastSerial || artDemandHead.DemandCtrlPara6 != lastSeq {
 			artDemandHead.ChangeStatus = logModel.DemandChangeStatusTrue
 			artDemandHead.DemandCtrlPara4 = "sort"
 		}
+		if artDemandHead.DemandQty != workOrderQty.PlanQty {
+			artDemandHead.ChangeStatus = logModel.DemandChangeStatusTrue
+			artDemandHead.DemandCtrlPara4 = "PlanQty"
+		}
 		artDemandHead.OrderStatus = workOrderStatus.Status
 		artDemandHead.DemandQty = workOrderQty.PlanQty
 		artDemandHead.DemandCtrlPara1 = serial
@@ -644,6 +644,7 @@ func (impl *ParseMesWorkOrderServiceImplement) DealArtDemand(pid int,
 				DemandCtrlPara1: serial,
 				DemandCtrlPara2: demandLst.Seq,
 				DemandCtrlPara3: demandLst.BarCodeDesc,
+				ProjectId: workOrder.ProjectId,
 			}
 		}
 		if artDemandStatus >= baseModel.WO_STATUS_RUNNING {