update

boxcost/api/plan-cost-excel.go

@@ -216,31 +216,6 @@ func (b *PlanCostExcel) drawAllContent() error {
 						// 状态
 						stageStatus := ""
 
-						// if len(stage.BillId) < 1 {
-						// 	stageStatus = "未生成订单"
-						// }
-						// if splan.State[stage.BillId] == "created" {
-						// 	stageStatus = "进行中"
-						// }
-						// // 审核状态
-						// if splan.Reviewed[stage.BillId] == 1 {
-						// 	stageStatus = "已审核"
-						// } else {
-						// 	stageStatus = "未审核"
-						// }
-
-						// // 接单状态
-						// if splan.IsAck[stage.BillId] {
-						// 	stageStatus = "已接单"
-						// } else {
-						// 	stageStatus = "未接单"
-						// }
-
-						// // 完成状态
-						// if splan.State[stage.BillId] == "complete" {
-						// 	stageStatus = "已完成"
-						// }
-
 						if len(stage.BillId) < 1 {
 							stageStatus = "未生成订单"
 						} else {
@@ -249,11 +224,18 @@ func (b *PlanCostExcel) drawAllContent() error {
 								// 审核状态
 								if splan.Reviewed[stage.BillId] == 1 {
 									stageStatus = "已审核"
-									if splan.IsAck[stage.BillId] {
-										stageStatus = "已接单"
+									if splan.IsSend[stage.BillId] {
+										stageStatus = "已发送"
+										if splan.IsAck[stage.BillId] {
+											stageStatus = "已接单"
+										} else {
+											stageStatus = "未接单"
+										}
+
 									} else {
-										stageStatus = "未接单"
+										stageStatus = "未发送"
 									}
+
 								} else {
 									stageStatus = "未审核"
 								}
@@ -261,7 +243,7 @@ func (b *PlanCostExcel) drawAllContent() error {
 							} else if splan.State[stage.BillId] == "complete" {
 								stageStatus = "已完成"
 							} else {
-								stageStatus = "订单已销毁"
+								stageStatus = "未生成订单"
 							}
 						}
 
@@ -408,31 +390,6 @@ func (b *PlanCostExcel) drawSupplierContent() error {
 								// 状态
 								stageStatus := ""
 
-								// if len(stage.BillId) < 1 {
-								// 	stageStatus = "未生成订单"
-								// }
-								// if splan.State[stage.BillId] == "created" {
-								// 	stageStatus = "进行中"
-								// }
-								// // 审核状态
-								// if splan.Reviewed[stage.BillId] == 1 {
-								// 	stageStatus = "已审核"
-								// } else {
-								// 	stageStatus = "未审核"
-								// }
-
-								// // 接单状态
-								// if splan.IsAck[stage.BillId] {
-								// 	stageStatus = "已接单"
-								// } else {
-								// 	stageStatus = "未接单"
-								// }
-
-								// // 完成状态
-								// if splan.State[stage.BillId] == "complete" {
-								// 	stageStatus = "已完成"
-								// }
-
 								if len(stage.BillId) < 1 {
 									stageStatus = "未生成订单"
 								} else {
@@ -441,11 +398,18 @@ func (b *PlanCostExcel) drawSupplierContent() error {
 										// 审核状态
 										if splan.Reviewed[stage.BillId] == 1 {
 											stageStatus = "已审核"
-											if splan.IsAck[stage.BillId] {
-												stageStatus = "已接单"
+											if splan.IsSend[stage.BillId] {
+												stageStatus = "已发送"
+												if splan.IsAck[stage.BillId] {
+													stageStatus = "已接单"
+												} else {
+													stageStatus = "未接单"
+												}
+
 											} else {
-												stageStatus = "未接单"
+												stageStatus = "未发送"
 											}
+
 										} else {
 											stageStatus = "未审核"
 										}
@@ -453,7 +417,7 @@ func (b *PlanCostExcel) drawSupplierContent() error {
 									} else if splan.State[stage.BillId] == "complete" {
 										stageStatus = "已完成"
 									} else {
-										stageStatus = "订单已销毁"
+										stageStatus = "未生成订单"
 									}
 								}
 

boxcost/api/plan-summary-excel.go

@@ -214,35 +214,9 @@ func (b *PlanSummaryExcel) drawAllContent() error {
 							stageType = "成品采购"
 						}
 
-						// !状态正确需要，按流程处理订单，未正确处理时不能进行下面的流程
 						// 状态
 						stageStatus := ""
 
-						// if len(stage.BillId) < 1 {
-						// 	stageStatus = "未生成订单"
-						// }
-						// if splan.State[stage.BillId] == "created" {
-						// 	stageStatus = "进行中"
-						// }
-						// // 审核状态
-						// if splan.Reviewed[stage.BillId] == 1 {
-						// 	stageStatus = "已审核"
-						// } else {
-						// 	stageStatus = "未审核"
-						// }
-
-						// // 接单状态
-						// if splan.IsAck[stage.BillId] {
-						// 	stageStatus = "已接单"
-						// } else {
-						// 	stageStatus = "未接单"
-						// }
-
-						// // 完成状态
-						// if splan.State[stage.BillId] == "complete" {
-						// 	stageStatus = "已完成"
-						// }
-
 						if len(stage.BillId) < 1 {
 							stageStatus = "未生成订单"
 						} else {
@@ -251,11 +225,18 @@ func (b *PlanSummaryExcel) drawAllContent() error {
 								// 审核状态
 								if splan.Reviewed[stage.BillId] == 1 {
 									stageStatus = "已审核"
-									if splan.IsAck[stage.BillId] {
-										stageStatus = "已接单"
+									if splan.IsSend[stage.BillId] {
+										stageStatus = "已发送"
+										if splan.IsAck[stage.BillId] {
+											stageStatus = "已接单"
+										} else {
+											stageStatus = "未接单"
+										}
+
 									} else {
-										stageStatus = "未接单"
+										stageStatus = "未发送"
 									}
+
 								} else {
 									stageStatus = "未审核"
 								}
@@ -263,7 +244,7 @@ func (b *PlanSummaryExcel) drawAllContent() error {
 							} else if splan.State[stage.BillId] == "complete" {
 								stageStatus = "已完成"
 							} else {
-								stageStatus = "订单已销毁"
+								stageStatus = "未生成订单"
 							}
 						}
 
@@ -422,31 +403,6 @@ func (b *PlanSummaryExcel) drawSupplierContent() error {
 								// 状态
 								stageStatus := ""
 
-								// if len(stage.BillId) < 1 {
-								// 	stageStatus = "未生成订单"
-								// }
-								// if splan.State[stage.BillId] == "created" {
-								// 	stageStatus = "进行中"
-								// }
-								// // 审核状态
-								// if splan.Reviewed[stage.BillId] == 1 {
-								// 	stageStatus = "已审核"
-								// } else {
-								// 	stageStatus = "未审核"
-								// }
-
-								// // 接单状态
-								// if splan.IsAck[stage.BillId] {
-								// 	stageStatus = "已接单"
-								// } else {
-								// 	stageStatus = "未接单"
-								// }
-
-								// // 完成状态
-								// if splan.State[stage.BillId] == "complete" {
-								// 	stageStatus = "已完成"
-								// }
-
 								if len(stage.BillId) < 1 {
 									stageStatus = "未生成订单"
 								} else {
@@ -455,11 +411,18 @@ func (b *PlanSummaryExcel) drawSupplierContent() error {
 										// 审核状态
 										if splan.Reviewed[stage.BillId] == 1 {
 											stageStatus = "已审核"
-											if splan.IsAck[stage.BillId] {
-												stageStatus = "已接单"
+											if splan.IsSend[stage.BillId] {
+												stageStatus = "已发送"
+												if splan.IsAck[stage.BillId] {
+													stageStatus = "已接单"
+												} else {
+													stageStatus = "未接单"
+												}
+
 											} else {
-												stageStatus = "未接单"
+												stageStatus = "未发送"
 											}
+
 										} else {
 											stageStatus = "未审核"
 										}
@@ -467,7 +430,7 @@ func (b *PlanSummaryExcel) drawSupplierContent() error {
 									} else if splan.State[stage.BillId] == "complete" {
 										stageStatus = "已完成"
 									} else {
-										stageStatus = "订单已销毁"
+										stageStatus = "未生成订单"
 									}
 								}
 

boxcost/api/sms.go

@@ -2,6 +2,7 @@ package api
 
 import (
 	"encoding/json"
+	"errors"
 	"fmt"
 
 	openapi "github.com/alibabacloud-go/darabonba-openapi/client"
@@ -30,6 +31,7 @@ type SupplierSmsReq struct {
 func SendSmsNotify(phone string, info *SupplierSmsReq) error {
 	// TODO dev
 	phone = "13408547823"
+	return errors.New("待配置短信模板")
 	client, _err := createSmsClient()
 	if _err != nil {
 		return _err

boxcost/api/summary-sample-excel.go

@@ -117,32 +117,6 @@ func (b *SummarySampleExcel) drawAllContent() error {
 						stageStatus := ""
 						statusMark := "【x】"
 
-						// if len(stage.BillId) < 1 {
-						// 	stageStatus = "未生成订单"
-						// }
-						// if splan.State[stage.BillId] == "created" {
-						// 	stageStatus = "进行中"
-						// }
-						// // 审核状态
-						// if splan.Reviewed[stage.BillId] == 1 {
-						// 	stageStatus = "已审核"
-						// } else {
-						// 	stageStatus = "未审核"
-						// }
-
-						// // 接单状态
-						// if splan.IsAck[stage.BillId] {
-						// 	stageStatus = "已接单"
-						// } else {
-						// 	stageStatus = "未接单"
-						// }
-
-						// // 完成状态
-						// if splan.State[stage.BillId] == "complete" {
-						// 	stageStatus = "已完成"
-						// 	statusMark = "【v】"
-						// }
-
 						if len(stage.BillId) < 1 {
 							stageStatus = "未生成订单"
 						} else {
@@ -151,15 +125,20 @@ func (b *SummarySampleExcel) drawAllContent() error {
 								// 审核状态
 								if splan.Reviewed[stage.BillId] == 1 {
 									stageStatus = "已审核"
-									if splan.IsAck[stage.BillId] {
-										stageStatus = "已接单"
+									if splan.IsSend[stage.BillId] {
+										stageStatus = "已发送"
+										if splan.IsAck[stage.BillId] {
+											stageStatus = "已接单"
+										} else {
+											stageStatus = "未接单"
+										}
+
 									} else {
-										stageStatus = "未接单"
+										stageStatus = "未发送"
 									}
 								} else {
 									stageStatus = "未审核"
 								}
-
 							} else if splan.State[stage.BillId] == "complete" {
 								stageStatus = "已完成"
 								statusMark = "【v】"
@@ -307,10 +286,16 @@ func (b *SummarySampleExcel) drawSupplierContent() error {
 										// 审核状态
 										if splan.Reviewed[stage.BillId] == 1 {
 											stageStatus = "已审核"
-											if splan.IsAck[stage.BillId] {
-												stageStatus = "已接单"
+											if splan.IsSend[stage.BillId] {
+												stageStatus = "已发送"
+												if splan.IsAck[stage.BillId] {
+													stageStatus = "已接单"
+												} else {
+													stageStatus = "未接单"
+												}
+
 											} else {
-												stageStatus = "未接单"
+												stageStatus = "未发送"
 											}
 										} else {
 											stageStatus = "未审核"