耗材参数

controllers/stock_in_api_controller.go

@@ -4877,11 +4877,42 @@ 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)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	fmt.Println(err)
 	orgId := this.GetAdminUserInfo().CurrentOrgId
-
-	list, _ := service.GetAllStockPrice(orgId)
+	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()
+	}
+	fmt.Println("startTime23232233223232323232323", startTime)
+	fmt.Println("endtime 23232232332232323232323232323", endTime)
+	list, _ := service.GetAllStockPrice(orgId, startTime, endTime, keyword)
+	doctor, _ := service.GetAllDoctorThree(orgId)
 	this.ServeSuccessJSON(map[string]interface{}{
-		"list": list,
+		"list":   list,
+		"doctor": doctor,
 	})
 }

models/stock_models.go

@@ -1,5 +1,7 @@
 package models
 
+import "XT/models"
+
 type Manufacturer struct {
 	ID               int64  `gorm:"column:id" json:"id"`
 	ManufacturerName string `gorm:"column:manufacturer_name" json:"manufacturer_name"`
@@ -802,6 +804,94 @@ type BloodWarehouseInfo struct {
 }
 
 type XtStockAdjustPrice 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"`
+	GoodInfo          models.GoodInfo        `gorm:"ForeignKey:ID;AssociationForeignKey:GoodId" `
+	AdminRole         models.VMUserAdminRole `gorm:"ForeignKey:ID;AssociationForeignKey:Creater" `
+}
+
+func (XtStockAdjustPrice) TableName() string {
+	return "xt_stock_adjust_price"
+}
+
+type VmUserAdminRole struct {
+	ID                                      int64  `gorm:"column:id" json:"id" form:"id"`
+	AdminUserId                             int64  `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	OrgId                                   int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	AppId                                   int64  `gorm:"column:app_id" json:"app_id" form:"app_id"`
+	RoleId                                  int64  `gorm:"column:role_id" json:"role_id" form:"role_id"`
+	UserName                                string `gorm:"column:user_name" json:"user_name" form:"user_name"`
+	Avatar                                  string `gorm:"column:avatar" json:"avatar" form:"avatar"`
+	UserType                                int64  `gorm:"column:user_type" json:"user_type" form:"user_type"`
+	UserTitle                               int64  `gorm:"column:user_title" json:"user_title" form:"user_title"`
+	Intro                                   string `gorm:"column:intro" json:"intro" form:"intro"`
+	Status                                  int64  `gorm:"column:status" json:"status" form:"status"`
+	Ctime                                   int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                                   int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	UserTitleName                           string `gorm:"column:user_title_name" json:"user_title_name" form:"user_title_name"`
+	RoleIds                                 string `gorm:"column:role_ids" json:"role_ids" form:"role_ids"`
+	Message                                 string `gorm:"column:message" json:"message" form:"message"`
+	Sex                                     int64  `gorm:"column:sex" json:"sex" form:"sex"`
+	Birthday                                int64  `gorm:"column:birthday" json:"birthday" form:"birthday"`
+	Sort                                    int64  `gorm:"column:sort" json:"sort" form:"sort"`
+	IsSort                                  int64  `gorm:"column:is_sort" json:"is_sort" form:"is_sort"`
+	Department                              string `gorm:"column:department" json:"department" form:"department"`
+	DepartmentId                            int64  `gorm:"column:department_id" json:"department_id" form:"department_id"`
+	Age                                     int64  `gorm:"column:age" json:"age" form:"age"`
+	Nation                                  string `gorm:"column:nation" json:"nation" form:"nation"`
+	CardType                                int64  `gorm:"column:card_type" json:"card_type" form:"card_type"`
+	IdCard                                  string `gorm:"column:id_card" json:"id_card" form:"id_card"`
+	Education                               int64  `gorm:"column:education" json:"education" form:"education"`
+	StudyMajorName                          string `gorm:"column:study_major_name" json:"study_major_name" form:"study_major_name"`
+	WorkMajorName                           string `gorm:"column:work_major_name" json:"work_major_name" form:"work_major_name"`
+	RoleType                                int64  `gorm:"column:role_type" json:"role_type" form:"role_type"`
+	MedicalCode                             string `gorm:"column:medical_code" json:"medical_code" form:"medical_code"`
+	DoctorCode                              string `gorm:"column:doctor_code" json:"doctor_code" form:"doctor_code"`
+	Licensing                               int64  `gorm:"column:licensing" json:"licensing" form:"licensing"`
+	JobNumber                               string `gorm:"column:job_number" json:"job_number" form:"job_number"`
+	PrescriptionQualificationIdentification int64  `gorm:"column:prescription_qualification_identification" json:"prescription_qualification_identification" form:"prescription_qualification_identification"`
+	IdentificationOutpatients               int64  `gorm:"column:identification_outpatients" json:"identification_outpatients" form:"identification_outpatients"`
+	StartTime                               int64  `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	MedicalRangeCode                        int64  `gorm:"column:medical_range_code" json:"medical_range_code" form:"medical_range_code"`
+	MedicalLevel                            int64  `gorm:"column:medical_level" json:"medical_level" form:"medical_level"`
+	MedicalTypeJob                          int64  `gorm:"column:medical_type_job" json:"medical_type_job" form:"medical_type_job"`
+	PharmacistRegistrationNumber            string `gorm:"column:pharmacist_registration_number" json:"pharmacist_registration_number" form:"pharmacist_registration_number"`
+	DoctorRangeCode                         int64  `gorm:"column:doctor_range_code" json:"doctor_range_code" form:"doctor_range_code"`
+	DoctorLevel                             int64  `gorm:"column:doctor_level" json:"doctor_level" form:"doctor_level"`
+	DoctorTypeJob                           int64  `gorm:"column:doctor_type_job" json:"doctor_type_job" form:"doctor_type_job"`
+	DoctorNumber                            string `gorm:"column:doctor_number" json:"doctor_number" form:"doctor_number"`
+	OutpatientIllnessCategory               string `gorm:"column:outpatient_illness_category" json:"outpatient_illness_category" form:"outpatient_illness_category"`
+	IsActive                                int64  `gorm:"column:is_active" json:"is_active" form:"is_active"`
+	ActiveStatus                            int64  `gorm:"column:active_status" json:"active_status" form:"active_status"`
+	IsMark                                  int64  `gorm:"column:is_mark" json:"is_mark" form:"is_mark"`
+}
+
+func (VmUserAdminRole) TableName() string {
+	return "sgj_user_admin_role"
+}
+
+type VmStockAdjustPrice 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"`
@@ -825,8 +915,6 @@ type XtStockAdjustPrice struct {
 	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 (XtStockAdjustPrice) TableName() string {
-	return "xt_stock_adjust_price"
+	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/stock_service.go

@@ -4304,8 +4304,24 @@ func CreateAdjustPrice(adjustPrice *models.XtStockAdjustPrice) error {
 	return err
 }
 
-func GetAllStockPrice(orgid int64) (list []*models.XtStockAdjustPrice, err error) {
-
-	err = XTReadDB().Model(&list).Where("user_org_id = ? and status = 1", orgid).Find(&list).Error
+func GetAllStockPrice(orgid int64, startime int64, endtime int64, keyword string) (list []*models.VmStockAdjustPrice, err error) {
+	likeKey := "%" + keyword + "%"
+	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")
+	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").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
 }