Merge pull request '修改bug' (#290) from feature_mps_2 into develop

Reviewed-on: http://101.201.121.115:3000/leo/LAPP_CHEERSSON_BACKEND/pulls/290

services/ap/implments/ArticleStockLevel.service.impl.go

@@ -299,12 +299,12 @@ func (impl *ArticleStockLevelServiceImplement) SelectAndPaging(user *global.User
 
 	dao_Resource := dal.NewArticleResourceDAO(session, user.PlantNr, user.UserId)
 	articleStockLevelSlice := result.Records.([]model.ArticleStockLevel)
-	for _, info := range articleStockLevelSlice{
+	for index, info := range articleStockLevelSlice{
 		resource, err := dao_Resource.SelectOne(info.ArtId)
 		if err != nil || resource == nil {
 			continue
 		}
-		info.MainResourceId = resource.ResourceId
+		articleStockLevelSlice[index].MainResourceId = resource.ResourceId
 	}
 	result.Records = articleStockLevelSlice
 	return result, nil

services/ap/implments/Balance.service.impl.go

@@ -3678,11 +3678,11 @@ func (impl *BalanceServiceImplement) RefreshBalanceData(user *global.User) error
 			}
 		}
 
-		//需求周期 + mps策略表偏离天数 > 当前时间+ 并且 需求周期 < (当前时间+吸收期+最大覆盖周期)
-		weekTimeNow := utils.WeekDayMondayZeroTs(timeNow)
+		//需求周期 + mps策略表偏离天数 > 当前时间+ 并且 需求周期 < (当前时间+吸收期+最大覆盖周期) 考虑前置期过期订单
+		firstTime := timeNow.Add(-time.Duration(mpsSettingOne.SalesOrderFetchLeadTimeByDay*24) * time.Hour)
 		nowdemandWeek := utils.WeekDayMondayZeroTs(salesOrder.RecieveTime.Restore())
 		//weekTimeDemand := utils.WeekDayMondayZeroTs(demandWeek.Add(time.Duration(frontday*24*7) * time.Hour))
-		if weekTimeNow.After(nowdemandWeek) {
+		if firstTime.After(salesOrder.ExpectedDeliveryDate.Restore()) {
 			continue
 		}