leo
/
LAPP_CHEERSSON_BACKEND
1
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
Browse Source

更新

pull/291/head
yehongyang 3 years ago
parent
69006b2b6b
commit
882d4d1dee
1 changed files with 21 additions and 22 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +21
    -22
      services/erp/erp.go

+ 21
- 22
services/erp/erp.go View File

@ -420,8 +420,7 @@ func GetOrderQty(PlantNr int, UserId string, allData *[]model.Article) (err erro
}
dao_SalesOrder := dal_base.NewSalesOrderDAO(session, PlantNr, UserId)
dao_SalesOrder.DeleteWhere([]grmi.Predicate{meta.SalesOrder_ProductType.NewPredicate(grmi.Equal,"DD")})
dao_SalesOrder.DeleteWhere([]grmi.Predicate{meta.SalesOrder_ProductType.NewPredicate(grmi.Equal, "DD")})
//dao_ArticleDemand := dal.NewArticleDemandDAO(session, PlantNr, UserId)
//articleDemandList, err := dao_ArticleDemand.Select([]grmi.Predicate{}, nil)
@ -463,7 +462,7 @@ func GetOrderQty(PlantNr int, UserId string, allData *[]model.Article) (err erro
changeMap[number] = 0
}
}
billMap[billNoOrigin+"["+utils.ValueToString(v[6], "")+"]"+"["+utils.ValueToString(v[0], "")+"]"] = changeMap
billMap[billNoOrigin+"["+utils.ValueToString(v[7], "")+"]"+"["+utils.ValueToString(v[0], "")+"]"] = changeMap
}
type Bill struct {
@ -547,20 +546,20 @@ func GetOrderQty(PlantNr int, UserId string, allData *[]model.Article) (err erro
// }
//}
for _, info := range dataList{
for _, info := range dataList {
ArtId := info[0].(string)
Qty := info[1].(float64)
billNoOrigin := info[3].(string)
rowId := info[7].(string)
_, isIn2 := finalBillQtyMap[billNoOrigin+"["+utils.ValueToString(info[6], "")+"]"+"["+utils.ValueToString(info[0], "")+"]"]
_, isIn2 := finalBillQtyMap[billNoOrigin+"["+utils.ValueToString(info[7], "")+"]"+"["+utils.ValueToString(info[0], "")+"]"]
if isIn2 {
Qty = finalBillQtyMap[billNoOrigin+"["+utils.ValueToString(info[6], "")+"]"+"["+utils.ValueToString(info[0], "")+"]"]
Qty = finalBillQtyMap[billNoOrigin+"["+utils.ValueToString(info[7], "")+"]"+"["+utils.ValueToString(info[0], "")+"]"]
}
OriginTime, _ := time.ParseInLocation("2006-01-02T15:04:05", utils.ValueToString(info[2], ""), utils.TimezoneLocation)
Time := utils.WeekDayMondayZeroTs(OriginTime)
OrderId := "DD"+"_"+billNoOrigin+"_"+rowId
OrderId := "DD" + "_" + billNoOrigin + "_" + rowId
//fmt.Println(OrderId)
Time = utils.WeekDayMondayZeroTs(Time)
SalesOrder := model.SalesOrder{
@ -570,9 +569,9 @@ func GetOrderQty(PlantNr int, UserId string, allData *[]model.Article) (err erro
//Descr: articleInfo.Descr1,
//FMaterialId: FMaterialId,
ExpectedDeliveryDate: grmi.Date(OriginTime),
RecieveTime: grmi.DateTime(Time),
PlanQty: Qty,
ProductType: "DD",
RecieveTime: grmi.DateTime(Time),
PlanQty: Qty,
ProductType: "DD",
}
dao_SalesOrder.InsertOne(&SalesOrder)
//if err != nil {
@ -650,7 +649,7 @@ func GetDuliQty(PlantNr int, UserId string, allData *[]model.Article) (err error
//dao_ArticleDemand := dal.NewArticleDemandDAO(session, PlantNr, UserId)
//dao_ArticleStock := dal_base.NewArticleStockDAO(session, PlantNr, UserId)
dao_SalesOrder := dal_base.NewSalesOrderDAO(session, PlantNr, UserId)
dao_SalesOrder.DeleteWhere([]grmi.Predicate{meta.SalesOrder_ProductType.NewPredicate(grmi.Equal,"DL")})
dao_SalesOrder.DeleteWhere([]grmi.Predicate{meta.SalesOrder_ProductType.NewPredicate(grmi.Equal, "DL")})
//articleDemandList, err := dao_ArticleDemand.Select([]grmi.Predicate{}, nil)
//if err != nil {
@ -682,7 +681,7 @@ func GetDuliQty(PlantNr int, UserId string, allData *[]model.Article) (err error
//}
//fmt.Println("独立")
for _, info := range dataList{
for _, info := range dataList {
ArtId := info[0].(string)
Qty := info[1].(float64)
OriginTime, _ := time.ParseInLocation("2006-01-02T15:04:05", utils.ValueToString(info[2], ""), utils.TimezoneLocation)
@ -690,7 +689,7 @@ func GetDuliQty(PlantNr int, UserId string, allData *[]model.Article) (err error
billNoOrigin := info[3].(string)
rowId := info[4].(string)
OrderId := "DL"+"_"+billNoOrigin+"_"+rowId
OrderId := "DL" + "_" + billNoOrigin + "_" + rowId
//fmt.Println(OrderId)
//Time = utils.WeekDayMondayZeroTs(Time)
SalesOrder := model.SalesOrder{
@ -700,9 +699,9 @@ func GetDuliQty(PlantNr int, UserId string, allData *[]model.Article) (err error
//Descr: articleInfo.Descr1,
//FMaterialId: FMaterialId,
ExpectedDeliveryDate: grmi.Date(OriginTime),
RecieveTime: grmi.DateTime(Time),
PlanQty: Qty,
ProductType: "DL",
RecieveTime: grmi.DateTime(Time),
PlanQty: Qty,
ProductType: "DL",
}
dao_SalesOrder.InsertOne(&SalesOrder)
//if err != nil {
@ -730,7 +729,7 @@ func GetZhaizhiWeekQty(PlantNr int, UserId string, allData *[]model.Article) (er
}
dao_SalesOrder := dal_base.NewSalesOrderDAO(session, PlantNr, UserId)
dao_SalesOrder.DeleteWhere([]grmi.Predicate{meta.SalesOrder_ProductType.NewPredicate(grmi.Equal,"ZZ")})
dao_SalesOrder.DeleteWhere([]grmi.Predicate{meta.SalesOrder_ProductType.NewPredicate(grmi.Equal, "ZZ")})
//dao_ArticleStock := dal_base.NewArticleStockDAO(session, PlantNr, UserId)
//dao_ArticleDemand := dal.NewArticleDemandDAO(session, PlantNr, UserId)
@ -763,7 +762,7 @@ func GetZhaizhiWeekQty(PlantNr int, UserId string, allData *[]model.Article) (er
// }
//}
//fmt.Println("在制")
for _, info := range dataList{
for _, info := range dataList {
//fmt.Println(info)
ArtId := info[0].(string)
Qty := info[1].(float64)
@ -771,7 +770,7 @@ func GetZhaizhiWeekQty(PlantNr int, UserId string, allData *[]model.Article) (er
billNoOrigin := info[3].(string)
rowId := info[4].(string)
OrderId := "ZZ"+"_"+billNoOrigin+"_"+rowId
OrderId := "ZZ" + "_" + billNoOrigin + "_" + rowId
//fmt.Println(OrderId)
Time := utils.WeekDayMondayZeroTs(OriginTime)
SalesOrder := model.SalesOrder{
@ -781,9 +780,9 @@ func GetZhaizhiWeekQty(PlantNr int, UserId string, allData *[]model.Article) (er
//Descr: articleInfo.Descr1,
//FMaterialId: FMaterialId,
ExpectedDeliveryDate: grmi.Date(OriginTime),
RecieveTime: grmi.DateTime(Time),
PlanQty: Qty,
ProductType: "ZZ",
RecieveTime: grmi.DateTime(Time),
PlanQty: Qty,
ProductType: "ZZ",
}
err := dao_SalesOrder.InsertOne(&SalesOrder)
if err != nil {


Write Preview
Loading…
Cancel
Save