update

boxcost/api/plan-cost-excel.go

@@ -216,29 +216,51 @@ 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 = "未生成订单"
-						}
-						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] == "created" {
+								stageStatus = "进行中"
+								// 审核状态
+								if splan.Reviewed[stage.BillId] == 1 {
+									stageStatus = "已审核"
+									if splan.IsAck[stage.BillId] {
+										stageStatus = "已接单"
+									} else {
+										stageStatus = "未接单"
+									}
+								} else {
+									stageStatus = "未审核"
+								}
 
-						// 完成状态
-						if splan.State[stage.BillId] == "complete" {
-							stageStatus = "已完成"
+							} else {
+								stageStatus = "已完成"
+							}
 						}
 
 						b.drawRow(b.Row, "", stageType, stage.Name, orderCount, realCount, stageStatus, supplierName, fmt.Sprintf("%.3f元/%s", stage.Price, stage.Unit), stage.Norm, matHeigth, matWidth, unit, price, budgetPrice, realPrice)
@@ -384,29 +406,51 @@ 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 = "未生成订单"
-								}
-								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 splan.State[stage.BillId] == "created" {
+										stageStatus = "进行中"
+										// 审核状态
+										if splan.Reviewed[stage.BillId] == 1 {
+											stageStatus = "已审核"
+											if splan.IsAck[stage.BillId] {
+												stageStatus = "已接单"
+											} else {
+												stageStatus = "未接单"
+											}
+										} else {
+											stageStatus = "未审核"
+										}
+
+									} else {
+										stageStatus = "已完成"
+									}
 								}
 
 								b.drawRow(b.Row, "", stageType, stage.Name, orderCount, realCount, stageStatus, supplierName, fmt.Sprintf("%.3f元/%s", stage.Price, stage.Unit), stage.Norm, matHeigth, matWidth, unit, price, budgetPrice, realPrice)

boxcost/api/plan-summary-excel.go

@@ -214,32 +214,55 @@ 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 = "未生成订单"
-						}
-						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] == "created" {
+								stageStatus = "进行中"
+								// 审核状态
+								if splan.Reviewed[stage.BillId] == 1 {
+									stageStatus = "已审核"
+									if splan.IsAck[stage.BillId] {
+										stageStatus = "已接单"
+									} else {
+										stageStatus = "未接单"
+									}
+								} else {
+									stageStatus = "未审核"
+								}
 
-						// 完成状态
-						if splan.State[stage.BillId] == "complete" {
-							stageStatus = "已完成"
+							} else {
+								stageStatus = "已完成"
+							}
 						}
 
 						b.drawRow(b.Row, "", "", stageType, stage.Name, orderCount, realCount, stageStatus, supplierName, fmt.Sprintf("%.3f元/%s", stage.Price, stage.Unit), stage.Norm, matHeigth, matWidth, unit, price, budgetPrice, realPrice)
@@ -397,29 +420,51 @@ 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 = "未生成订单"
-								}
-								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 splan.State[stage.BillId] == "created" {
+										stageStatus = "进行中"
+										// 审核状态
+										if splan.Reviewed[stage.BillId] == 1 {
+											stageStatus = "已审核"
+											if splan.IsAck[stage.BillId] {
+												stageStatus = "已接单"
+											} else {
+												stageStatus = "未接单"
+											}
+										} else {
+											stageStatus = "未审核"
+										}
+
+									} else {
+										stageStatus = "已完成"
+									}
 								}
 
 								b.drawRow(b.Row, "", "", stageType, stage.Name, orderCount, realCount, stageStatus, supplierName, fmt.Sprintf("%.3f元/%s", stage.Price, stage.Unit), stage.Norm, matHeigth, matWidth, unit, price, budgetPrice, realPrice)

boxcost/api/summary-sample-excel.go

@@ -117,30 +117,53 @@ 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 = "未生成订单"
-						}
-						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] == "created" {
+								stageStatus = "进行中"
+								// 审核状态
+								if splan.Reviewed[stage.BillId] == 1 {
+									stageStatus = "已审核"
+									if splan.IsAck[stage.BillId] {
+										stageStatus = "已接单"
+									} else {
+										stageStatus = "未接单"
+									}
+								} else {
+									stageStatus = "未审核"
+								}
 
-						// 完成状态
-						if splan.State[stage.BillId] == "complete" {
-							stageStatus = "已完成"
-							statusMark = "【v】"
+							} else {
+								stageStatus = "已完成"
+								statusMark = "【v】"
+							}
 						}
 
 						fmt.Println(stageStatus)
@@ -248,30 +271,53 @@ func (b *SummarySampleExcel) drawSupplierContent() 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 = "未生成订单"
-								}
-								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 splan.State[stage.BillId] == "created" {
+										stageStatus = "进行中"
+										// 审核状态
+										if splan.Reviewed[stage.BillId] == 1 {
+											stageStatus = "已审核"
+											if splan.IsAck[stage.BillId] {
+												stageStatus = "已接单"
+											} else {
+												stageStatus = "未接单"
+											}
+										} else {
+											stageStatus = "未审核"
+										}
+
+									} else {
+										stageStatus = "已完成"
+										statusMark = "【v】"
+									}
 								}
 								fmt.Println(stageStatus)
 								createTime := splan.CreateTimes[stage.BillId].Local().Format("2006-01-02")