耗材参数

conf/app.conf

@@ -1,5 +1,5 @@
 appname = 血透
-httpport = 9531
+httpport = 9529
 runmode = dev
 
 #

controllers/base_api_controller.go

@@ -2,8 +2,6 @@ package controllers
 
 import (
 	"XT_New/enums"
-	"XT_New/models"
-
 	//"XT_New/models"
 
 	//"XT_New/models"
@@ -69,36 +67,36 @@ type BaseAuthAPIController struct {
 func (this *BaseAuthAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
-		var userAdmin models.AdminUser
-		userAdmin.Id = 1448
-		userAdmin.Mobile = "13318599895"
-
-		userAdmin.Id = 597
-		userAdmin.Mobile = "19874122664"
-		userAdmin.IsSuperAdmin = false
-		userAdmin.Status = 1
-		userAdmin.CreateTime = 1530786071
-		userAdmin.ModifyTime = 1530786071
-		var subscibe models.ServeSubscibe
-		subscibe.ID = 1
-		subscibe.OrgId = 3877
-		subscibe.PeriodStart = 1538035409
-		subscibe.PeriodEnd = 1569571409
-		subscibe.State = 1
-		subscibe.Status = 1
-		subscibe.CreatedTime = 1538035409
-		subscibe.UpdatedTime = 1538035409
-		subscibes := make(map[int64]*models.ServeSubscibe, 0)
-		subscibes[4] = &subscibe
-		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 3877
-		adminUserInfo.CurrentAppId = 4
-		adminUserInfo.AdminUser = &userAdmin
-		adminUserInfo.Subscibes = subscibes
-		this.SetSession("admin_user_info", &adminUserInfo)
-
-		//this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
-		//this.StopRun()ba
+		//var userAdmin models.AdminUser
+		//userAdmin.Id = 1448
+		//userAdmin.Mobile = "13318599895"
+		//
+		//userAdmin.Id = 597
+		//userAdmin.Mobile = "19874122664"
+		//userAdmin.IsSuperAdmin = false
+		//userAdmin.Status = 1
+		//userAdmin.CreateTime = 1530786071
+		//userAdmin.ModifyTime = 1530786071
+		//var subscibe models.ServeSubscibe
+		//subscibe.ID = 1
+		//subscibe.OrgId = 3877
+		//subscibe.PeriodStart = 1538035409
+		//subscibe.PeriodEnd = 1569571409
+		//subscibe.State = 1
+		//subscibe.Status = 1
+		//subscibe.CreatedTime = 1538035409
+		//subscibe.UpdatedTime = 1538035409
+		//subscibes := make(map[int64]*models.ServeSubscibe, 0)
+		//subscibes[4] = &subscibe
+		//var adminUserInfo service.AdminUserInfo
+		//adminUserInfo.CurrentOrgId = 3877
+		//adminUserInfo.CurrentAppId = 4
+		//adminUserInfo.AdminUser = &userAdmin
+		//adminUserInfo.Subscibes = subscibes
+		//this.SetSession("admin_user_info", &adminUserInfo)
+
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
+		this.StopRun()
 
 	}
 
@@ -315,35 +313,35 @@ type BaseServeAPIController struct {
 func (this *BaseServeAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
-		var userAdmin models.AdminUser
-		userAdmin.Id = 1448
-		userAdmin.Mobile = "13318599895"
-
-		userAdmin.Id = 597
-		userAdmin.Mobile = "19874122664"
-		userAdmin.IsSuperAdmin = false
-		userAdmin.Status = 1
-		userAdmin.CreateTime = 1530786071
-		userAdmin.ModifyTime = 1530786071
-		var subscibe models.ServeSubscibe
-		subscibe.ID = 1
-		subscibe.OrgId = 3877
-		subscibe.PeriodStart = 1538035409
-		subscibe.PeriodEnd = 1569571409
-		subscibe.State = 1
-		subscibe.Status = 1
-		subscibe.CreatedTime = 1538035409
-		subscibe.UpdatedTime = 1538035409
-		subscibes := make(map[int64]*models.ServeSubscibe, 0)
-		subscibes[4] = &subscibe
-		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 3877
-		adminUserInfo.CurrentAppId = 4
-		adminUserInfo.AdminUser = &userAdmin
-		adminUserInfo.Subscibes = subscibes
-		this.SetSession("admin_user_info", &adminUserInfo)
-		//this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
-		//this.StopRun()
+		//var userAdmin models.AdminUser
+		//userAdmin.Id = 1448
+		//userAdmin.Mobile = "13318599895"
+		//
+		//userAdmin.Id = 597
+		//userAdmin.Mobile = "19874122664"
+		//userAdmin.IsSuperAdmin = false
+		//userAdmin.Status = 1
+		//userAdmin.CreateTime = 1530786071
+		//userAdmin.ModifyTime = 1530786071
+		//var subscibe models.ServeSubscibe
+		//subscibe.ID = 1
+		//subscibe.OrgId = 3877
+		//subscibe.PeriodStart = 1538035409
+		//subscibe.PeriodEnd = 1569571409
+		//subscibe.State = 1
+		//subscibe.Status = 1
+		//subscibe.CreatedTime = 1538035409
+		//subscibe.UpdatedTime = 1538035409
+		//subscibes := make(map[int64]*models.ServeSubscibe, 0)
+		//subscibes[4] = &subscibe
+		//var adminUserInfo service.AdminUserInfo
+		//adminUserInfo.CurrentOrgId = 3877
+		//adminUserInfo.CurrentAppId = 4
+		//adminUserInfo.AdminUser = &userAdmin
+		//adminUserInfo.Subscibes = subscibes
+		//this.SetSession("admin_user_info", &adminUserInfo)
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
+		this.StopRun()
 	}
 
 	//if adminUserInfo.AppRole != nil {

controllers/new_mobile_api_controllers/staff_schedule_api_controller.go

@@ -63,6 +63,7 @@ func (this *StaffScheduleApiController) GetMobileNextWeekScheduleLIst() {
 	orgId := this.GetMobileAdminUserInfo().Org.Id
 	start_time, _ := this.GetInt64("start_time")
 	end_time, _ := this.GetInt64("end_time")
+
 	staffList, err := service.GetStaffScheduleList(orgId, start_time, end_time)
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")

controllers/self_drug_api_congtroller.go

@@ -4,10 +4,12 @@ import (
 	"XT_New/enums"
 	"XT_New/models"
 	"XT_New/service"
+	"XT_New/utils"
 	"encoding/json"
 	"fmt"
 	"github.com/astaxie/beego"
 	"github.com/jinzhu/gorm"
+	"reflect"
 	"strconv"
 	"strings"
 	"time"
@@ -52,6 +54,21 @@ func SelfDrugRouters() {
 	beego.Router("/api/drug/getpatientdetail", &SelfDrugApiController{}, "Get:GetPatientDetail")
 	//beego.Router("/api/drug/getpatientdetail",&SelfDrugApiController{},"Get:ToPatientDetail")
 	beego.Router("/api/drug/getselfstockquery", &SelfDrugApiController{}, "Get:GetSelfStockQuery")
+	beego.Router("/api/drug/postsearchdrugwarehouselist", &SelfDrugApiController{}, "Get:PostSearchDrugWarehouseList")
+	beego.Router("/api/drug/savedrugpriceone", &SelfDrugApiController{}, "Post:SaveDrugPrice")
+	beego.Router("/api/drug/drugpricelist", &SelfDrugApiController{}, "Get:GetDrugPriceList")
+	beego.Router("/api/drug/savecheckdrugprice", &SelfDrugApiController{}, "Get:SaveCheckDrugPrice")
+	beego.Router("/api/drug/savedrugdamageone", &SelfDrugApiController{}, "Post:SaveDrugDamage")
+	beego.Router("/api/drug/getdrugdamagelist", &SelfDrugApiController{}, "Get:GetDrugDamageList")
+	beego.Router("/api/drug/savedrugdamageprice", &SelfDrugApiController{}, "Get:SaveDrugDamagePrice")
+	beego.Router("/api/drug/getdrugmodifyprice", &SelfDrugApiController{}, "Get:GetDrugModifyPrice")
+	beego.Router("/api/drug/modifydrugprice", &SelfDrugApiController{}, "Get:ModifyDrugPrice")
+	beego.Router("/api/drug/getmodifypriceprint", &SelfDrugApiController{}, "Get:GetModifyPricePrint")
+	beego.Router("/api/drug/getdrugdamagedetail", &SelfDrugApiController{}, "Get:GetDrugDamageDetail")
+	beego.Router("/api/drug/modifydrugdamage", &SelfDrugApiController{}, "Get:ModifyDrugDamage")
+	beego.Router("/api/drug/deletedrugdamage", &SelfDrugApiController{}, "Get:DeleteDrugDamage")
+	beego.Router("/api/drug/getdrugdamageprint", &SelfDrugApiController{}, "Get:GetDrugDamagePrint")
+	beego.Router("/api/drug/warehouseinfobyid", &SelfDrugApiController{}, "Get:GetWarehoseInfoById")
 }
 
 func (this *SelfDrugApiController) GetCurrentPatient() {
@@ -913,3 +930,627 @@ func (this *SelfDrugApiController) GetSelfStockQuery() {
 		"stockOutQuery": stockOutQuery,
 	})
 }
+
+func (this *SelfDrugApiController) PostSearchDrugWarehouseList() {
+
+	keyword := this.GetString("keyword")
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	list, err := service.PostSearchDrugWarehouseList(keyword, orgId)
+	manufacturerList, err := service.GetAllManufacturerList(orgId)
+	dealerList, err := service.GetAllDealerList(orgId)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更新设备失败")
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list":             list,
+		"manufacturerList": manufacturerList,
+		"dealerList":       dealerList,
+	})
+}
+
+func (this *SelfDrugApiController) SaveDrugPrice() {
+	fmt.Println("999999999999999999999")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	fmt.Println(err)
+
+	tableData, _ := dataBody["tableData"].([]interface{})
+	fmt.Println("999939433443", tableData)
+	if len(tableData) > 0 {
+		for _, item := range tableData {
+			items := item.(map[string]interface{})
+
+			if items["drug_name"] == nil || reflect.TypeOf(items["drug_name"]).String() != "string" {
+				utils.ErrorLog("drug_name")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			drug_name := items["drug_name"].(string)
+			fmt.Println("drug_aname23232323232", drug_name)
+			if items["drug_name"] == nil || reflect.TypeOf(items["drug_name"]).String() != "string" {
+				utils.ErrorLog("drug_name")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+
+			if items["retail_price"] == nil || reflect.TypeOf(items["retail_price"]).String() != "string" {
+				utils.ErrorLog("retail_price")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			retail_price, _ := strconv.ParseFloat(items["retail_price"].(string), 64)
+
+			if items["warehousing_order"] == nil || reflect.TypeOf(items["warehousing_order"]).String() != "string" {
+				utils.ErrorLog("warehousing_order")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			warehousing_order := items["warehousing_order"].(string)
+
+			if items["number"] == nil || reflect.TypeOf(items["number"]).String() != "string" {
+				utils.ErrorLog("number")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			number := items["number"].(string)
+
+			if items["dealer"] == nil || reflect.TypeOf(items["dealer"]).String() != "string" {
+				utils.ErrorLog("dealer")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			dealer := items["dealer"].(string)
+
+			if items["manufacturer"] == nil || reflect.TypeOf(items["manufacturer"]).String() != "string" {
+				utils.ErrorLog("manufacturer")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			manufacturer := items["manufacturer"].(string)
+
+			//if items["specification_name"] == nil || reflect.TypeOf(items["specification_name"]).String() != "string" {
+			//  utils.ErrorLog("specification_name")
+			//  this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			//  return
+			//}
+			//specification_name := items["specification_name"].(string)
+
+			if items["remark"] == nil || reflect.TypeOf(items["remark"]).String() != "string" {
+				utils.ErrorLog("remark")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			remark := items["remark"].(string)
+
+			if items["warehousing_unit"] == nil || reflect.TypeOf(items["warehousing_unit"]).String() != "string" {
+				utils.ErrorLog("warehousing_unit")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			warehousing_unit := items["warehousing_unit"].(string)
+
+			if items["last_price"] == nil || reflect.TypeOf(items["last_price"]).String() != "string" {
+				utils.ErrorLog("last_price")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			last_price, _ := strconv.ParseFloat(items["last_price"].(string), 64)
+
+			if items["count"] == nil || reflect.TypeOf(items["count"]).String() != "float64" {
+				utils.ErrorLog("count")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			count := int64(items["count"].(float64))
+
+			if items["new_price"] == nil || reflect.TypeOf(items["new_price"]).String() != "string" {
+				utils.ErrorLog("new_price")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			new_price, _ := strconv.ParseFloat(items["new_price"].(string), 64)
+
+			if items["drug_id"] == nil || reflect.TypeOf(items["drug_id"]).String() != "float64" {
+				utils.ErrorLog("drug_id")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			drug_id := int64(items["drug_id"].(float64))
+
+			if items["start_time"] == nil || reflect.TypeOf(items["start_time"]).String() != "string" {
+				utils.ErrorLog("start_time")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			var startTime int64
+			start_time := items["start_time"].(string)
+			if len(start_time) > 0 {
+				theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+				if err != nil {
+					fmt.Println(err)
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				startTime = theTime.Unix()
+			}
+			orgId := this.GetAdminUserInfo().CurrentOrgId
+			Creater := this.GetAdminUserInfo().AdminUser.Id
+
+			drugAdjust := models.XtDrugAdjustPrice{
+				DrugName:          drug_name,
+				SpecificationName: "",
+				WarehousingUnit:   warehousing_unit,
+				Count:             count,
+				LastPrice:         last_price,
+				RetailPrice:       retail_price,
+				NewPrice:          new_price,
+				Manufacturer:      manufacturer,
+				Dealer:            dealer,
+				Remark:            remark,
+				DrugId:            drug_id,
+				UserOrgId:         orgId,
+				Ctime:             time.Now().Unix(),
+				Mtime:             0,
+				Status:            1,
+				WarehousingOrder:  warehousing_order,
+				Number:            number,
+				StartTime:         startTime,
+				Creater:           Creater,
+				Checker:           0,
+				CheckerStatus:     2,
+				CheckerTime:       0,
+			}
+
+			err := service.CreateDrugPrice(drugAdjust)
+			fmt.Println(err)
+		}
+	}
+	returnData := make(map[string]interface{}, 0)
+	returnData["msg"] = "ok"
+	this.ServeSuccessJSON(returnData)
+	return
+}
+
+func (this *SelfDrugApiController) GetDrugPriceList() {
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	fmt.Println(err)
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	keyword := this.GetString("keyword")
+
+	start_time := this.GetString("start_time")
+	end_time := this.GetString("end_time")
+	var startTime int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	var endTime int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+	limit, _ := this.GetInt64("limit")
+	page, _ := this.GetInt64("page")
+	list, total, err := service.GetDrugPriceList(startTime, endTime, orgId, keyword, limit, page)
+	doctorList, err := service.GetAllDoctorThree(orgId)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更新设备失败")
+		return
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"total":      total,
+		"list":       list,
+		"doctorList": doctorList,
+	})
+}
+
+func (this *SelfDrugApiController) SaveCheckDrugPrice() {
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	fmt.Println(err)
+	idstr := this.GetString("ids")
+	ids := strings.Split(idstr, ",")
+	check_time := this.GetString("check_time")
+	var checkTime int64
+	if len(check_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", check_time+" 00:00:00", loc)
+		if err != nil {
+			fmt.Println(err)
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		checkTime = theTime.Unix()
+	}
+	checker, _ := this.GetInt64("checker")
+	adjustPrice := models.XtDrugAdjustPrice{
+		Checker:       checker,
+		CheckerStatus: 1,
+		CheckerTime:   checkTime,
+	}
+	err = service.UpdateDrugAdjuestPrice(ids, adjustPrice)
+	fmt.Println("err", err)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"adjustPrice": adjustPrice,
+	})
+}
+
+func (this *SelfDrugApiController) SaveDrugDamage() {
+	fmt.Println("999999999999999999999")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	fmt.Println(err)
+
+	tableData, _ := dataBody["tableData"].([]interface{})
+	fmt.Println("999939433443", tableData)
+	if len(tableData) > 0 {
+		for _, item := range tableData {
+			items := item.(map[string]interface{})
+			drug_name := items["drug_name"].(string)
+			fmt.Println("durg_nae232333223332232323323223232323", drug_name)
+			if items["drug_name"] == nil || reflect.TypeOf(items["drug_name"]).String() != "string" {
+				utils.ErrorLog("drug_name")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+
+			if items["retail_price"] == nil || reflect.TypeOf(items["retail_price"]).String() != "string" {
+				utils.ErrorLog("retail_price")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			retail_price, _ := strconv.ParseFloat(items["retail_price"].(string), 64)
+
+			if items["warehousing_order"] == nil || reflect.TypeOf(items["warehousing_order"]).String() != "string" {
+				utils.ErrorLog("warehousing_order")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			warehousing_order := items["warehousing_order"].(string)
+
+			if items["number"] == nil || reflect.TypeOf(items["number"]).String() != "string" {
+				utils.ErrorLog("number")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			number := items["number"].(string)
+
+			//if items["dealer"] == nil || reflect.TypeOf(items["dealer"]).String() != "string" {
+			//  utils.ErrorLog("dealer")
+			//  this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			//  return
+			//}
+			//dealer := items["dealer"].(string)
+
+			if items["manufacturer"] == nil || reflect.TypeOf(items["manufacturer"]).String() != "string" {
+				utils.ErrorLog("manufacturer")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			manufacturer := items["manufacturer"].(string)
+
+			//if items["specification_name"] == nil || reflect.TypeOf(items["specification_name"]).String() != "string" {
+			//  utils.ErrorLog("specification_name")
+			//  this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			//  return
+			//}
+			//specification_name := items["specification_name"].(string)
+
+			if items["remark"] == nil || reflect.TypeOf(items["remark"]).String() != "string" {
+				utils.ErrorLog("remark")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			remark := items["remark"].(string)
+
+			if items["warehousing_unit"] == nil || reflect.TypeOf(items["warehousing_unit"]).String() != "string" {
+				utils.ErrorLog("warehousing_unit")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			warehousing_unit := items["warehousing_unit"].(string)
+
+			if items["last_price"] == nil || reflect.TypeOf(items["last_price"]).String() != "string" {
+				utils.ErrorLog("last_price")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			last_price, _ := strconv.ParseFloat(items["last_price"].(string), 64)
+
+			if items["count"] == nil || reflect.TypeOf(items["count"]).String() != "float64" {
+				utils.ErrorLog("count")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			count := int64(items["count"].(float64))
+
+			if items["new_price"] == nil || reflect.TypeOf(items["new_price"]).String() != "string" {
+				utils.ErrorLog("new_price")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			new_price, _ := strconv.ParseFloat(items["new_price"].(string), 64)
+
+			if items["drug_id"] == nil || reflect.TypeOf(items["drug_id"]).String() != "float64" {
+				utils.ErrorLog("drug_id")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			drug_id := int64(items["drug_id"].(float64))
+
+			if items["start_time"] == nil || reflect.TypeOf(items["start_time"]).String() != "string" {
+				utils.ErrorLog("start_time")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			var startTime int64
+			start_time := items["start_time"].(string)
+			if len(start_time) > 0 {
+				theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+				if err != nil {
+					fmt.Println(err)
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				startTime = theTime.Unix()
+			}
+			orgId := this.GetAdminUserInfo().CurrentOrgId
+			Creater := this.GetAdminUserInfo().AdminUser.Id
+
+			drugDamage := models.XtDrugDamage{
+				DrugName:          drug_name,
+				SpecificationName: "",
+				WarehousingUnit:   warehousing_unit,
+				Count:             count,
+				LastPrice:         last_price,
+				RetailPrice:       retail_price,
+				NewPrice:          new_price,
+				Manufacturer:      manufacturer,
+				Dealer:            "",
+				Remark:            remark,
+				DrugId:            drug_id,
+				UserOrgId:         orgId,
+				Ctime:             time.Now().Unix(),
+				Mtime:             0,
+				Status:            1,
+				WarehousingOrder:  warehousing_order,
+				Number:            number,
+				StartTime:         startTime,
+				Creater:           Creater,
+				Checker:           0,
+				CheckerStatus:     2,
+				CheckerTime:       0,
+			}
+
+			err := service.CreateDrugDamage(drugDamage)
+			fmt.Println(err)
+		}
+	}
+	returnData := make(map[string]interface{}, 0)
+	returnData["msg"] = "ok"
+	this.ServeSuccessJSON(returnData)
+}
+
+func (this *SelfDrugApiController) GetDrugDamageList() {
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	fmt.Println(err)
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	keyword := this.GetString("keyword")
+	fmt.Println("keywoer2r2r32rwrwr", keyword)
+	start_time := this.GetString("start_time")
+	end_time := this.GetString("end_time")
+	var startTime int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	var endTime int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+
+	limit, _ := this.GetInt64("limit")
+	page, _ := this.GetInt64("page")
+	list, total, err := service.GetDrugDamageList(startTime, endTime, orgId, keyword, limit, page)
+	doctorList, err := service.GetAllDoctorThree(orgId)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更新设备失败")
+		return
+	}
+	fmt.Println("list232332", list)
+	fmt.Println("total", total)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"total":      total,
+		"list":       list,
+		"doctorList": doctorList,
+	})
+}
+
+func (this *SelfDrugApiController) SaveDrugDamagePrice() {
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	fmt.Println(err)
+	idstr := this.GetString("ids")
+	ids := strings.Split(idstr, ",")
+	check_time := this.GetString("check_time")
+	var checkTime int64
+	if len(check_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", check_time+" 00:00:00", loc)
+		if err != nil {
+			fmt.Println(err)
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		checkTime = theTime.Unix()
+	}
+	checker, _ := this.GetInt64("checker")
+	damage := models.XtDrugDamage{
+		Checker:       checker,
+		CheckerStatus: 1,
+		CheckerTime:   checkTime,
+	}
+	err = service.UpdateDrugDamage(ids, damage)
+	fmt.Println(err)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"damage": damage,
+	})
+}
+
+func (this *SelfDrugApiController) GetDrugModifyPrice() {
+
+	id, _ := this.GetInt64("id")
+	detail, err := service.GetDrugModifyPrice(id)
+	fmt.Println(err)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"detail": detail,
+	})
+}
+
+func (this *SelfDrugApiController) ModifyDrugPrice() {
+
+	drug_name := this.GetString("drug_name")
+	retailPrice := this.GetString("retail_price")
+	retail_price, _ := strconv.ParseFloat(retailPrice, 64)
+	newPrice := this.GetString("new_price")
+	new_price, _ := strconv.ParseFloat(newPrice, 64)
+	count, _ := this.GetInt64("count")
+	remark := this.GetString("remark")
+	id, _ := this.GetInt64("id")
+	adjustPrice := models.XtDrugAdjustPrice{
+		DrugName:    drug_name,
+		Count:       count,
+		RetailPrice: retail_price,
+		NewPrice:    new_price,
+		Remark:      remark,
+	}
+	err := service.ModifyDrugPrice(id, adjustPrice)
+	fmt.Println(err)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"adjustPrice": adjustPrice,
+	})
+}
+
+func (this *SelfDrugApiController) GetModifyPricePrint() {
+
+	ids := this.GetString("ids")
+	idsSplit := strings.Split(ids, ",")
+	list, err := service.GetModifyPricePrint(idsSplit)
+	fmt.Println(err)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+	})
+}
+
+func (this *SelfDrugApiController) GetDrugDamageDetail() {
+
+	id, _ := this.GetInt64("id")
+	detail, _ := service.GetDrugDamageDetail(id)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"detail": detail,
+	})
+}
+
+func (this *SelfDrugApiController) ModifyDrugDamage() {
+
+	id, _ := this.GetInt64("id")
+	drug_id, _ := this.GetInt64("drug_id")
+	drug_name := this.GetString("drug_name")
+	//drug_origin_place := this.GetString("drug_origin_place")
+	lastPrice := this.GetString("last_price")
+	last_price, _ := strconv.ParseFloat(lastPrice, 64)
+	newPrice := this.GetString("new_price")
+	new_price, _ := strconv.ParseFloat(newPrice, 64)
+	manufacturer := this.GetString("manufacturer")
+	number := this.GetString("number")
+	retailPrice := this.GetString("retail_price")
+	retail_price, _ := strconv.ParseFloat(retailPrice, 64)
+	remark := this.GetString("remark")
+	count, _ := this.GetInt64("count")
+	warehousing_unit := this.GetString("warehousing_unit")
+
+	damage := models.XtDrugDamage{
+		DrugName:          drug_name,
+		SpecificationName: "",
+		WarehousingUnit:   warehousing_unit,
+		Count:             count,
+		LastPrice:         last_price,
+		RetailPrice:       retail_price,
+		NewPrice:          new_price,
+		Manufacturer:      manufacturer,
+		Dealer:            "",
+		Remark:            remark,
+		DrugId:            drug_id,
+		Number:            number,
+	}
+	err := service.ModifyDrugDamage(id, damage)
+	fmt.Println(err)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"damage": damage,
+	})
+}
+
+func (this *SelfDrugApiController) DeleteDrugDamage() {
+
+	id, _ := this.GetInt64("id")
+	err := service.DeleteDrugDamage(id)
+	fmt.Println(err)
+	returnData := make(map[string]interface{}, 0)
+	returnData["msg"] = "ok"
+	this.ServeSuccessJSON(returnData)
+}
+
+func (this *SelfDrugApiController) GetDrugDamagePrint() {
+
+	idsSplit := this.GetString("ids")
+	ids := strings.Split(idsSplit, ",")
+	list, _ := service.GetDrugDamagePrint(ids)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+	})
+}
+
+func (this *SelfDrugApiController) GetWarehoseInfoById() {
+
+	id, _ := this.GetInt64("id")
+	list, _ := service.GetWarehoseInfoById(id)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+	})
+}

controllers/stock_in_api_controller.go

@@ -108,6 +108,23 @@ func StockManagerApiRegistRouters() {
 	beego.Router("/api/stock/savereportstock", &StockManagerApiController{}, "Post:SaveReportStock")
 	beego.Router("/api/stock/getreportstocklist", &StockManagerApiController{}, "Get:GetReportStockList")
 	beego.Router("/api/stock/savecheckdamage", &StockManagerApiController{}, "Get:SaveCheckDamage")
+	beego.Router("/api/stock/saveinventory", &StockManagerApiController{}, "Post:SaveInventory")
+	beego.Router("/api/stock/getinventorylist", &StockManagerApiController{}, "Get:GetInventorylist")
+	beego.Router("/api/stock/savecheckinventory", &StockManagerApiController{}, "Get:SaveCheckInventory")
+	beego.Router("/api/stock/getmodifypriceDetail", &StockManagerApiController{}, "Get:GetModifyPriceDetail")
+	beego.Router("/api/stock/updatestockprice", &StockManagerApiController{}, "Get:UpdateStockPrice")
+	beego.Router("/api/stock/deletestockprice", &StockManagerApiController{}, "Get:DeleteStockPrice")
+	beego.Router("/api/stock/getstockdamagedetal", &StockManagerApiController{}, "Get:GetStockDamageDetail")
+	beego.Router("/api/sotck/modifyprice", &StockManagerApiController{}, "Get:ModifyPrice")
+	beego.Router("/api/stock/deletestockdamage", &StockManagerApiController{}, "Get:DeleteDamage")
+	beego.Router("/api/stock/getstockdamagebyid", &StockManagerApiController{}, "Get:GetStockDamageById")
+	beego.Router("api/sotck/getinventorydetail", &StockManagerApiController{}, "Get:GetInventoryDetail")
+	beego.Router("/api/stock/modifyinventory", &StockManagerApiController{}, "Get:ModifyInventory")
+	beego.Router("/api/stock/deleteinventory", &StockManagerApiController{}, "Get:DeleteInventory")
+	beego.Router("/api/stock/getinventorydetaillist", &StockManagerApiController{}, "Get:GetInventoryDetailList")
+	beego.Router("/api/stock/getinventoryprintlist", &StockManagerApiController{}, "Get:GetInventoryPrintList")
+	beego.Router("/api/stock/getinventorydetailprintlist", &StockManagerApiController{}, "Get:GetInventoryDetailPrintList")
+	beego.Router("/api/drug/deletedrugprice", &StockManagerApiController{}, "Get:DeleteDrugPrice")
 }
 
 func (c *StockManagerApiController) CreateWarehouse() {
@@ -4882,7 +4899,7 @@ func (this *StockManagerApiController) SaveAdjuestPrice() {
 }
 
 func (this *StockManagerApiController) GetAllStockPrice() {
-	fmt.Println("hhhhhhhhhhhhhhhhhhhhhhhhhhhh")
+
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	dataBody := make(map[string]interface{}, 0)
@@ -4890,9 +4907,10 @@ func (this *StockManagerApiController) GetAllStockPrice() {
 	fmt.Println(err)
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	keyword := this.GetString("keyword")
-	fmt.Println("keywoer2r2r32rwrwr", keyword)
 	start_time := this.GetString("start_time")
 	end_time := this.GetString("end_time")
+	limit, _ := this.GetInt64("limit")
+	page, _ := this.GetInt64("page")
 	var startTime int64
 	if len(start_time) > 0 {
 		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
@@ -4912,13 +4930,13 @@ func (this *StockManagerApiController) GetAllStockPrice() {
 		}
 		endTime = theTime.Unix()
 	}
-	fmt.Println("startTime23232233223232323232323", startTime)
-	fmt.Println("endtime 23232232332232323232323232323", endTime)
-	list, _ := service.GetAllStockPrice(orgId, startTime, endTime, keyword)
+
+	list, total, _ := service.GetAllStockPrice(orgId, startTime, endTime, keyword, limit, page)
 	doctor, _ := service.GetAllDoctorThree(orgId)
 	this.ServeSuccessJSON(map[string]interface{}{
 		"list":   list,
 		"doctor": doctor,
+		"total":  total,
 	})
 }
 
@@ -4949,6 +4967,15 @@ func (this *StockManagerApiController) SaveCheckPrice() {
 	}
 	err = service.UpdateAdjustPrice(ids, adjustPrice)
 	fmt.Println(err)
+
+	list, _ := service.GetAdjustCheckPriceList(ids)
+	for _, item := range list {
+		info := models.GoodInfo{
+			PackingPrice: item.NewPrice,
+		}
+		err = service.UpdateAdjustCheckPrice(&info, item.GoodId)
+		fmt.Println(err)
+	}
 	this.ServeSuccessJSON(map[string]interface{}{
 		"adjustPrice": adjustPrice,
 	})
@@ -5064,12 +5091,249 @@ func (this *StockManagerApiController) SaveReportStock() {
 			}
 			count := int64(items["count"].(float64))
 
-			if items["new_price"] == nil || reflect.TypeOf(items["new_price"]).String() != "string" {
-				utils.ErrorLog("new_price")
+			//if items["new_price"] == nil || reflect.TypeOf(items["new_price"]).String() != "string" {
+			//	utils.ErrorLog("new_price")
+			//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			//	return
+			//}
+			//new_price, _ := strconv.ParseFloat(items["new_price"].(string), 64)
+
+			if items["good_id"] == nil || reflect.TypeOf(items["good_id"]).String() != "float64" {
+				utils.ErrorLog("good_id")
 				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 				return
 			}
-			new_price, _ := strconv.ParseFloat(items["new_price"].(string), 64)
+			good_id := int64(items["good_id"].(float64))
+
+			if items["start_time"] == nil || reflect.TypeOf(items["start_time"]).String() != "string" {
+				utils.ErrorLog("start_time")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			var startTime int64
+			start_time := items["start_time"].(string)
+			if len(start_time) > 0 {
+				theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+				if err != nil {
+					fmt.Println(err)
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				startTime = theTime.Unix()
+			}
+			orgId := this.GetAdminUserInfo().CurrentOrgId
+			Creater := this.GetAdminUserInfo().AdminUser.Id
+			reportPrice := models.XtStockReportPrice{
+				GoodName:          good_name,
+				SpecificationName: specification_name,
+				WarehousingUnit:   warehousing_unit,
+				Count:             count,
+				BuyPrice:          buy_price,
+				PackingPrice:      packing_price,
+				//NewPrice:          new_price,
+				Manufacturer:     manufacturer,
+				Dealer:           dealer,
+				Remark:           remark,
+				GoodId:           good_id,
+				UserOrgId:        orgId,
+				Ctime:            time.Now().Unix(),
+				Mtime:            0,
+				Status:           1,
+				WarehousingOrder: warehousing_order,
+				LicenseNumber:    license_number,
+				StartTime:        startTime,
+				Creater:          Creater,
+				Checker:          0,
+				CheckerStatus:    2,
+				CheckerTime:      0,
+			}
+			err := service.CreateReportPrice(&reportPrice)
+			fmt.Println(err)
+		}
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"msg": "保存成功!",
+	})
+}
+
+func (this *StockManagerApiController) GetReportStockList() {
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	start_time := this.GetString("start_time")
+	end_time := this.GetString("end_time")
+	page, _ := this.GetInt64("page")
+	limit, _ := this.GetInt64("limit")
+	var startTime int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+		fmt.Println("开始时间", startTime)
+	}
+	var endTime int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+
+	}
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	keyword := this.GetString("keyword")
+	fmt.Println("startTime", startTime, "endTime", endTime)
+	list, total, _ := service.GetReportStockList(startTime, endTime, orgId, keyword, page, limit)
+	doctorlist, _ := service.GetAllDoctorThree(orgId)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list":       list,
+		"total":      total,
+		"doctorlist": doctorlist,
+	})
+}
+
+func (this *StockManagerApiController) SaveCheckDamage() {
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	idstr := this.GetString("ids")
+	ids := strings.Split(idstr, ",")
+	check_time := this.GetString("check_time")
+	var checkTime int64
+	if len(check_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", check_time+" 00:00:00", loc)
+		if err != nil {
+			fmt.Println(err)
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		checkTime = theTime.Unix()
+	}
+	checker, _ := this.GetInt64("checker")
+	reportprice := models.XtStockReportPrice{
+		Checker:       checker,
+		CheckerStatus: 1,
+		CheckerTime:   checkTime,
+	}
+	err := service.UpdateCheckDamage(ids, reportprice)
+	fmt.Println(err)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"reportPrice": reportprice,
+	})
+}
+
+func (this *StockManagerApiController) SaveInventory() {
+	fmt.Println("hhhhhhhhh232h323223323232")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	tableData, _ := dataBody["tableData"].([]interface{})
+	if len(tableData) > 0 {
+		for _, item := range tableData {
+			items := item.(map[string]interface{})
+
+			if items["good_name"] == nil || reflect.TypeOf(items["good_name"]).String() != "string" {
+				utils.ErrorLog("good_name")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			good_name := items["good_name"].(string)
+
+			if items["good_name"] == nil || reflect.TypeOf(items["good_name"]).String() != "string" {
+				utils.ErrorLog("good_name")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+
+			if items["packing_price"] == nil || reflect.TypeOf(items["packing_price"]).String() != "string" {
+				utils.ErrorLog("packing_price")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			packing_price, _ := strconv.ParseFloat(items["packing_price"].(string), 64)
+
+			if items["warehousing_order"] == nil || reflect.TypeOf(items["warehousing_order"]).String() != "string" {
+				utils.ErrorLog("warehousing_order")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			warehousing_order := items["warehousing_order"].(string)
+
+			if items["license_number"] == nil || reflect.TypeOf(items["license_number"]).String() != "string" {
+				utils.ErrorLog("license_number")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			license_number := items["license_number"].(string)
+
+			if items["dealer"] == nil || reflect.TypeOf(items["dealer"]).String() != "string" {
+				utils.ErrorLog("dealer")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			dealer := items["dealer"].(string)
+
+			if items["manufacturer"] == nil || reflect.TypeOf(items["manufacturer"]).String() != "string" {
+				utils.ErrorLog("manufacturer")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			manufacturer := items["manufacturer"].(string)
+
+			if items["specification_name"] == nil || reflect.TypeOf(items["specification_name"]).String() != "string" {
+				utils.ErrorLog("specification_name")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			specification_name := items["specification_name"].(string)
+
+			if items["remark"] == nil || reflect.TypeOf(items["remark"]).String() != "string" {
+				utils.ErrorLog("remark")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			remark := items["remark"].(string)
+
+			if items["warehousing_unit"] == nil || reflect.TypeOf(items["warehousing_unit"]).String() != "string" {
+				utils.ErrorLog("warehousing_unit")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			warehousing_unit := items["warehousing_unit"].(string)
+
+			if items["buy_price"] == nil || reflect.TypeOf(items["buy_price"]).String() != "string" {
+				utils.ErrorLog("buy_price")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			buy_price, _ := strconv.ParseFloat(items["buy_price"].(string), 64)
+
+			if items["count"] == nil || reflect.TypeOf(items["count"]).String() != "float64" {
+				utils.ErrorLog("count")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			count := int64(items["count"].(float64))
+
+			//if items["new_price"] == nil || reflect.TypeOf(items["new_price"]).String() != "string" {
+			//  utils.ErrorLog("new_price")
+			//  this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			//  return
+			//}
+			//new_price, _ := strconv.ParseFloat(items["new_price"].(string), 64)
 
 			if items["good_id"] == nil || reflect.TypeOf(items["good_id"]).String() != "float64" {
 				utils.ErrorLog("good_id")
@@ -5096,14 +5360,15 @@ func (this *StockManagerApiController) SaveReportStock() {
 			}
 			orgId := this.GetAdminUserInfo().CurrentOrgId
 			Creater := this.GetAdminUserInfo().AdminUser.Id
-			reportPrice := models.XtStockReportPrice{
+
+			inventory := models.XtStockInventory{
 				GoodName:          good_name,
 				SpecificationName: specification_name,
 				WarehousingUnit:   warehousing_unit,
 				Count:             count,
 				BuyPrice:          buy_price,
 				PackingPrice:      packing_price,
-				NewPrice:          new_price,
+				NewPrice:          0,
 				Manufacturer:      manufacturer,
 				Dealer:            dealer,
 				Remark:            remark,
@@ -5120,7 +5385,7 @@ func (this *StockManagerApiController) SaveReportStock() {
 				CheckerStatus:     2,
 				CheckerTime:       0,
 			}
-			err := service.CreateReportPrice(&reportPrice)
+			err = service.CreateInentory(inventory)
 			fmt.Println(err)
 		}
 	}
@@ -5129,7 +5394,7 @@ func (this *StockManagerApiController) SaveReportStock() {
 	})
 }
 
-func (this *StockManagerApiController) GetReportStockList() {
+func (this *StockManagerApiController) GetInventorylist() {
 
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
@@ -5137,6 +5402,8 @@ func (this *StockManagerApiController) GetReportStockList() {
 	end_time := this.GetString("end_time")
 	page, _ := this.GetInt64("page")
 	limit, _ := this.GetInt64("limit")
+	keyword := this.GetString("keyword")
+	inventory_status, _ := this.GetInt64("inventory_status")
 	var startTime int64
 	if len(start_time) > 0 {
 		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
@@ -5160,11 +5427,8 @@ func (this *StockManagerApiController) GetReportStockList() {
 	}
 
 	orgId := this.GetAdminUserInfo().CurrentOrgId
-	keyword := this.GetString("keyword")
-	fmt.Println("startTime", startTime, "endTime", endTime)
-	list, total, _ := service.GetReportStockList(startTime, endTime, orgId, keyword, page, limit)
+	list, total, _ := service.GetInventorylist(startTime, endTime, page, limit, inventory_status, keyword, orgId)
 	doctorlist, _ := service.GetAllDoctorThree(orgId)
-
 	this.ServeSuccessJSON(map[string]interface{}{
 		"list":       list,
 		"total":      total,
@@ -5172,10 +5436,13 @@ func (this *StockManagerApiController) GetReportStockList() {
 	})
 }
 
-func (this *StockManagerApiController) SaveCheckDamage() {
-	fmt.Println("hhhhhhhhhhhhhhhhhhhh")
+func (this *StockManagerApiController) SaveCheckInventory() {
+
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	fmt.Println(err)
 	idstr := this.GetString("ids")
 	ids := strings.Split(idstr, ",")
 	check_time := this.GetString("check_time")
@@ -5190,14 +5457,170 @@ func (this *StockManagerApiController) SaveCheckDamage() {
 		checkTime = theTime.Unix()
 	}
 	checker, _ := this.GetInt64("checker")
-	reportprice := models.XtStockReportPrice{
+	inventory := models.XtStockInventory{
 		Checker:       checker,
 		CheckerStatus: 1,
 		CheckerTime:   checkTime,
 	}
-	err := service.UpdateCheckDamage(ids, reportprice)
+	err = service.UpdateCheckInventory(ids, inventory)
 	fmt.Println(err)
 	this.ServeSuccessJSON(map[string]interface{}{
-		"reportPrice": reportprice,
+		"inventory": inventory,
+	})
+}
+
+func (this *StockManagerApiController) GetModifyPriceDetail() {
+
+	id, _ := this.GetInt64("id")
+	detail, _ := service.GetModifyPriceDetail(id)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"detail": detail,
+	})
+}
+
+func (this *StockManagerApiController) UpdateStockPrice() {
+
+	id, _ := this.GetInt64("id")
+	newPrice := this.GetString("new_price")
+	new_price, _ := strconv.ParseFloat(newPrice, 64)
+	adjust := models.XtStockAdjustPrice{
+		NewPrice: new_price,
+	}
+	err := service.UpdateStockPrice(adjust, id)
+	fmt.Println(err)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"adjust": adjust,
+	})
+}
+
+func (this *StockManagerApiController) DeleteStockPrice() {
+
+	id, _ := this.GetInt64("id")
+	err := service.DeleteStockPrice(id)
+	fmt.Println(err)
+	returnData := make(map[string]interface{}, 0)
+	returnData["msg"] = "ok"
+	this.ServeSuccessJSON(returnData)
+	return
+}
+
+func (this *StockManagerApiController) GetStockDamageDetail() {
+
+	id, _ := this.GetInt64("id")
+	detail, err := service.GetStockDamageDetail(id)
+	fmt.Println(err)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"detail": detail,
+	})
+}
+
+func (this *StockManagerApiController) ModifyPrice() {
+
+	count, _ := this.GetInt64("count")
+	id, _ := this.GetInt64("id")
+	adjust := models.XtStockReportPrice{
+		Count: count,
+	}
+	err := service.ModifyPrice(id, adjust)
+	fmt.Println(err)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"adjust": adjust,
+	})
+}
+
+func (this *StockManagerApiController) DeleteDamage() {
+
+	id, _ := this.GetInt64("id")
+	err := service.DeleteDamage(id)
+	fmt.Println(err)
+	returnData := make(map[string]interface{}, 0)
+	returnData["msg"] = "ok"
+	this.ServeSuccessJSON(returnData)
+	return
+}
+
+func (this *StockManagerApiController) GetStockDamageById() {
+	ids := this.GetString("ids")
+
+	splitIds := strings.Split(ids, ",")
+	list, _ := service.GetStockDamageById(splitIds)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+	})
+}
+
+func (this *StockManagerApiController) GetInventoryDetail() {
+	id, _ := this.GetInt64("id")
+	detail, _ := service.GetInventoryDetail(id)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"detail": detail,
 	})
 }
+
+func (this *StockManagerApiController) ModifyInventory() {
+	id, _ := this.GetInt64("id")
+	count, _ := this.GetInt64("count")
+	remark := this.GetString("remark")
+	inventory := models.XtStockInventory{
+		Count:  count,
+		Remark: remark,
+	}
+	err := service.ModifyInventory(id, inventory)
+	fmt.Println(err)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"inventory": inventory,
+	})
+}
+
+func (this *StockManagerApiController) DeleteInventory() {
+	id, _ := this.GetInt64("id")
+	err := service.DeleteInventory(id)
+	fmt.Println(err)
+	returnData := make(map[string]interface{}, 0)
+	returnData["msg"] = "ok"
+	this.ServeSuccessJSON(returnData)
+	return
+}
+
+func (this *StockManagerApiController) GetInventoryDetailList() {
+	keyword := this.GetString("keyword")
+	limit, _ := this.GetInt64("limit")
+	page, _ := this.GetInt64("page")
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	list, total, _ := service.GetInventoryDetailList(keyword, limit, page, orgId)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list":  list,
+		"total": total,
+	})
+}
+
+func (this *StockManagerApiController) GetInventoryPrintList() {
+
+	ids := this.GetString("ids")
+	splitIds := strings.Split(ids, ",")
+	list, _ := service.GetInventoryPrintList(splitIds)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+	})
+}
+
+func (this *StockManagerApiController) GetInventoryDetailPrintList() {
+	ids := this.GetString("ids")
+	splitIds := strings.Split(ids, ",")
+	list, _ := service.GetInventoryDetailPrintList(splitIds)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+	})
+}
+
+func (this *StockManagerApiController) DeleteDrugPrice() {
+
+	id, _ := this.GetInt64("id")
+	err := service.DeleteDrugPrice(id)
+	fmt.Println(err)
+	returnData := make(map[string]interface{}, 0)
+	returnData["msg"] = "ok"
+	this.ServeSuccessJSON(returnData)
+	return
+}

models/self_drug_models.go

@@ -470,6 +470,9 @@ type BloodDrugWarehouseInfo struct {
 	MinNumber        int64   `json:"min_number"`
 	Dose             float64 `json:"dose"`
 	DoseUnit         string  `json:"dose_unit"`
+	WarehouseingUnit string  `gorm:"column:warehouseing_unit" json:"warehouseing_unit" form:"warehouseing_unit"`
+	LastPrice        float64 `gorm:"column:last_price" json:"last_price" form:"last_price"`
+	DrugOriginPlace  string  `gorm:"column:drug_origin_place" json:"drug_origin_place" form:"drug_origin_place"`
 }
 
 type BloodDrugCancelStockInfo struct {
@@ -666,3 +669,63 @@ type VmDrugWarehouseOutInfo struct {
 	DrugName                string  `json:"drug_name"`
 	Number                  string  `gorm:"column:number" json:"number" form:"number"`
 }
+
+type XtDrugAdjustPrice struct {
+	ID                int64   `gorm:"column:id" json:"id" form:"id"`
+	DrugName          string  `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	SpecificationName string  `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
+	WarehousingUnit   string  `gorm:"column:warehousing_unit" json:"warehousing_unit" form:"warehousing_unit"`
+	Count             int64   `gorm:"column:count" json:"count" form:"count"`
+	LastPrice         float64 `gorm:"column:last_price" json:"last_price" form:"last_price"`
+	RetailPrice       float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	NewPrice          float64 `gorm:"column:new_price" json:"new_price" form:"new_price"`
+	Manufacturer      string  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Dealer            string  `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Remark            string  `gorm:"column:remark" json:"remark" form:"remark"`
+	DrugId            int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	UserOrgId         int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Ctime             int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime             int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status            int64   `gorm:"column:status" json:"status" form:"status"`
+	WarehousingOrder  string  `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
+	Number            string  `gorm:"column:number" json:"number" form:"number"`
+	StartTime         int64   `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	Creater           int64   `gorm:"column:creater" json:"creater" form:"creater"`
+	Checker           int64   `gorm:"column:checker" json:"checker" form:"checker"`
+	CheckerStatus     int64   `gorm:"column:checker_status" json:"checker_status" form:"checker_status"`
+	CheckerTime       int64   `gorm:"column:checker_time" json:"checker_time" form:"checker_time"`
+}
+
+func (XtDrugAdjustPrice) TableName() string {
+	return "xt_drug_adjust_price"
+}
+
+type XtDrugDamage struct {
+	ID                int64   `gorm:"column:id" json:"id" form:"id"`
+	DrugName          string  `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	SpecificationName string  `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
+	WarehousingUnit   string  `gorm:"column:warehousing_unit" json:"warehousing_unit" form:"warehousing_unit"`
+	Count             int64   `gorm:"column:count" json:"count" form:"count"`
+	LastPrice         float64 `gorm:"column:last_price" json:"last_price" form:"last_price"`
+	RetailPrice       float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	NewPrice          float64 `gorm:"column:new_price" json:"new_price" form:"new_price"`
+	Manufacturer      string  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Dealer            string  `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Remark            string  `gorm:"column:remark" json:"remark" form:"remark"`
+	DrugId            int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	UserOrgId         int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Ctime             int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime             int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status            int64   `gorm:"column:status" json:"status" form:"status"`
+	WarehousingOrder  string  `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
+	Number            string  `gorm:"column:number" json:"number" form:"number"`
+	StartTime         int64   `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	Creater           int64   `gorm:"column:creater" json:"creater" form:"creater"`
+	Checker           int64   `gorm:"column:checker" json:"checker" form:"checker"`
+	CheckerStatus     int64   `gorm:"column:checker_status" json:"checker_status" form:"checker_status"`
+	CheckerTime       int64   `gorm:"column:checker_time" json:"checker_time" form:"checker_time"`
+}
+
+func (XtDrugDamage) TableName() string {
+	return "xt_drug_damage"
+}

models/stock_models.go

@@ -946,3 +946,61 @@ type XtStockReportPrice struct {
 func (XtStockReportPrice) TableName() string {
 	return "xt_stock_report_price"
 }
+
+type XtStockInventory struct {
+	ID                int64   `gorm:"column:id" json:"id" form:"id"`
+	GoodName          string  `gorm:"column:good_name" json:"good_name" form:"good_name"`
+	SpecificationName string  `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
+	WarehousingUnit   string  `gorm:"column:warehousing_unit" json:"warehousing_unit" form:"warehousing_unit"`
+	Count             int64   `gorm:"column:count" json:"count" form:"count"`
+	BuyPrice          float64 `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
+	PackingPrice      float64 `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
+	NewPrice          float64 `gorm:"column:new_price" json:"new_price" form:"new_price"`
+	Manufacturer      string  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Dealer            string  `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Remark            string  `gorm:"column:remark" json:"remark" form:"remark"`
+	GoodId            int64   `gorm:"column:good_id" json:"good_id" form:"good_id"`
+	UserOrgId         int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Ctime             int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime             int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status            int64   `gorm:"column:status" json:"status" form:"status"`
+	WarehousingOrder  string  `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
+	LicenseNumber     string  `gorm:"column:license_number" json:"license_number" form:"license_number"`
+	StartTime         int64   `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	Creater           int64   `gorm:"column:creater" json:"creater" form:"creater"`
+	Checker           int64   `gorm:"column:checker" json:"checker" form:"checker"`
+	CheckerStatus     int64   `gorm:"column:checker_status" json:"checker_status" form:"checker_status"`
+	CheckerTime       int64   `gorm:"column:checker_time" json:"checker_time" form:"checker_time"`
+}
+
+func (XtStockInventory) TableName() string {
+	return "xt_stock_inventory"
+}
+
+type VmStockInventory struct {
+	ID                int64   `gorm:"column:id" json:"id" form:"id"`
+	GoodName          string  `gorm:"column:good_name" json:"good_name" form:"good_name"`
+	SpecificationName string  `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
+	WarehousingUnit   string  `gorm:"column:warehousing_unit" json:"warehousing_unit" form:"warehousing_unit"`
+	Count             int64   `gorm:"column:count" json:"count" form:"count"`
+	BuyPrice          float64 `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
+	PackingPrice      float64 `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
+	NewPrice          float64 `gorm:"column:new_price" json:"new_price" form:"new_price"`
+	Manufacturer      string  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Dealer            string  `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Remark            string  `gorm:"column:remark" json:"remark" form:"remark"`
+	GoodId            int64   `gorm:"column:good_id" json:"good_id" form:"good_id"`
+	UserOrgId         int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Ctime             int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime             int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status            int64   `gorm:"column:status" json:"status" form:"status"`
+	WarehousingOrder  string  `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
+	LicenseNumber     string  `gorm:"column:license_number" json:"license_number" form:"license_number"`
+	StartTime         int64   `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	Creater           int64   `gorm:"column:creater" json:"creater" form:"creater"`
+	Checker           int64   `gorm:"column:checker" json:"checker" form:"checker"`
+	CheckerStatus     int64   `gorm:"column:checker_status" json:"checker_status" form:"checker_status"`
+	CheckerTime       int64   `gorm:"column:checker_time" json:"checker_time" form:"checker_time"`
+	PackingUnit       string  `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
+	UserName          string  `gorm:"column:user_name" json:"user_name" form:"user_name"`
+}

service/self_drug_service.go

@@ -808,3 +808,128 @@ func GetLastDrugWarehouseOutInfo(drugid int64, warehouseOutId int64, orgid int64
 
 	return info, err
 }
+
+func PostSearchDrugWarehouseList(keyword string, orgid int64) (info []*models.BloodDrugWarehouseInfo, err error) {
+	db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status = 1")
+	table := XTReadDB().Table("xt_base_drug as t").Where("t.status")
+	fmt.Println(table)
+	likeKey := "%" + keyword + "%"
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+	err = db.Select("x.id,x.warehousing_id,x.drug_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.price,x.total_price,x.dealer,x.remark,x.warehousing_order,x.warehouseing_unit,x.stock_max_number,x.stock_min_number,x.batch_number,t.drug_origin_place,t.drug_name,t.min_unit,x.manufacturer,t.retail_price,t.max_unit,t.min_number,t.dose,t.dose_unit,t.last_price").Joins("left join xt_base_drug as t on t.id = x.drug_id").Where("t.drug_name like ? and t.org_id = ?", likeKey, orgid).Order("x.ctime desc").Scan(&info).Error
+	return info, err
+
+}
+
+func CreateDrugPrice(price models.XtDrugAdjustPrice) error {
+
+	err := XTWriteDB().Create(&price).Error
+	return err
+}
+
+func GetDrugPriceList(startime int64, endtime int64, orgId int64, keyword string, limit int64, page int64) (adjust []*models.XtDrugAdjustPrice, total int64, err error) {
+	likeKey := "%" + keyword + "%"
+	offset := (page - 1) * limit
+	db := XTReadDB().Model(&adjust).Where("status = 1")
+	if startime > 0 {
+		db = db.Where("ctime >=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("ctime<=?", endtime)
+	}
+	if orgId > 0 {
+		db = db.Where("user_org_id = ?", orgId)
+	}
+	if len(keyword) > 0 {
+		db = db.Where("warehousing_order like ?", likeKey)
+	}
+	err = db.Count(&total).Offset(offset).Limit(limit).Find(&adjust).Error
+	return adjust, total, err
+}
+
+func UpdateDrugAdjuestPrice(ids []string, info models.XtDrugAdjustPrice) error {
+	err := XTWriteDB().Model(&info).Where("id in(?)", ids).Updates(map[string]interface{}{"checker": info.Checker, "checker_status": info.CheckerStatus, "checker_time": info.CheckerTime}).Error
+	return err
+}
+
+func CreateDrugDamage(damage models.XtDrugDamage) error {
+
+	err := XTWriteDB().Create(&damage).Error
+	return err
+}
+
+func GetDrugDamageList(startime int64, endtime int64, orgId int64, keyword string, limit int64, page int64) (adjust []*models.XtDrugDamage, total int64, err error) {
+	likeKey := "%" + keyword + "%"
+	offset := (page - 1) * limit
+	db := XTReadDB().Model(&adjust).Where("status = 1")
+	if startime > 0 {
+		db = db.Where("ctime >=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("ctime<=?", endtime)
+	}
+	if orgId > 0 {
+		db = db.Where("user_org_id = ?", orgId)
+	}
+	if len(keyword) > 0 {
+		db = db.Where("warehousing_order like ?", likeKey)
+	}
+	err = db.Count(&total).Offset(offset).Limit(limit).Find(&adjust).Error
+	return adjust, total, err
+}
+
+func UpdateDrugDamage(ids []string, damage models.XtDrugDamage) error {
+
+	err := XTWriteDB().Model(&damage).Where("id in(?)", ids).Updates(map[string]interface{}{"checker": damage.Checker, "checker_status": damage.CheckerStatus, "checker_time": damage.CheckerTime}).Error
+	return err
+}
+
+func GetDrugModifyPrice(id int64) (models.XtDrugAdjustPrice, error) {
+	adjuest := models.XtDrugAdjustPrice{}
+	err := XTReadDB().Model(&adjuest).Where("id=? and status = 1", id).Find(&adjuest).Error
+	return adjuest, err
+}
+
+func ModifyDrugPrice(id int64, adjust models.XtDrugAdjustPrice) error {
+
+	err := XTWriteDB().Model(&adjust).Where("id=? and status = 1", id).Updates(map[string]interface{}{"drug_name": adjust.DrugName, "retail_price": adjust.RetailPrice, "new_price": adjust.NewPrice, "count": adjust.Count, "remark": adjust.Remark}).Error
+	return err
+}
+
+func GetModifyPricePrint(ids []string) (info []*models.XtDrugAdjustPrice, err error) {
+
+	err = XTReadDB().Model(&info).Where("id in(?) and status = 1", ids).Find(&info).Error
+	return info, err
+}
+
+func GetDrugDamageDetail(id int64) (models.XtDrugDamage, error) {
+
+	damage := models.XtDrugDamage{}
+	err := XTReadDB().Model(&damage).Where("id=? and status = 1", id).Find(&damage).Error
+	return damage, err
+}
+
+func ModifyDrugDamage(id int64, damage models.XtDrugDamage) error {
+
+	err := XTWriteDB().Model(&damage).Where("id=? and status = 1", id).Updates(map[string]interface{}{"drug_name": damage.DrugName, "warehousing_unit": damage.WarehousingUnit, "count": damage.Count, "last_price": damage.LastPrice, "retail_price": damage.RetailPrice, "new_price": damage.NewPrice, "manufacturer": damage.Manufacturer, "remark": damage.Remark, "number": damage.Number, "drug_id": damage.DrugId}).Error
+	return err
+}
+
+func DeleteDrugDamage(id int64) error {
+	damage := models.XtDrugDamage{}
+	err := XTWriteDB().Model(&damage).Where("id=? and status = 1").Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}
+
+func GetDrugDamagePrint(ids []string) (damage []*models.XtDrugDamage, err error) {
+
+	err = XTReadDB().Model(&damage).Where("id in(?) and status = 1", ids).Find(&damage).Error
+	return damage, err
+}
+
+func GetWarehoseInfoById(id int64) (info []*models.XtDrugWarehouseInfo, err error) {
+
+	err = XTReadDB().Model(&info).Where("drug_id=? and status = 1", id).Find(&info).Error
+	return info, err
+}

service/stock_service.go

@@ -4304,8 +4304,9 @@ func CreateAdjustPrice(adjustPrice *models.XtStockAdjustPrice) error {
 	return err
 }
 
-func GetAllStockPrice(orgid int64, startime int64, endtime int64, keyword string) (list []*models.VmStockAdjustPrice, err error) {
+func GetAllStockPrice(orgid int64, startime int64, endtime int64, keyword string, limit int64, page int64) (list []*models.VmStockAdjustPrice, total int64, err error) {
 	likeKey := "%" + keyword + "%"
+	offset := (page - 1) * limit
 	db := XTReadDB().Table("xt_stock_adjust_price as x").Where("x.status = 1")
 	table := XTReadDB().Table("xt_good_information as t").Where("t.status = 1")
 	tab := UserReadDB().Table("sgj_user_admin_role as r").Where("r.status = 1")
@@ -4317,13 +4318,13 @@ func GetAllStockPrice(orgid int64, startime int64, endtime int64, keyword string
 		db = db.Where("x.end_time<=?", endtime)
 	}
 	if len(keyword) > 0 {
-		db = db.Where("x.warehousing_order like ?", likeKey)
+		db = db.Where("x.warehousing_order = ? or r.user_name like ?", keyword, likeKey)
 	}
 	if orgid > 0 {
 		db = db.Where("x.user_org_id = ?", orgid)
 	}
-	err = db.Select("x.id,x.good_name,x.specification_name,x.warehousing_unit,x.count,x.buy_price,x.packing_price,x.new_price,x.manufacturer,x.dealer,x.remark,x.good_id,x.warehousing_order,x.license_number,x.start_time,x.creater,x.checker,x.checker_status,x.checker_time,t.packing_unit").Joins("left join sgj_users.sgj_user_admin_role as r on r.id = x.creater").Joins("left join xt_good_information as t on t.id =x.good_id").Scan(&list).Error
-	return list, err
+	err = db.Select("x.id,x.good_name,x.specification_name,x.warehousing_unit,x.count,x.buy_price,x.packing_price,x.new_price,x.manufacturer,x.dealer,x.remark,x.good_id,x.warehousing_order,x.license_number,x.start_time,x.creater,x.checker,x.checker_status,x.checker_time,t.packing_unit").Joins("left join sgj_users.sgj_user_admin_role as r on r.id = x.creater").Joins("left join xt_good_information as t on t.id =x.good_id").Count(&total).Offset(offset).Limit(limit).Scan(&list).Error
+	return list, total, err
 }
 
 func UpdateAdjustPrice(ids []string, info models.XtStockAdjustPrice) error {
@@ -4332,6 +4333,18 @@ func UpdateAdjustPrice(ids []string, info models.XtStockAdjustPrice) error {
 	return err
 }
 
+func UpdateAdjustCheckPrice(info *models.GoodInfo, id int64) error {
+
+	err := XTWriteDB().Model(&info).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"packing_price": info.PackingPrice}).Error
+	return err
+}
+
+func GetAdjustCheckPriceList(ids []string) (info []*models.XtStockAdjustPrice, err error) {
+
+	err = XTReadDB().Where("id in(?)", ids).Find(&info).Error
+	return info, err
+}
+
 func GetAdjustPricebyIdOne(ids []string) (adjust []*models.XtStockAdjustPrice, err error) {
 
 	err = XTReadDB().Where("id in(?) and status = 1", ids).Find(&adjust).Error
@@ -4366,3 +4379,144 @@ func GetReportStockList(startime int64, endtime int64, orgid int64, keyword stri
 	err = db.Select("x.id,x.good_name,x.specification_name,x.warehousing_unit,x.count,x.buy_price,x.packing_price,x.new_price,x.manufacturer,x.dealer,x.remark,x.good_id,x.warehousing_order,x.license_number,x.start_time,x.creater,x.checker,x.checker_status,x.checker_time,t.packing_unit,r.user_name").Joins("left join sgj_users.sgj_user_admin_role as r on r.admin_user_id = x.creater").Joins("left join xt_good_information as t on t.id =x.good_id").Count(&total).Offset(offset).Limit(limit).Scan(&adjust).Error
 	return adjust, total, err
 }
+
+func UpdateCheckDamage(ids []string, reportPrice models.XtStockReportPrice) error {
+
+	err := XTWriteDB().Model(&reportPrice).Where("id in(?) and status = 1", ids).Updates(map[string]interface{}{"checker": reportPrice.Checker, "checker_time": reportPrice.CheckerTime, "checker_status": reportPrice.CheckerStatus}).Error
+	return err
+}
+
+func CreateInentory(inventory models.XtStockInventory) error {
+
+	err = XTWriteDB().Create(&inventory).Error
+	return err
+}
+
+func GetInventorylist(startime int64, endtime int64, page int64, limit int64, inventory_status int64, keyword string, orgid int64) (adjust []*models.VmStockAdjustPrice, total int64, err error) {
+
+	likeKey := "%" + keyword + "%"
+	offset := (page - 1) * limit
+	db := XTReadDB().Table("xt_stock_inventory as x").Where("x.status = 1")
+	table := XTReadDB().Table("xt_good_information as t").Where("t.status = 1")
+	tab := UserReadDB().Table("sgj_user_admin_role as r").Where("r.status = 1")
+	fmt.Println(table, tab)
+	if startime > 0 {
+		db = db.Where("x.start_time>=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("x.end_time<=?", endtime)
+	}
+	if len(keyword) > 0 {
+		db = db.Where("x.warehousing_order like ?", likeKey)
+	}
+	if orgid > 0 {
+		db = db.Where("x.user_org_id = ?", orgid)
+	}
+	err = db.Select("x.id,x.good_name,x.specification_name,x.warehousing_unit,x.count,x.buy_price,x.packing_price,x.new_price,x.manufacturer,x.dealer,x.remark,x.good_id,x.warehousing_order,x.license_number,x.start_time,x.creater,x.checker,x.checker_status,x.checker_time,t.packing_unit,r.user_name").Joins("left join sgj_users.sgj_user_admin_role as r on r.admin_user_id = x.creater").Joins("left join xt_good_information as t on t.id =x.good_id").Count(&total).Offset(offset).Limit(limit).Scan(&adjust).Error
+	return adjust, total, err
+}
+
+func UpdateCheckInventory(ids []string, info models.XtStockInventory) error {
+	err := XTWriteDB().Model(&info).Where("id in(?)", ids).Updates(map[string]interface{}{"checker": info.Checker, "checker_status": info.CheckerStatus, "checker_time": info.CheckerTime}).Error
+	return err
+}
+
+func GetModifyPriceDetail(id int64) (models.XtStockAdjustPrice, error) {
+
+	info := models.XtStockAdjustPrice{}
+	err := XTReadDB().Model(&info).Where("id = ? and status = 1", id).Find(&info).Error
+	return info, err
+}
+
+func UpdateStockPrice(info models.XtStockAdjustPrice, id int64) error {
+
+	err := XTWriteDB().Model(&info).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"new_price": info.NewPrice}).Error
+	return err
+}
+
+func DeleteStockPrice(id int64) error {
+	info := models.XtStockAdjustPrice{}
+	err := XTWriteDB().Model(&info).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}
+
+func GetStockDamageDetail(id int64) (models.XtStockReportPrice, error) {
+	report := models.XtStockReportPrice{}
+	err := XTReadDB().Model(&report).Where("id=? and status = 1", id).Find(&report).Error
+	return report, err
+}
+
+func ModifyPrice(id int64, info models.XtStockReportPrice) error {
+
+	err := XTWriteDB().Model(&info).Where("id = ?", id).Updates(map[string]interface{}{"count": info.Count}).Error
+	return err
+}
+
+func DeleteDamage(id int64) error {
+	adjust := models.XtStockReportPrice{}
+	err := XTWriteDB().Model(&adjust).Where("id=? and status = 1", id).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}
+
+func GetStockDamageById(ids []string) (adjust []*models.XtStockReportPrice, err error) {
+
+	err = XTReadDB().Where("id in(?) and status = 1", ids).Find(&adjust).Error
+	return adjust, err
+}
+
+func GetInventoryDetail(id int64) (models.XtStockInventory, error) {
+
+	inventory := models.XtStockInventory{}
+	err := XTReadDB().Model(&inventory).Where("id=? and status = 1", id).Find(&inventory).Error
+	return inventory, err
+}
+
+func ModifyInventory(id int64, inventory models.XtStockInventory) error {
+
+	err := XTWriteDB().Model(&inventory).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"count": inventory.Count, "remark": inventory.Remark}).Error
+	return err
+}
+
+func DeleteInventory(id int64) error {
+
+	inventory := models.XtStockInventory{}
+	err := XTWriteDB().Model(&inventory).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}
+
+func GetInventoryDetailList(keyword string, limit int64, page int64, orgid int64) (list []*models.VmStockInventory, total int64, err error) {
+
+	likeKey := "%" + keyword + "%"
+	offset := (page - 1) * limit
+	db := XTReadDB().Table("xt_stock_inventory as x").Where("x.status = 1")
+	table := XTReadDB().Table("xt_good_information as t").Where("t.status = 1")
+	tab := UserReadDB().Table("sgj_user_admin_role as r").Where("r.status = 1")
+	fmt.Println(table, tab)
+	if len(keyword) > 0 {
+		db = db.Where("x.warehousing_order = ? or r.user_name like ?", keyword, likeKey)
+	}
+	if orgid > 0 {
+		db = db.Where("x.user_org_id = ?", orgid)
+	}
+	err = db.Select("x.id,x.good_name,x.specification_name,x.warehousing_unit,x.count,x.buy_price,x.packing_price,x.new_price,x.manufacturer,x.dealer,x.remark,x.good_id,x.warehousing_order,x.license_number,x.start_time,x.creater,x.checker,x.checker_status,x.checker_time,t.packing_unit").Joins("left join sgj_users.sgj_user_admin_role as r on r.id = x.creater").Joins("left join xt_good_information as t on t.id =x.good_id").Count(&total).Offset(offset).Limit(limit).Scan(&list).Error
+	return list, total, err
+}
+
+func GetInventoryPrintList(ids []string) (list []*models.XtStockInventory, err error) {
+
+	err = XTReadDB().Where("id in(?) and status = 1", ids).Find(&list).Error
+	return list, err
+}
+
+func GetInventoryDetailPrintList(ids []string) (list []*models.XtStockInventory, err error) {
+
+	err = XTReadDB().Where("id in(?) and status = 1", ids).Find(&list).Error
+	return list, err
+}
+
+func DeleteDrugPrice(id int64) error {
+
+	info := models.XtDrugAdjustPrice{}
+	err := XTReadDB().Model(&info).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}

service/user_service.go

@@ -177,9 +177,3 @@ func GetAllHisDoctor(orgid int64) (appRole []*models.App_Role, err error) {
 	err = UserReadDB().Where("org_id = ?  AND status = 1 AND  (user_type = ? OR user_type = ?) ", orgid, 2, 1).Find(&appRole).Error
 	return appRole, err
 }
-
-func UpdateCheckDamage(ids []string, reportPrice models.XtStockReportPrice) error {
-
-	err := XTWriteDB().Model(&reportPrice).Where("id in(?) and status = 1", ids).Updates(map[string]interface{}{"checker": reportPrice.Checker, "checker_time": reportPrice.CheckerTime}).Error
-	return err
-}