sun-pc-linux 7 mesiacov pred
rodič
commit
319cad33e2

+ 10 - 0
boxcost/api/aa.txe

@@ -0,0 +1,10 @@
+
+planId:ObjectID("66ab02b8404fc9b5a1a2b28f")
+stage:&model.ComponentStage{Id:"668d03c823830800fd775d08H9xzN1reOj60rCfxkeqlj",
+ TypeId:primitive.ObjectID{0x66, 0x8d, 0x3, 0xc8, 0x23, 0x83, 0x8, 0x0, 0xfd, 0x77, 0x5d, 0x8}, 
+ OrderPrice:0.2, OrderCount:5000, 
+ IsFix:(*bool)(0xc00031be55), ConfirmCount:0, DeliveryTime:time.Date(2024, time.August, 2, 0, 0, 0, 0, time.UTC), 
+ SupplierInfo:(*model.Supplier)(0xc000323a40), 
+ BatchCount:(*float64)(0xc00031bf30), BatchSizeWidth:20,
+  BatchSizeHeight:10, Remark:"2.0双灰", Size:"", Name:"工业纸板", Category:"成品采购", Price:0,
+  Unit:"吨", Norm:"1180g", CreateTime:time.Date(1, time.January, 1, 0, 0, 0, 0, time.UTC), UpdateTime:time.Date(1, time.January, 1, 0, 0, 0, 0, time.UTC), Type:1, Group:"", BillId:"66acb50b99f1d056d5e2519d", BillType:1}

+ 1 - 0
boxcost/api/bill-produce.go

@@ -246,6 +246,7 @@ func UpdateProduceBill(c *gin.Context, apictx *ApiSession) (interface{}, error)
 			supplierInfo = &model.Supplier{}
 			repo.RepoSeachDoc(apictx.CreateRepoCtx(), &repo.DocSearchOptions{
 				CollectName: repo.CollectionSupplier,
+				Query:       repo.Map{"_id": bill.SupplierId},
 			}, supplierInfo)
 		}
 		idStatges := make(map[string]*UpdateBilltoStageReq)

+ 1 - 0
boxcost/api/bill-product.go

@@ -246,6 +246,7 @@ func UpdateProductBill(c *gin.Context, apictx *ApiSession) (interface{}, error)
 			supplierInfo = &model.Supplier{}
 			repo.RepoSeachDoc(apictx.CreateRepoCtx(), &repo.DocSearchOptions{
 				CollectName: repo.CollectionSupplier,
+				Query:       repo.Map{"_id": bill.SupplierId},
 			}, supplierInfo)
 		}
 		idStatges := make(map[string]*UpdateBilltoStageReq)

+ 1 - 0
boxcost/api/bill.go

@@ -382,6 +382,7 @@ func UpdateBill(c *gin.Context, apictx *ApiSession) (interface{}, error) {
 			supplierInfo = &model.Supplier{}
 			repo.RepoSeachDoc(apictx.CreateRepoCtx(), &repo.DocSearchOptions{
 				CollectName: repo.CollectionSupplier,
+				Query:       repo.Map{"_id": bill.SupplierId},
 			}, supplierInfo)
 		}
 		idStatges := make(map[string]*UpdateBilltoStageReq)

+ 5 - 2
boxcost/api/plan.go

@@ -201,7 +201,9 @@ func updateBilltoStage(c *gin.Context, planId primitive.ObjectID, idStatges map[
 		for _, stage := range comp.Stages {
 
 			if idStatge, ok := idStatges[stage.Id]; ok {
-				stage.SupplierInfo = idStatge.SupplierInfo
+				if idStatge.SupplierInfo != nil {
+					stage.SupplierInfo = idStatge.SupplierInfo
+				}
 				stage.Norm = idStatge.Norm
 				stage.BatchSizeWidth = idStatge.Width
 				stage.BatchSizeHeight = idStatge.Height
@@ -212,7 +214,8 @@ func updateBilltoStage(c *gin.Context, planId primitive.ObjectID, idStatges map[
 				stage.ConfirmCount = idStatge.ConfirmCount
 				stage.DeliveryTime = idStatge.DeliveryTime
 				stage.Size = idStatge.Size
-				fmt.Printf("stage更新信息:\nplanId:%s\nstage:%v\n", planId, stage)
+				stage.UpdateTime = time.Now()
+				fmt.Printf("stage信息:%#v\n", stage)
 			}
 		}
 	}