diff --git a/meta/ap/ArticleDemand.meta.go b/meta/ap/ArticleDemand.meta.go index 9f5fbcf..0e648db 100644 --- a/meta/ap/ArticleDemand.meta.go +++ b/meta/ap/ArticleDemand.meta.go @@ -45,6 +45,8 @@ var ArticleDemand_LastUser = grmi.NewField("LastUser", "[AP_ArticleDemand].LastU var ArticleDemand_CreateTime = grmi.NewField("CreateTime", "[AP_ArticleDemand].CreateTime", "createtime", grmi.TypeDateTime) var ArticleDemand_ResourceId = grmi.NewField("ResourceId", "[AP_ArticleDemand].ResourceId", "resourceid", grmi.TypeString) var ArticleDemand_OriginOutSourcingQty = grmi.NewField("OriginOutSourcingQty", "[AP_ArticleDemand].OriginOutSourcingQty", "originoutsourcingqty", grmi.TypeFloat64) +var ArticleDemand_ZaituQty = grmi.NewField("ZaituQty", "[AP_ArticleDemandEmergency].ZaituQty", "zaituqty", grmi.TypeFloat64) +var ArticleDemand_WeiwaiQty = grmi.NewField("WeiwaiQty", "[AP_ArticleDemandEmergency].WeiwaiQty", "weiwaiqty", grmi.TypeFloat64) /****************************************************************************** * * @Description : ArticleDemand的元数据 @@ -87,6 +89,8 @@ var ArticleDemand = grmi.NewEntity( ArticleDemand_CreateTime.Name: ArticleDemand_CreateTime, ArticleDemand_ResourceId.Name: ArticleDemand_ResourceId, ArticleDemand_OriginOutSourcingQty.Name: ArticleDemand_OriginOutSourcingQty, + ArticleDemand_ZaituQty.Name:ArticleDemand_ZaituQty, + ArticleDemand_WeiwaiQty.Name:ArticleDemand_WeiwaiQty, }, []string{"PlantNr"}, - []string{"DemandPeriodType", "ProjectId", "CustomerId", "DemandDate", "DemandYear", "DemandWeek", "DemandMonth", "ForecastDemandQty", "OrderQty", "OutSourcingQty", "IndependentDemandQty", "WipQty", "OpeningInventory", "TargetInventory", "MinInventory", "NetDemandQty", "EndingInventory", "Status", "Status1", "Status2", "LastUser","ResourceId","OriginOutSourcingQty", "PublishedVersionNr"}) + []string{"DemandPeriodType", "ProjectId", "CustomerId", "DemandDate", "DemandYear", "DemandWeek", "DemandMonth", "ForecastDemandQty", "OrderQty", "OutSourcingQty", "IndependentDemandQty", "WipQty", "OpeningInventory", "TargetInventory", "MinInventory", "NetDemandQty", "EndingInventory", "Status", "Status1", "Status2", "LastUser","ResourceId","OriginOutSourcingQty", "PublishedVersionNr","ZaituQty","WeiwaiQty"}) diff --git a/meta/ap/ArticleDemandEmergency.meta.go b/meta/ap/ArticleDemandEmergency.meta.go index 216bd86..11c064c 100644 --- a/meta/ap/ArticleDemandEmergency.meta.go +++ b/meta/ap/ArticleDemandEmergency.meta.go @@ -46,6 +46,7 @@ var ArticleDemandEmergency_LastModify = grmi.NewField("LastModify", "[AP_Article var ArticleDemandEmergency_LastUser = grmi.NewField("LastUser", "[AP_ArticleDemandEmergency].LastUser", "lastuser", grmi.TypeString) var ArticleDemandEmergency_CreateTime = grmi.NewField("CreateTime", "[AP_ArticleDemandEmergency].CreateTime", "createtime", grmi.TypeDateTime) var ArticleDemandEmergency_ZaituQty = grmi.NewField("ZaituQty", "[AP_ArticleDemandEmergency].ZaituQty", "zaituqty", grmi.TypeFloat64) +var ArticleDemandEmergency_WeiwaiQty = grmi.NewField("WeiwaiQty", "[AP_ArticleDemandEmergency].WeiwaiQty", "weiwaiqty", grmi.TypeFloat64) /****************************************************************************** * * @Description : ArticleDemandEmergency的元数据 @@ -89,6 +90,7 @@ var ArticleDemandEmergency = grmi.NewEntity( ArticleDemandEmergency_LastUser.Name: ArticleDemandEmergency_LastUser, ArticleDemandEmergency_CreateTime.Name: ArticleDemandEmergency_CreateTime, ArticleDemandEmergency_ZaituQty.Name: ArticleDemandEmergency_ZaituQty, + ArticleDemandEmergency_WeiwaiQty.Name: ArticleDemandEmergency_WeiwaiQty, }, []string{"PlantNr"}, - []string{"DemandPeriodType", "ProjectId", "CustomerId", "DemandDate", "DemandYear", "DemandWeek", "DemandMonth", "ForecastDemandQty", "OrderQty", "OutSourcingQty", "IndependentDemandQty", "WipQty", "OpeningInventory", "TargetInventory", "MinInventory", "NetDemandQty", "EndingInventory", "Status", "Status1", "Status2", "ResourceId", "OriginOutSourcingQty", "PublishedVersionNr", "LastUser","ZaituQty"}) + []string{"DemandPeriodType", "ProjectId", "CustomerId", "DemandDate", "DemandYear", "DemandWeek", "DemandMonth", "ForecastDemandQty", "OrderQty", "OutSourcingQty", "IndependentDemandQty", "WipQty", "OpeningInventory", "TargetInventory", "MinInventory", "NetDemandQty", "EndingInventory", "Status", "Status1", "Status2", "ResourceId", "OriginOutSourcingQty", "PublishedVersionNr", "LastUser","ZaituQty","WeiwaiQty"}) diff --git a/models/ap/ArticleDemand.model.go b/models/ap/ArticleDemand.model.go index 6cc4593..2e40ce7 100644 --- a/models/ap/ArticleDemand.model.go +++ b/models/ap/ArticleDemand.model.go @@ -43,6 +43,7 @@ type ArticleDemand struct { Status int `xorm:"int 'Status' not null" json:"AP_ArticleDemand-Status"` //0未发布 1 发布中 2 已发布 ZaituQty float64 `xorm:"-" json:"AP_ArticleDemand-ZaituQty"` //在途量 + WeiwaiQty float64 `xorm:"-" json:"AP_ArticleDemand-WeiwaiQty"` //委外量 //不显示 OriginOutSourcingQty float64 `xorm:"float 'OriginOutSourcingQty'" json:"AP_ArticleDemand-OriginOutSourcingQty"` //原始外购需求 diff --git a/models/ap/ArticleDemandEmergency.model.go b/models/ap/ArticleDemandEmergency.model.go index ba35558..79021c9 100644 --- a/models/ap/ArticleDemandEmergency.model.go +++ b/models/ap/ArticleDemandEmergency.model.go @@ -51,6 +51,7 @@ type ArticleDemandEmergency struct { CreateTime grmi.DateTime `xorm:"datetime 'CreateTime' not null created" json:"AP_ArticleDemandEmergency-CreateTime"` ZaituQty float64 `xorm:"ZaituQty" json:"AP_ArticleDemandEmergency-ZaituQty"` //在途量 + WeiwaiQty float64 `xorm:"WeiwaiQty" json:"AP_ArticleDemandEmergency-WeiwaiQty"` //委外量 MidBatchQuantity int `xorm:"-" json:"AP_ArticleDemandEmergency-MidBatchQuantity"` //每次削减量 NeedQty float64 `xorm:"-" json:"AP_ArticleDemandEmergency-NeedQty"` //需求 diff --git a/services/ap/implments/ArticleDemand.service.impl.go b/services/ap/implments/ArticleDemand.service.impl.go index d564ca0..b645fa6 100644 --- a/services/ap/implments/ArticleDemand.service.impl.go +++ b/services/ap/implments/ArticleDemand.service.impl.go @@ -50,6 +50,8 @@ var DefaultConditionOfArticleDemand = grmi.NewCondition( meta.ArticleDemand_ResourceId.UrlParameterName: grmi.NewConditionItem(meta.ArticleDemand_ResourceId, grmi.Equal, false), meta.ArticleDemand_OriginOutSourcingQty.UrlParameterName: grmi.NewConditionItem(meta.ArticleDemand_OriginOutSourcingQty, grmi.Equal, false), meta.ArticleDemand_PublishedVersionNr.UrlParameterName: grmi.NewConditionItem(meta.ArticleDemand_PublishedVersionNr, grmi.Equal, false), + meta.ArticleDemand_WeiwaiQty.UrlParameterName: grmi.NewConditionItem(meta.ArticleDemandEmergency_WeiwaiQty, grmi.Equal, false), + meta.ArticleDemandEmergency_ZaituQty.UrlParameterName: grmi.NewConditionItem(meta.ArticleDemandEmergency_ZaituQty, grmi.Equal, false), }, nil, ) diff --git a/services/ap/implments/Balance.service.impl.go b/services/ap/implments/Balance.service.impl.go index c6fb77e..1cc3719 100644 --- a/services/ap/implments/Balance.service.impl.go +++ b/services/ap/implments/Balance.service.impl.go @@ -259,7 +259,7 @@ func (impl *BalanceServiceImplement) GetCustomerArticleDemand(user *global.User, for index, info := range data { var CustArtStockItem model.CustArtStockItem //净生产量 - for i := 0; i < 11; i++ { + for i := 0; i < 12; i++ { CustArtStockItem.ItemLst = append(CustArtStockItem.ItemLst, make(map[string]string)) if i == 0 && index == 0 { @@ -324,18 +324,21 @@ func (impl *BalanceServiceImplement) GetCustomerArticleDemand(user *global.User, CustArtStockItem.ItemLst[i]["AP_ArticleDemand-Label"] = "AP_ArticleDemand-WipQty" CustArtStockItem.ItemLst[i][detail.DemandKey] = utils.FloatToString(detail.WipQty, 0) case 6: + CustArtStockItem.ItemLst[i]["AP_ArticleDemand-Label"] = "AP_ArticleDemand-WeiwaiQty" + CustArtStockItem.ItemLst[i][detail.DemandKey] = utils.FloatToString(detail.WeiwaiQty, 0) + case 7: CustArtStockItem.ItemLst[i]["AP_ArticleDemand-Label"] = "AP_ArticleDemand-ZaituQty" CustArtStockItem.ItemLst[i][detail.DemandKey] = utils.FloatToString(detail.ZaituQty, 0) - case 7: + case 8: CustArtStockItem.ItemLst[i]["AP_ArticleDemand-Label"] = "AP_ArticleDemand-OpeningInventory" CustArtStockItem.ItemLst[i][detail.DemandKey] = utils.FloatToString(detail.OpeningInventory, 0) - case 8: + case 9: CustArtStockItem.ItemLst[i]["AP_ArticleDemand-Label"] = "AP_ArticleDemand-TargetInventory" CustArtStockItem.ItemLst[i][detail.DemandKey] = utils.FloatToString(detail.TargetInventory, 0) - case 9: + case 10: CustArtStockItem.ItemLst[i]["AP_ArticleDemand-Label"] = "AP_ArticleDemand-MinInventory" CustArtStockItem.ItemLst[i][detail.DemandKey] = utils.FloatToString(detail.MinInventory, 0) - case 10: + case 11: CustArtStockItem.ItemLst[i]["AP_ArticleDemand-Label"] = "AP_ArticleDemand-EndingInventory" CustArtStockItem.ItemLst[i][detail.DemandKey] = utils.FloatToString(detail.EndingInventory, 0) } @@ -461,6 +464,18 @@ func (impl *BalanceServiceImplement) RefreshCustomerArticleDemand(user *global.U data_ArticleDemand[index].WipQty = utils.ValueToFloat(value, 0.0) } } + case "AP_ArticleDemand-WeiwaiQty": + for key, value := range mapInfo { + if info.DemandKey == key { + data_ArticleDemand[index].WeiwaiQty = utils.ValueToFloat(value, 0.0) + } + } + case "AP_ArticleDemand-ZaituQty": + for key, value := range mapInfo { + if info.DemandKey == key { + data_ArticleDemand[index].ZaituQty = utils.ValueToFloat(value, 0.0) + } + } case "AP_ArticleDemand-OpeningInventory": for key, value := range mapInfo { if info.DemandKey == key { @@ -554,7 +569,7 @@ func (impl *BalanceServiceImplement) RefreshCustomerArticleDemand(user *global.U for index, info := range data { var CustArtStockItem model.CustArtStockItem //净生产量 - for i := 0; i < 10; i++ { + for i := 0; i < 12; i++ { CustArtStockItem.ItemLst = append(CustArtStockItem.ItemLst, make(map[string]string)) if i == 0 && index == 0 { @@ -608,15 +623,21 @@ func (impl *BalanceServiceImplement) RefreshCustomerArticleDemand(user *global.U CustArtStockItem.ItemLst[i]["AP_ArticleDemand-Label"] = "AP_ArticleDemand-WipQty" CustArtStockItem.ItemLst[i][detail.DemandKey] = utils.FloatToString(detail.WipQty, 0) case 6: + CustArtStockItem.ItemLst[i]["AP_ArticleDemand-Label"] = "AP_ArticleDemand-WeiwaiQty" + CustArtStockItem.ItemLst[i][detail.DemandKey] = utils.FloatToString(detail.WeiwaiQty, 0) + case 7: + CustArtStockItem.ItemLst[i]["AP_ArticleDemand-Label"] = "AP_ArticleDemand-ZaituQty" + CustArtStockItem.ItemLst[i][detail.DemandKey] = utils.FloatToString(detail.ZaituQty, 0) + case 8: CustArtStockItem.ItemLst[i]["AP_ArticleDemand-Label"] = "AP_ArticleDemand-OpeningInventory" CustArtStockItem.ItemLst[i][detail.DemandKey] = utils.FloatToString(detail.OpeningInventory, 0) - case 7: + case 9: CustArtStockItem.ItemLst[i]["AP_ArticleDemand-Label"] = "AP_ArticleDemand-TargetInventory" CustArtStockItem.ItemLst[i][detail.DemandKey] = utils.FloatToString(detail.TargetInventory, 0) - case 8: + case 10: CustArtStockItem.ItemLst[i]["AP_ArticleDemand-Label"] = "AP_ArticleDemand-MinInventory" CustArtStockItem.ItemLst[i][detail.DemandKey] = utils.FloatToString(detail.MinInventory, 0) - case 9: + case 11: CustArtStockItem.ItemLst[i]["AP_ArticleDemand-Label"] = "AP_ArticleDemand-EndingInventory" CustArtStockItem.ItemLst[i][detail.DemandKey] = utils.FloatToString(detail.EndingInventory, 0) } @@ -1651,10 +1672,10 @@ func (impl *BalanceServiceImplement) refreshMpsArticleDemand(isRefresh bool, dat // 需求 for index, _ := range data_ArticleDemand { //需求 = 预测和订单需求最大值 + 外购 + 独立 （作废） - //需求 = 预测需求和订单需求最大值+独立需求-在制 -外购 - needQty := data_ArticleDemand[index].OrderQty + data_ArticleDemand[index].IndependentDemandQty - data_ArticleDemand[index].WipQty - data_ArticleDemand[index].OutSourcingQty - data_ArticleDemand[index].ZaituQty + //需求 = 预测需求和订单需求最大值+独立需求-在制 -外购 - 委外 + needQty := data_ArticleDemand[index].OrderQty + data_ArticleDemand[index].IndependentDemandQty - data_ArticleDemand[index].WipQty - data_ArticleDemand[index].OutSourcingQty - data_ArticleDemand[index].ZaituQty - data_ArticleDemand[index].WeiwaiQty if data_ArticleDemand[index].ForecastDemandQty > data_ArticleDemand[index].OrderQty { - needQty = data_ArticleDemand[index].ForecastDemandQty + data_ArticleDemand[index].IndependentDemandQty - data_ArticleDemand[index].WipQty - data_ArticleDemand[index].OutSourcingQty - data_ArticleDemand[index].ZaituQty + needQty = data_ArticleDemand[index].ForecastDemandQty + data_ArticleDemand[index].IndependentDemandQty - data_ArticleDemand[index].WipQty - data_ArticleDemand[index].OutSourcingQty - data_ArticleDemand[index].ZaituQty - data_ArticleDemand[index].WeiwaiQty } data_ArticleDemand[index].NeedQty = needQty } @@ -1789,9 +1810,9 @@ func (impl *BalanceServiceImplement) refreshMpsArticleDemandEmergency(isRefresh for index, _ := range data_ArticleDemand { //需求 = 预测和订单需求最大值 + 外购 + 独立 （作废） //需求 = 预测需求和订单需求最大值+独立需求-在制 -外购 - needQty := data_ArticleDemand[index].OrderQty + data_ArticleDemand[index].IndependentDemandQty - data_ArticleDemand[index].WipQty - data_ArticleDemand[index].OutSourcingQty - data_ArticleDemand[index].ZaituQty + needQty := data_ArticleDemand[index].OrderQty + data_ArticleDemand[index].IndependentDemandQty - data_ArticleDemand[index].WipQty - data_ArticleDemand[index].OutSourcingQty - data_ArticleDemand[index].ZaituQty - data_ArticleDemand[index].WeiwaiQty if data_ArticleDemand[index].ForecastDemandQty > data_ArticleDemand[index].OrderQty { - needQty = data_ArticleDemand[index].ForecastDemandQty + data_ArticleDemand[index].IndependentDemandQty - data_ArticleDemand[index].WipQty - data_ArticleDemand[index].OutSourcingQty - data_ArticleDemand[index].ZaituQty + needQty = data_ArticleDemand[index].ForecastDemandQty + data_ArticleDemand[index].IndependentDemandQty - data_ArticleDemand[index].WipQty - data_ArticleDemand[index].OutSourcingQty - data_ArticleDemand[index].ZaituQty - data_ArticleDemand[index].WeiwaiQty } data_ArticleDemand[index].NeedQty = needQty } @@ -1813,9 +1834,9 @@ func (impl *BalanceServiceImplement) refreshMpsArticleDemandEmergency(isRefresh } } - // 期末库存 = 净生产量 + 期初库存 - 需求 + // 期末库存 = 净生产量 + 期初库存 - 需求 + 外购 if !isRefresh { - data_ArticleDemand[index].EndingInventory = data_ArticleDemand[index].NetDemandQty + data_ArticleDemand[index].OpeningInventory - data_ArticleDemand[index].NeedQty + data_ArticleDemand[index].EndingInventory = data_ArticleDemand[index].NetDemandQty + data_ArticleDemand[index].OpeningInventory - data_ArticleDemand[index].NeedQty + data_ArticleDemand[index].WeiwaiQty } if index != len(data_ArticleDemand)-1 { @@ -3699,7 +3720,7 @@ func (impl *BalanceServiceImplement) RefreshBalanceData(user *global.User) error session.Rollback() return grmi.NewBusinessError("查询SalesOrder失败, error:" + err.Error()) } - DLQty, ZZQty, DDQty := 0.0, 0.0, 0.0 + DLQty, WGQty, ZZQty, DDQty,WWQty := 0.0, 0.0, 0.0, 0.0, 0.0 for _, info := range SalesOrderList { if info.ProductType == "DL" { DLQty = info.PlanQty @@ -3808,6 +3829,78 @@ func (impl *BalanceServiceImplement) RefreshBalanceData(user *global.User) error } } + for _, info := range SalesOrderList { + if info.ProductType == "WW" { + WWQty = info.PlanQty + } else { + continue + } + isInMap := make(map[string]int) + for index, _ := range beforeList { + ArtId := info.ArtId + if ArtId != beforeList[index].ArtId { + continue + } + _, isIn := isInMap[beforeList[index].ArtId] + if !isIn { + isInMap[beforeList[index].ArtId] = 0 + } else { + isInMap[beforeList[index].ArtId] += 1 + } + OrginTime := info.ExpectedDeliveryDate + Time := utils.WeekDayMondayZeroTs(info.RecieveTime.Restore()) + isAdd := false + var AddTime time.Time + ArticleTime := utils.WeekDayMondayZeroTs(beforeList[index].DemandDate.Restore()) + if isInMap[beforeList[index].ArtId] == 0 { + AddTime = ArticleTime.Add(-time.Duration(mpsSettingOne.SalesOrderFetchLeadTimeByDay*24) * time.Hour) + fmt.Println(AddTime, Time, ArticleTime) + isAdd = true + } + + if isAdd && !AddTime.After(OrginTime.Restore()) && !ArticleTime.Before(OrginTime.Restore()) || Time == ArticleTime { + beforeList[index].WeiwaiQty += WWQty + } + + } + } + + for _, info := range SalesOrderList { + if info.ProductType == "WG" { + WGQty = info.PlanQty + } else { + continue + } + isInMap := make(map[string]int) + for index, _ := range beforeList { + ArtId := info.ArtId + if ArtId != beforeList[index].ArtId { + continue + } + _, isIn := isInMap[beforeList[index].ArtId] + if !isIn { + isInMap[beforeList[index].ArtId] = 0 + } else { + isInMap[beforeList[index].ArtId] += 1 + } + //articleDemandList[index].OrderQty = 0 + OrginTime := info.ExpectedDeliveryDate + Time := utils.WeekDayMondayZeroTs(info.RecieveTime.Restore()) + isAdd := false + var AddTime time.Time + ArticleTime := utils.WeekDayMondayZeroTs(beforeList[index].DemandDate.Restore()) + if isInMap[beforeList[index].ArtId] == 0 { + AddTime = ArticleTime.Add(-time.Duration(mpsSettingOne.SalesOrderFetchLeadTimeByDay*24) * time.Hour) + fmt.Println(AddTime, Time, ArticleTime) + isAdd = true + } + + if isAdd && !AddTime.After(OrginTime.Restore()) && !ArticleTime.Before(OrginTime.Restore()) || Time == ArticleTime { + beforeList[index].ZaituQty += WGQty + } + } + } + articleResource, err := artResourceDao.SelectOneByArtId(artId) if err != nil { session.Rollback() @@ -4595,7 +4688,7 @@ func (impl *BalanceServiceImplement) ArticleDemandEmergencyCreate(user *global.U session.Rollback() return grmi.NewBusinessError("查询SalesOrder失败, error:" + err.Error()) } - DLQty, WGQty, ZZQty, DD_TEMPQty := 0.0, 0.0, 0.0, 0.0 + DLQty, WGQty, ZZQty, DD_TEMPQty,WWQty := 0.0, 0.0, 0.0, 0.0, 0.0 for _, info := range SalesOrderList { if info.ProductType == "DD_TEMP" { DD_TEMPQty = info.PlanQty @@ -4702,6 +4795,42 @@ func (impl *BalanceServiceImplement) ArticleDemandEmergencyCreate(user *global.U } } + for _, info := range SalesOrderList { + if info.ProductType == "WW" { + WWQty = info.PlanQty + } else { + continue + } + isInMap := make(map[string]int) + for index, _ := range beforeList { + ArtId := info.ArtId + if ArtId != beforeList[index].ArtId { + continue + } + _, isIn := isInMap[beforeList[index].ArtId] + if !isIn { + isInMap[beforeList[index].ArtId] = 0 + } else { + isInMap[beforeList[index].ArtId] += 1 + } + OrginTime := info.ExpectedDeliveryDate + Time := utils.WeekDayMondayZeroTs(info.RecieveTime.Restore()) + isAdd := false + var AddTime time.Time + ArticleTime := utils.WeekDayMondayZeroTs(beforeList[index].DemandDate.Restore()) + if isInMap[beforeList[index].ArtId] == 0 { + AddTime = ArticleTime.Add(-time.Duration(mpsSettingOne.SalesOrderFetchLeadTimeByDay*24) * time.Hour) + fmt.Println(AddTime, Time, ArticleTime) + isAdd = true + } + + if isAdd && !AddTime.After(OrginTime.Restore()) && !ArticleTime.Before(OrginTime.Restore()) || Time == ArticleTime { + beforeList[index].WeiwaiQty += WWQty + } + + } + } + for _, info := range SalesOrderList { if info.ProductType == "WG" { WGQty = info.PlanQty @@ -4779,6 +4908,7 @@ func (impl *BalanceServiceImplement) ArticleDemandEmergencyCreate(user *global.U MinCoverPeriodType: info.MinCoverPeriodType, ResourceId: info.ResourceId, ZaituQty: info.ZaituQty, + WeiwaiQty: info.WeiwaiQty, } err := dao_ArticleDemandEmergency.InsertOne(&articleDemandEmergency) if err != nil { @@ -4954,7 +5084,7 @@ func (impl *BalanceServiceImplement) ArticleDemandEmergencyGet(user *global.User for index, info := range data { var CustArtStockItem model.CustArtStockItem //净生产量 - for i := 0; i < 11; i++ { + for i := 0; i < 12; i++ { CustArtStockItem.ItemLst = append(CustArtStockItem.ItemLst, make(map[string]string)) if i == 0 && index == 0 { @@ -5019,18 +5149,21 @@ func (impl *BalanceServiceImplement) ArticleDemandEmergencyGet(user *global.User CustArtStockItem.ItemLst[i]["AP_ArticleDemandEmergency-Label"] = "AP_ArticleDemandEmergency-WipQty" CustArtStockItem.ItemLst[i][detail.DemandKey] = utils.FloatToString(detail.WipQty, 0) case 6: + CustArtStockItem.ItemLst[i]["AP_ArticleDemandEmergency-Label"] = "AP_ArticleDemandEmergency-WeiwaiQty" + CustArtStockItem.ItemLst[i][detail.DemandKey] = utils.FloatToString(detail.WeiwaiQty, 0) + case 7: CustArtStockItem.ItemLst[i]["AP_ArticleDemandEmergency-Label"] = "AP_ArticleDemandEmergency-ZaituQty" CustArtStockItem.ItemLst[i][detail.DemandKey] = utils.FloatToString(detail.ZaituQty, 0) - case 7: + case 8: CustArtStockItem.ItemLst[i]["AP_ArticleDemandEmergency-Label"] = "AP_ArticleDemandEmergency-OpeningInventory" CustArtStockItem.ItemLst[i][detail.DemandKey] = utils.FloatToString(detail.OpeningInventory, 0) - case 8: + case 9: CustArtStockItem.ItemLst[i]["AP_ArticleDemandEmergency-Label"] = "AP_ArticleDemandEmergency-TargetInventory" CustArtStockItem.ItemLst[i][detail.DemandKey] = utils.FloatToString(detail.TargetInventory, 0) - case 9: + case 10: CustArtStockItem.ItemLst[i]["AP_ArticleDemandEmergency-Label"] = "AP_ArticleDemandEmergency-MinInventory" CustArtStockItem.ItemLst[i][detail.DemandKey] = utils.FloatToString(detail.MinInventory, 0) - case 10: + case 11: CustArtStockItem.ItemLst[i]["AP_ArticleDemandEmergency-Label"] = "AP_ArticleDemandEmergency-EndingInventory" CustArtStockItem.ItemLst[i][detail.DemandKey] = utils.FloatToString(detail.EndingInventory, 0) } @@ -5306,6 +5439,12 @@ func (impl *BalanceServiceImplement) RefreshCustomerArticleDemandEmergency(user data_ArticleDemand[index].WipQty = utils.ValueToFloat(value, 0.0) } } + case "AP_ArticleDemandEmergency-WeiwaiQty": + for key, value := range mapInfo { + if info.DemandKey == key { + data_ArticleDemand[index].WeiwaiQty = utils.ValueToFloat(value, 0.0) + } + } case "AP_ArticleDemandEmergency-ZaituQty": for key, value := range mapInfo { if info.DemandKey == key { @@ -5399,7 +5538,7 @@ func (impl *BalanceServiceImplement) RefreshCustomerArticleDemandEmergency(user for index, info := range data { var CustArtStockItem model.CustArtStockItem //净生产量 - for i := 0; i < 11; i++ { + for i := 0; i < 12; i++ { CustArtStockItem.ItemLst = append(CustArtStockItem.ItemLst, make(map[string]string)) if i == 0 && index == 0 { @@ -5453,21 +5592,23 @@ func (impl *BalanceServiceImplement) RefreshCustomerArticleDemandEmergency(user CustArtStockItem.ItemLst[i]["AP_ArticleDemandEmergency-Label"] = "AP_ArticleDemandEmergency-WipQty" CustArtStockItem.ItemLst[i][detail.DemandKey] = utils.FloatToString(detail.WipQty, 0) case 6: + CustArtStockItem.ItemLst[i]["AP_ArticleDemandEmergency-Label"] = "AP_ArticleDemandEmergency-WeiwaiQty" + CustArtStockItem.ItemLst[i][detail.DemandKey] = utils.FloatToString(detail.WeiwaiQty, 0) + case 7: CustArtStockItem.ItemLst[i]["AP_ArticleDemandEmergency-Label"] = "AP_ArticleDemandEmergency-ZaituQty" CustArtStockItem.ItemLst[i][detail.DemandKey] = utils.FloatToString(detail.ZaituQty, 0) - case 7: + case 8: CustArtStockItem.ItemLst[i]["AP_ArticleDemandEmergency-Label"] = "AP_ArticleDemandEmergency-OpeningInventory" CustArtStockItem.ItemLst[i][detail.DemandKey] = utils.FloatToString(detail.OpeningInventory, 0) - case 8: + case 9: CustArtStockItem.ItemLst[i]["AP_ArticleDemandEmergency-Label"] = "AP_ArticleDemandEmergency-TargetInventory" CustArtStockItem.ItemLst[i][detail.DemandKey] = utils.FloatToString(detail.TargetInventory, 0) - case 9: + case 10: CustArtStockItem.ItemLst[i]["AP_ArticleDemandEmergency-Label"] = "AP_ArticleDemandEmergency-MinInventory" CustArtStockItem.ItemLst[i][detail.DemandKey] = utils.FloatToString(detail.MinInventory, 0) - case 10: + case 11: CustArtStockItem.ItemLst[i]["AP_ArticleDemandEmergency-Label"] = "AP_ArticleDemandEmergency-EndingInventory" CustArtStockItem.ItemLst[i][detail.DemandKey] = utils.FloatToString(detail.EndingInventory, 0) - } } }