修改bug

services/erp/erp.go

@@ -143,8 +143,7 @@ func GetQiChuQty(PlantNr int, UserId string, alldata_Article *[]model.Article) {
 		err := dao_ArticleStock.InsertOne(&articleStockInfo)
 		if err != nil {
 			artInfo, err := dao_ArticleStock.SelectOne(articleInfo.ArtId)
-			if err != nil {
-				fmt.Println(err)
+			if err != nil || artInfo == nil {
 				continue
 			}
 			switch articleInfo.ArtTypeId {
@@ -210,8 +209,7 @@ func GetZhaizhiQty(PlantNr int, UserId string, alldata_Article *[]model.Article)
 		err := dao_ArticleStock.InsertOne(&articleStockInfo)
 		if err != nil {
 			artInfo, err := dao_ArticleStock.SelectOne(articleInfo.ArtId)
-			if err != nil {
-				fmt.Println(err)
+			if err != nil || artInfo == nil {
 				continue
 			}
 			artInfo.WIPQty += qty
@@ -271,8 +269,7 @@ func GetChaigouQty(PlantNr int, UserId string, alldata_Article *[]model.Article)
 		err := dao_ArticleStock.InsertOne(&articleStockInfo)
 		if err != nil {
 			artInfo, err := dao_ArticleStock.SelectOne(articleInfo.ArtId)
-			if err != nil {
-				fmt.Println(err)
+			if err != nil || artInfo == nil {
 				continue
 			}
 			artInfo.PUCQty += qty
@@ -328,8 +325,7 @@ func GetWeiWaiQty(PlantNr int, UserId string, alldata_Article *[]model.Article)
 		err := dao_ArticleStock.InsertOne(&articleStockInfo)
 		if err != nil {
 			artInfo, err := dao_ArticleStock.SelectOne(articleInfo.ArtId)
-			if err != nil {
-				fmt.Println(err)
+			if err != nil || artInfo == nil {
 				continue
 			}
 			artInfo.OSCQty = qty
@@ -424,7 +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_SalesOrderId.NewPredicate(grmi.Equal,"DD")})
+	dao_SalesOrder.DeleteWhere([]grmi.Predicate{meta.SalesOrder_ProductType.NewPredicate(grmi.Equal,"DD")})
 
 
 	//dao_ArticleDemand := dal.NewArticleDemandDAO(session, PlantNr, UserId)
@@ -563,7 +559,7 @@ func GetOrderQty(PlantNr int, UserId string, allData *[]model.Article) (err erro
 
 		Time = utils.WeekDayMondayZeroTs(Time)
 
-		OrderId := "DD"+"_"+ArtId+"_"+Time.String()
+		OrderId := "DD"+"_"+ArtId+"_"+Time.Format("2006-01-02")
 		Time = utils.WeekDayMondayZeroTs(Time)
 		SalesOrder := model.SalesOrder{
 			PlantNr: PlantNr,
@@ -578,8 +574,7 @@ func GetOrderQty(PlantNr int, UserId string, allData *[]model.Article) (err erro
 		err := dao_SalesOrder.InsertOne(&SalesOrder)
 		if err != nil {
 			artInfo, err := dao_SalesOrder.SelectOne(OrderId)
-			if err != nil {
-				fmt.Println(err)
+			if err != nil || artInfo == nil {
 				continue
 			}
 			artInfo.PlanQty = Qty
@@ -652,7 +647,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_SalesOrderId.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 {
@@ -689,7 +684,7 @@ func GetDuliQty(PlantNr int, UserId string, allData *[]model.Article) (err error
 		Time, _ := time.ParseInLocation("2006-01-02T15:04:05", utils.ValueToString(info[2], ""), utils.TimezoneLocation)
 		Time = utils.WeekDayMondayZeroTs(Time)
 
-		OrderId := "DL"+"_"+ArtId+"_"+Time.String()
+		OrderId := "DL"+"_"+ArtId+"_"+Time.Format("2006-01-02")
 		Time = utils.WeekDayMondayZeroTs(Time)
 		SalesOrder := model.SalesOrder{
 			PlantNr: PlantNr,
@@ -704,8 +699,7 @@ func GetDuliQty(PlantNr int, UserId string, allData *[]model.Article) (err error
 		err := dao_SalesOrder.InsertOne(&SalesOrder)
 		if err != nil {
 			artInfo, err := dao_SalesOrder.SelectOne(OrderId)
-			if err != nil {
-				fmt.Println(err)
+			if err != nil || artInfo == nil {
 				continue
 			}
 			artInfo.PlanQty = Qty
@@ -728,7 +722,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_SalesOrderId.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)
@@ -766,7 +760,7 @@ func GetZhaizhiWeekQty(PlantNr int, UserId string, allData *[]model.Article) (er
 		Qty := info[1].(float64)
 		Time, _ := time.ParseInLocation("2006-01-02T15:04:05", utils.ValueToString(info[2], ""), utils.TimezoneLocation)
 
-		OrderId := "ZZ"+"_"+ArtId+"_"+Time.String()
+		OrderId := "ZZ"+"_"+ArtId+"_"+Time.Format("2006-01-02")
 		Time = utils.WeekDayMondayZeroTs(Time)
 		SalesOrder := model.SalesOrder{
 			PlantNr: PlantNr,
@@ -781,8 +775,7 @@ func GetZhaizhiWeekQty(PlantNr int, UserId string, allData *[]model.Article) (er
 		err := dao_SalesOrder.InsertOne(&SalesOrder)
 		if err != nil {
 			artInfo, err := dao_SalesOrder.SelectOne(OrderId)
-			if err != nil {
-				fmt.Println(err)
+			if err != nil || artInfo == nil {
 				continue
 			}
 			artInfo.PlanQty = Qty