Merge pull request '物料库存资源配置表新增前端显示字段' (#286) from feature_mps_2 into develop

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

models/ap/ArticleStockLevel.model.go

@@ -32,6 +32,8 @@ type ArticleStockLevel struct {
 	LastModify grmi.DateTime `xorm:"datetime 'LastModify' not null updated" json:"AP_ArticleStockLevel-LastModify"`
 	LastUser   string        `xorm:"nvarchar(20) 'LastUser' not null" json:"AP_ArticleStockLevel-LastUser"`
 	CreateTime grmi.DateTime `xorm:"datetime 'CreateTime' not null created" json:"AP_ArticleStockLevel-CreateTime"`
+
+	MainResourceId string `xorm:"-" json:"AP_ArticleStockLevel-MainResourceId"` //主要资源ID
 }
 
 /******************************************************************************

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

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

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

@@ -3809,6 +3809,7 @@ func (impl *BalanceServiceImplement) RefreshBalanceData(user *global.User) error
 				}
 
 				Time := utils.WeekDayMondayZeroTs(info.RecieveTime.Restore())
+				OrginTime := info.ExpectedDeliveryDate
 				isAdd := false
 				var AddTime time.Time
 				ArticleTime := utils.WeekDayMondayZeroTs(beforeList[index].DemandDate.Restore())
@@ -3818,7 +3819,7 @@ func (impl *BalanceServiceImplement) RefreshBalanceData(user *global.User) error
 					isAdd = true
 				}
 
-				if isAdd && AddTime.Before(Time) && !ArticleTime.Before(Time) || Time == ArticleTime {
+				if isAdd && !AddTime.After(OrginTime.Restore()) && !ArticleTime.Before(OrginTime.Restore()) || Time == ArticleTime {
 					beforeList[index].IndependentDemandQty += DLQty
 				}
 			}
@@ -3853,7 +3854,7 @@ func (impl *BalanceServiceImplement) RefreshBalanceData(user *global.User) error
 				} else {
 					isInMap[beforeList[index].ArtId] += 1
 				}
-
+				OrginTime := info.ExpectedDeliveryDate
 				Time := utils.WeekDayMondayZeroTs(info.RecieveTime.Restore())
 				isAdd := false
 				var AddTime time.Time
@@ -3864,7 +3865,7 @@ func (impl *BalanceServiceImplement) RefreshBalanceData(user *global.User) error
 					isAdd = true
 				}
 
-				if isAdd && AddTime.Before(Time) && !ArticleTime.Before(Time) || Time == ArticleTime {
+				if isAdd && !AddTime.After(OrginTime.Restore()) && !ArticleTime.Before(OrginTime.Restore()) || Time == ArticleTime {
 					beforeList[index].WipQty += ZZQty
 				}
 
@@ -3890,7 +3891,7 @@ func (impl *BalanceServiceImplement) RefreshBalanceData(user *global.User) error
 					isInMap[beforeList[index].ArtId] += 1
 				}
 				//articleDemandList[index].OrderQty = 0
-
+				OrginTime := info.ExpectedDeliveryDate
 				Time := utils.WeekDayMondayZeroTs(info.RecieveTime.Restore())
 				isAdd := false
 				var AddTime time.Time
@@ -3901,7 +3902,7 @@ func (impl *BalanceServiceImplement) RefreshBalanceData(user *global.User) error
 					isAdd = true
 				}
 
-				if isAdd && AddTime.Before(Time) && !ArticleTime.Before(Time) || Time == ArticleTime {
+				if isAdd && !AddTime.After(OrginTime.Restore()) && !ArticleTime.Before(OrginTime.Restore()) || Time == ArticleTime {
 					beforeList[index].OrderQty += DDQty
 				}
 

services/erp/erp.go

@@ -556,9 +556,9 @@ func GetOrderQty(PlantNr int, UserId string, allData *[]model.Article) (err erro
 		if isIn2 {
 			Qty = finalBillQtyMap[billNoOrigin+"["+utils.ValueToString(info[6], "")+"]"+"["+utils.ValueToString(info[0], "")+"]"]
 		}
-		Time, _ := time.ParseInLocation("2006-01-02T15:04:05", utils.ValueToString(info[2], ""), utils.TimezoneLocation)
+		OriginTime, _ := time.ParseInLocation("2006-01-02T15:04:05", utils.ValueToString(info[2], ""), utils.TimezoneLocation)
 
-		Time = utils.WeekDayMondayZeroTs(Time)
+		Time := utils.WeekDayMondayZeroTs(OriginTime)
 
 		OrderId := "DD"+"_"+billNoOrigin+"_"+rowId
 		//fmt.Println(OrderId)
@@ -569,6 +569,7 @@ func GetOrderQty(PlantNr int, UserId string, allData *[]model.Article) (err erro
 			ArtId:   ArtId,
 			//Descr:   articleInfo.Descr1,
 			//FMaterialId: FMaterialId,
+			ExpectedDeliveryDate: grmi.Date(OriginTime),
 			RecieveTime: grmi.DateTime(Time),
 			PlanQty:    Qty,
 			ProductType: "DD",
@@ -684,20 +685,21 @@ func GetDuliQty(PlantNr int, UserId string, allData *[]model.Article) (err error
 	for _, info := range dataList{
 		ArtId := info[0].(string)
 		Qty := info[1].(float64)
-		Time, _ := time.ParseInLocation("2006-01-02T15:04:05", utils.ValueToString(info[2], ""), utils.TimezoneLocation)
-		Time = utils.WeekDayMondayZeroTs(Time)
+		OriginTime, _ := time.ParseInLocation("2006-01-02T15:04:05", utils.ValueToString(info[2], ""), utils.TimezoneLocation)
+		Time := utils.WeekDayMondayZeroTs(OriginTime)
 		billNoOrigin := info[3].(string)
 		rowId := info[4].(string)
 
 		OrderId := "DL"+"_"+billNoOrigin+"_"+rowId
 		//fmt.Println(OrderId)
-		Time = utils.WeekDayMondayZeroTs(Time)
+		//Time = utils.WeekDayMondayZeroTs(Time)
 		SalesOrder := model.SalesOrder{
 			PlantNr: PlantNr,
 			OrderId: OrderId,
 			ArtId:   ArtId,
 			//Descr:   articleInfo.Descr1,
 			//FMaterialId: FMaterialId,
+			ExpectedDeliveryDate: grmi.Date(OriginTime),
 			RecieveTime: grmi.DateTime(Time),
 			PlanQty:    Qty,
 			ProductType: "DL",
@@ -765,19 +767,20 @@ func GetZhaizhiWeekQty(PlantNr int, UserId string, allData *[]model.Article) (er
 		//fmt.Println(info)
 		ArtId := info[0].(string)
 		Qty := info[1].(float64)
-		Time, _ := time.ParseInLocation("2006-01-02T15:04:05", utils.ValueToString(info[2], ""), utils.TimezoneLocation)
+		OriginTime, _ := time.ParseInLocation("2006-01-02T15:04:05", utils.ValueToString(info[2], ""), utils.TimezoneLocation)
 		billNoOrigin := info[3].(string)
 		rowId := info[4].(string)
 
 		OrderId := "ZZ"+"_"+billNoOrigin+"_"+rowId
 		//fmt.Println(OrderId)
-		Time = utils.WeekDayMondayZeroTs(Time)
+		Time := utils.WeekDayMondayZeroTs(OriginTime)
 		SalesOrder := model.SalesOrder{
 			PlantNr: PlantNr,
 			OrderId: OrderId,
 			ArtId:   ArtId,
 			//Descr:   articleInfo.Descr1,
 			//FMaterialId: FMaterialId,
+			ExpectedDeliveryDate: grmi.Date(OriginTime),
 			RecieveTime: grmi.DateTime(Time),
 			PlanQty:    Qty,
 			ProductType: "ZZ",