修改单据下载update

boxcost/api/aadiffupdatetest.http

@@ -30,7 +30,7 @@ Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3MjI4MjU4O
 # 
 POST http://{{host}}/boxcost/report/bills/download HTTP/1.1
 Content-Type: application/json
-Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3MjI4MjU4OTIsImlkIjoiNjQyYTUyNGY1ZjUwYmM5MDNmOTg2Mzk0Iiwia2V5IjoiYm94Y29zdCIsIm5hbWUiOiLlrZnog5wiLCJvcmlnX2lhdCI6MTcyMjIyMTA5MiwicGFyZW50IjoiNjQyYTUyNGY1ZjUwYmM5MDNmOTg2Mzk0IiwicGhvbmUiOiIxMzQwODU0NzgyMyIsInJvbGUiOiIiLCJzdGF0ZSI6MSwidXNlclR5cGUiOjJ9.Cz7qI3-Vah0io5ZLIFDyVOf8qsqdmbT8WHdprrjbdXw
+Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3MjQ4MzcxOTksImlkIjoiNjQyYTUyNGY1ZjUwYmM5MDNmOTg2Mzk0Iiwia2V5IjoiYm94Y29zdCIsIm5hbWUiOiLlrZnog5wiLCJvcmlnX2lhdCI6MTcyNDIzMjM5OSwicGFyZW50IjoiNjQyYTUyNGY1ZjUwYmM5MDNmOTg2Mzk0IiwicGhvbmUiOiIxMzQwODU0NzgyMyIsInJvbGUiOiIiLCJzdGF0ZSI6MSwidXNlclR5cGUiOjJ9.OazxgziCO8I1GlQ5EyvK6-IfyR9pEJkWAY1gocRhXlY
 
 {
  

boxcost/api/report.go

@@ -62,10 +62,12 @@ func ReportBillsDownload1(c *gin.Context, apictx *ApiSession) (interface{}, erro
 	redisCli := apictx.Svc.Redis
 	reportBillKey := "report-bill-list:" + apictx.User.Parent
 	isExist := redisCli.Exists(apictx.CreateRepoCtx().Ctx, reportBillKey).Val()
+	fmt.Println("是否存在:", isExist)
 	// 不存在这个key时
 	if isExist < 1 {
 		if len(purchases) > 0 {
 			for _, purchase := range purchases {
+
 				member := "purchase_" + purchase.Id.Hex()
 				score := purchase.CompleteTime.Unix()
 				redisCli.ZAdd(apictx.CreateRepoCtx().Ctx, reportBillKey, &redis.Z{Score: float64(score), Member: member})
@@ -128,12 +130,10 @@ func ReportBillsDownload1(c *gin.Context, apictx *ApiSession) (interface{}, erro
 	// 采购 加工 加工-印刷 加工-覆膜 成品采购
 	typeRows := []int{0, 0, 0, 0, 0}
 	for _, tId := range reports {
-		tidArr := strings.Split(tId, "_")
 		var billExcel IExcel
 		// 采购
-		if tidArr[0] == "purchase" {
-			purchase := typeBills[tidArr[1]].(*model.PurchaseBill)
-
+		if strings.Contains(tId, "purchase") {
+			purchase := typeBills[tId].(*model.PurchaseBill)
 			sheetName := "采购单"
 			index := f.NewSheet(sheetName)
 			if flagIndex < 0 {
@@ -175,9 +175,8 @@ func ReportBillsDownload1(c *gin.Context, apictx *ApiSession) (interface{}, erro
 		}
 
 		// 加工单
-		if tidArr[0] == "produce" {
-			produce := typeBills[tidArr[1]].(*model.ProduceBill)
-
+		if strings.Contains(tId, "produce") {
+			produce := typeBills[tId].(*model.ProduceBill)
 			sheetName := "加工单"
 			if produce.IsPrint {
 				sheetName = "加工单-印刷"
@@ -189,7 +188,7 @@ func ReportBillsDownload1(c *gin.Context, apictx *ApiSession) (interface{}, erro
 				flagIndex = index
 			}
 
-			billExcel = NewPurchaseBill(f)
+			billExcel = NewProduceBill(f)
 			billExcel.SetSheetName(sheetName)
 
 			// 获取签名信息
@@ -232,15 +231,15 @@ func ReportBillsDownload1(c *gin.Context, apictx *ApiSession) (interface{}, erro
 		}
 
 		// 成品
-		if tidArr[0] == "product" {
-			product := typeBills[tidArr[1]].(*model.ProductBill)
+		if strings.Contains(tId, "product") {
+			product := typeBills[tId].(*model.ProductBill)
 			sheetName := "成品采购单"
 			index := f.NewSheet(sheetName)
 			if flagIndex < 0 {
 				flagIndex = index
 			}
 
-			billExcel = NewPurchaseBill(f)
+			billExcel = NewProductBill(f)
 			billExcel.SetSheetName(sheetName)
 
 			// 获取签名信息

boxcost/app.yaml

@@ -2,7 +2,7 @@ port: 8888
 name: boxcost
 version: 1.0.0
 saveType: obs
-pdfApiAddr: "http://localhost:3001"
+pdfApiAddr: "http://localhost:3000"
 
 obs:
   bucket: sku3d-test