diff --git a/services/erp/erp.go b/services/erp/erp.go index 562a158..2f570fc 100644 --- a/services/erp/erp.go +++ b/services/erp/erp.go @@ -72,7 +72,7 @@ import ( //} //即时库存 期初库存 -func GetQiChuQty(PlantNr int, UserId string, alldata_Article *[]model.Article) { +func GetQiChuQty(PlantNr int, UserId string, alldata_Article *[]model.Article) { engine := db.Eloquent.Master() session := engine.NewSession() defer session.Close() @@ -462,21 +462,17 @@ func GetOrderQty(PlantNr int, UserId string, allData *[]model.Article) (err erro for index1, _ := range dataList { billNoOrigin := dataList[index1][3].(string) Qty := dataList[index1][1].(float64) + if utils.ValueToString(dataList[index1][4], "") == "CONSIGNMENT" { + //寄售订单 + Qty = utils.ValueToFloat(dataList[index1][5], 0) - utils.ValueToFloat(dataList[index1][6], 0) + } changeMap := make(map[int]float64) changeMap[0] = Qty //var changeList []float64 - for index2, v := range dataList2 { + for index2, _ := range dataList2 { //changeQty := 0.0 - Qty := 0.00 - if utils.ValueToString(v[4], "") == "CONSIGNMENT" { - //寄售订单 - Qty = utils.ValueToFloat(v[5], 0) - utils.ValueToFloat(v[6], 0) - } else { - //非寄售订单 - Qty = dataList2[index2][1].(float64) - } - + Qty := dataList2[index2][1].(float64) billNoChange := dataList2[index2][3].(string) //ChangeType := dataList2[index2][4].(string) billList := strings.Split(billNoChange, "_") @@ -488,23 +484,23 @@ func GetOrderQty(PlantNr int, UserId string, allData *[]model.Article) (err erro billMap[billNoOrigin] = changeMap } - type Bill struct{ + type Bill struct { Number int - Qty float64 + Qty float64 } - for billNo, myMap := range billMap{ + for billNo, myMap := range billMap { var billList []Bill - for number, qty := range myMap{ + for number, qty := range myMap { billList = append(billList, Bill{ Number: number, - Qty: qty, + Qty: qty, }) } sort.Slice(billList, func(i, j int) bool { - return billList[i].Number> billList[j].Number + return billList[i].Number > billList[j].Number }) - if len(billList)>0{ + if len(billList) > 0 { finalBillQtyMap[billNo] = billList[0].Qty } } @@ -553,7 +549,7 @@ func GetOrderQty(PlantNr int, UserId string, allData *[]model.Article) (err erro ArticleTime := utils.WeekDayMondayZeroTs(articleDemandList[index].DemandDate.Restore()) if isInMap[articleDemandList[index].ArtId] == 0 { AddTime = ArticleTime.Add(-time.Duration(mpsSettingOne.SalesOrderFetchLeadTimeByDay*24) * time.Hour) - fmt.Println(AddTime,Time,ArticleTime) + fmt.Println(AddTime, Time, ArticleTime) isAdd = true } @@ -569,7 +565,6 @@ func GetOrderQty(PlantNr int, UserId string, allData *[]model.Article) (err erro } } - _ = session.Commit() return nil } @@ -617,7 +612,6 @@ func GetWaigouQty(PlantNr int, UserId string, allData *[]model.Article) (err err } } - _ = session.Commit() return nil } @@ -667,7 +661,6 @@ func GetDuliQty(PlantNr int, UserId string, allData *[]model.Article) (err error return nil } - //周在制 func GetZhaizhiWeekQty(PlantNr int, UserId string, allData *[]model.Article) (err error) { engine := db.Eloquent.Master()