fix：修复库存统计导出明细

controllers/Contract.go

@@ -741,6 +741,7 @@ func (c *ContractController) VerifyContract_Add() {
 func (c *ContractController) VerifyContract_Edit() {
 	T_number := c.GetString("T_number")
 	T_money, _ := c.GetFloat("T_money")
+	T_discount, _ := c.GetFloat("T_discount")
 	T_date := c.GetString("T_date")
 	T_product := c.GetString("T_product")
 	T_remark := c.GetString("T_remark")
@@ -768,6 +769,9 @@ func (c *ContractController) VerifyContract_Edit() {
 	if T_money > 0 {
 		contract.T_money = float32(T_money)
 	}
+	if T_discount > 0 {
+		contract.T_discount = float32(T_discount)
+	}
 	if len(T_date) > 0 {
 		contract.T_date = T_date
 	}
@@ -798,7 +802,7 @@ func (c *ContractController) VerifyContract_Edit() {
 		contract.T_submit = T_submit
 	}
 
-	err = ContractDao.Update_Contract(contract, "T_money", "T_date", "T_remark", "T_pdf", "T_State", "T_project",
+	err = ContractDao.Update_Contract(contract, "T_money", "T_discount", "T_date", "T_remark", "T_pdf", "T_State", "T_project",
 		"T_recoveries", "T_recoveries_money", "T_invoice", "T_invoice_money", "T_start_date", "T_end_date", "T_submit")
 	if err != nil {
 		o.Rollback()

controllers/Stock.go

@@ -184,9 +184,15 @@ func (c *StockController) Stock_Detail_List() {
 	now := time.Now()
 	if len(T_start_date) == 0 {
 		T_start_date = time.Date(now.Year(), 1, 1, 0, 0, 0, 0, time.Local).Format("2006-01")
+	} else {
+		T_start_date_t, _ := lib.DateStrToTime(T_start_date)
+		T_start_date = T_start_date_t.Format("2006-01")
 	}
 	if len(T_end_date) == 0 {
-		T_start_date = now.Format("2006-01")
+		T_end_date = now.Format("2006-01")
+	} else {
+		T_end_date_t, _ := lib.DateStrToTime(T_end_date)
+		T_end_date = T_end_date_t.Format("2006-01")
 	}
 	StockOutDao := Stock.NewStockOut(orm.NewOrm())
 	StockMonthDao := Stock.NewStockMonth(orm.NewOrm())
@@ -211,9 +217,15 @@ func (c *StockController) Stock_Detail_Excel() {
 	now := time.Now()
 	if len(T_start_date) == 0 {
 		T_start_date = time.Date(now.Year(), 1, 1, 0, 0, 0, 0, time.Local).Format("2006-01")
+	} else {
+		T_start_date_t, _ := lib.DateStrToTime(T_start_date)
+		T_start_date = T_start_date_t.Format("2006-01")
 	}
 	if len(T_end_date) == 0 {
-		T_start_date = now.Format("2006-01")
+		T_end_date = now.Format("2006-01")
+	} else {
+		T_end_date_t, _ := lib.DateStrToTime(T_end_date)
+		T_end_date = T_end_date_t.Format("2006-01")
 	}
 	var class_List []Basic.ProductClass_R
 
@@ -1259,8 +1271,8 @@ func (c *StockController) StockIn_Excel() {
 			f.SetCellValue("Sheet1", fmt.Sprintf("D%d", row), product.T_spec)
 			if v.T_num > 0 {
 				f.SetCellValue("Sheet1", fmt.Sprintf("E%d", row), v.T_num)
+				f.SetCellValue("Sheet1", fmt.Sprintf("F%d", row), stockIn.T_remark)
 			}
-			f.SetCellValue("Sheet1", fmt.Sprintf("F%d", row), stockIn.T_remark)
 		}
 
 		f.SetCellStyle("Sheet1", fmt.Sprintf("A%d", sRow), fmt.Sprintf("F%d", row), Style4)
@@ -2271,8 +2283,8 @@ func (c *StockController) StockOut_Excel() {
 			f.SetCellValue("Sheet1", fmt.Sprintf("D%d", row), product.T_spec)
 			if v.T_num > 0 {
 				f.SetCellValue("Sheet1", fmt.Sprintf("E%d", row), v.T_num)
+				f.SetCellValue("Sheet1", fmt.Sprintf("F%d", row), stockOut.T_remark)
 			}
-			f.SetCellValue("Sheet1", fmt.Sprintf("F%d", row), stockOut.T_remark)
 		}
 
 		f.SetCellStyle("Sheet1", fmt.Sprintf("A%d", sRow), fmt.Sprintf("F%d", row), Style4)