From e5df488268e29b272932e6cc1d2b1e7034590ba0 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 12 六月 2024 11:40:45 +0800
Subject: [PATCH] weedfs包放到项目里

---
 controllers/product_controller.go |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/controllers/product_controller.go b/controllers/product_controller.go
index a99ac83..606e381 100644
--- a/controllers/product_controller.go
+++ b/controllers/product_controller.go
@@ -480,6 +480,7 @@
 		OperationDate:     time.Now().Format("2006-01-02 15:04:05"),
 		Details:           []*models.OperationDetails{detail},
 		BaseOperationType: constvar.BaseOperationTypeDisuse,
+		OperationTypeName: "搴撳瓨鎶ュ簾",
 	}
 	if err := models.NewOperationSearch().Create(&operation); err != nil {
 		logx.Errorf("Operation create err: %v", err)
@@ -509,7 +510,10 @@
 
 	db := models.NewOperationSearch().Orm.
 		Table("wms_operation").
-		Select("wms_operation.id,wms_operation.number,wms_operation.source_number,wms_operation.status,wms_operation_details.from_location_id,wms_operation_details.to_location_id,wms_operation.operation_date,wms_operation.contacter_id,wms_operation.contacter_name,wms_operation.company_id,wms_operation.company_name,wms_operation.comment,wms_operation_details.product_id,material.name as product_name,material.unit,wms_operation_details.amount,wms_operation.base_operation_type").
+		Select("wms_operation.id,wms_operation.number,wms_operation.source_number,wms_operation.status,wms_operation_details.from_location_id,"+
+			"wms_operation_details.to_location_id,wms_operation.operation_date,wms_operation.contacter_id,wms_operation.contacter_name,"+
+			"wms_operation.company_id,wms_operation.company_name,wms_operation.comment,wms_operation_details.product_id,"+
+			"material.name as product_name,material.unit,wms_operation_details.amount,wms_operation.base_operation_type").
 		InnerJoins("inner join wms_operation_details on wms_operation_details.operation_id=wms_operation.id").
 		InnerJoins("inner join material on material.id=wms_operation_details.product_id").
 		Where("wms_operation.base_operation_type=?", constvar.BaseOperationTypeDisuse)

--
Gitblit v1.8.0