耗材参数

controllers/print_data_api_controller.go

@@ -92,13 +92,20 @@ func (this *PrintDataAPIController) StockRecordPrintData() {
 
 	list, err := service.FindPrintStockGoodInfoByType(types, startTime, endTime, adminUserInfo.CurrentOrgId)
 	stockTotal, err := service.GetOutStockTotalCountTwo(startTime, endTime, adminUserInfo.CurrentOrgId)
+
+	info, err := service.GetCoutWareseOutInfo(startTime, endTime, adminUserInfo.CurrentOrgId)
+
+	infomationList, err := service.GetGoodInfomationList(adminUserInfo.CurrentOrgId)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 	} else {
 		this.ServeSuccessJSON(map[string]interface{}{
-			"list":       list,
-			"type":       types,
-			"stockTotal": stockTotal,
+			"list":           list,
+			"type":           types,
+			"stockTotal":     stockTotal,
+			"info":           info,
+			"orgid":          adminUserInfo.CurrentOrgId,
+			"infomationList": infomationList,
 		})
 	}
 }

controllers/stock_in_api_controller.go

@@ -67,6 +67,8 @@ func StockManagerApiRegistRouters() {
 	beego.Router("/api/warehouseout/postsearchstock", &StockManagerApiController{}, "Get:PostSearchStock")
 
 	beego.Router("/api/warehouseout/getoutstocktotalcount", &StockManagerApiController{}, "Get:GetOutStockTotalCount")
+
+	beego.Router("/api/good/postgoodinformation", &StockManagerApiController{}, "Post:AddGoodInformation")
 }
 
 func (c *StockManagerApiController) CreateWarehouse() {
@@ -1379,7 +1381,7 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 					sys_record_time := int64(items["sys_record_time"].(float64))
 
 					warehouseOutInfo := &models.WarehouseOutInfo{
-						ID: id,
+						ID:                      id,
 						WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
 						WarehouseOutId:          warehouseOut.ID,
 						GoodId:                  good_id,
@@ -1804,10 +1806,16 @@ func (c *StockManagerApiController) GetQueryInfo() {
 	}
 	adminUserInfo := c.GetAdminUserInfo()
 	list, total, err := service.FindAllStockInfo(adminUserInfo.CurrentOrgId, page, limit, keyword, startTime, endTime, type_name)
+	info, err := service.GetCoutWareseOutInfo(startTime, endTime, adminUserInfo.CurrentOrgId)
+
+	infomationList, err := service.GetGoodInfomationList(adminUserInfo.CurrentOrgId)
 	if err == nil {
 		c.ServeSuccessJSON(map[string]interface{}{
-			"list":  list,
-			"total": total,
+			"list":           list,
+			"total":          total,
+			"info":           info,
+			"infomationList": infomationList,
+			"orgid":          adminUserInfo.CurrentOrgId,
 		})
 	} else {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
@@ -1993,3 +2001,62 @@ func (this *StockManagerApiController) GetOutStockTotalCount() {
 		"stockCount": stockCount,
 	})
 }
+
+func (this *StockManagerApiController) AddGoodInformation() {
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		return
+	}
+	utils.ErrorLog("%v", dataBody)
+
+	tempGoods := dataBody["goods"].([]interface{})
+	fmt.Println("3333333333", tempGoods)
+	var goods []*models.GoodInfo
+	for index, goodMap := range tempGoods {
+		goodNameM := goodMap.(map[string]interface{})
+		fmt.Println("00000", goodNameM)
+		var good models.GoodInfo
+		if goodNameM["good_name"] == nil || reflect.TypeOf(goodNameM["good_name"]).String() != "string" {
+			utils.ErrorLog("good_name")
+			return
+		}
+
+		good_name, _ := goodNameM["good_name"].(string)
+		if len(good_name) == 0 { //名字为空则生成一条导入错误日志
+			err_log := models.ExportErrLog{
+				LogType:    5,
+				UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
+				ErrMsg:     "第" + strconv.Itoa(index+3) + "行" + "的耗材名称不能为空",
+				Status:     1,
+				CreateTime: time.Now().Unix(),
+				UpdateTime: time.Now().Unix(),
+				ExportTime: time.Now().Unix(),
+			}
+			service.CreateExportErrLog(&err_log)
+			continue
+		}
+		fmt.Println("33333333", good_name)
+		good.GoodName = good_name
+		if goodNameM["medical_insurance_level"] == nil || reflect.TypeOf(goodNameM["medical_insurance_level"]).String() != "string" {
+			utils.ErrorLog("medical_insurance_level")
+			return
+		}
+		medical_insurance_level := goodNameM["medical_insurance_level"].(string)
+		medical_insurance_levels, _ := strconv.ParseInt(medical_insurance_level, 10, 64)
+		good.MedicalInsuranceLevel = medical_insurance_levels
+
+		goods = append(goods, &good)
+	}
+	adminUser := this.GetAdminUserInfo()
+	orgId := adminUser.CurrentOrgId
+	if len(goods) > 0 {
+		for _, item := range goods {
+			service.CreateGoodsInfomation(item, orgId)
+			this.ServeSuccessJSON(map[string]interface{}{
+				"msg": "导入成功",
+			})
+		}
+	}
+}

models/stock_models.go

@@ -308,3 +308,11 @@ type AutomaticReduceDetail struct {
 func (AutomaticReduceDetail) TableName() string {
 	return "xt_automatic_reduce_detail"
 }
+
+type VmWarehouseOutInfo struct {
+	GoodId int64   `gorm:"column:good_id" json:"good_id"`
+	Count  int64   `gorm:"column:count" json:"count"`
+	Remark string  `gorm:"column:remark" json:"remark"`
+	Price  float64 `gorm:"column:price" json:"price"`
+	OrgId  int64   `gorm:"column:org_id" json:"org_id"`
+}

service/print_data_service/schedule_dialysis/print_schedule_dialysis_service.go

@@ -198,3 +198,16 @@ func GetOutStockTotalCountTwo(startime int64, endtime int64, orgid int64) (autoM
 
 	return autoMatic, err
 }
+
+func GetCoutWareseOutInfo(startime int64, endtime int64, orgid int64) (houseOutInfo []*models.VmWarehouseOutInfo, err error) {
+
+	db := p_service.XTReadDB().Table("xt_warehouse_out_info as x").Where("x.status  =1")
+	err = db.Select("x.good_id,Sum(x.count) as count,x.remark,x.price,x.org_id").Where("x.ctime >=? and x.ctime<=? and x.org_id = ?", startime, endtime, orgid).Group("x.good_id").Scan(&houseOutInfo).Error
+	return houseOutInfo, err
+}
+
+func GetGoodInfomationList(orgid int64) (goodInfo []*models.GoodInfo, err error) {
+
+	err = p_service.XTReadDB().Where("org_id = ? and status = 1", orgid).Find(&goodInfo).Error
+	return goodInfo, err
+}

service/stock_service.go

@@ -2226,3 +2226,29 @@ func GetManufacturerName(orgid int64, name string) (*models.Manufacturer, error)
 	}
 	return &manufacturer, nil
 }
+
+func CreateGoodsInfomation(info *models.GoodInfo, orgid int64) error {
+
+	goodInfo := models.GoodInfo{
+		GoodName:              info.GoodName,
+		MedicalInsuranceLevel: info.MedicalInsuranceLevel,
+		OrgId:                 orgid,
+		Status:                1,
+		Ctime:                 time.Now().Unix(),
+	}
+	err := XTWriteDB().Create(&goodInfo).Error
+	return err
+}
+
+func GetCoutWareseOutInfo(startime int64, endtime int64, orgid int64) (houseOutInfo []*models.VmWarehouseOutInfo, err error) {
+
+	db := XTReadDB().Table("xt_warehouse_out_info as x").Where("x.status  =1")
+	err = db.Select("x.good_id,Sum(x.count) as count,x.remark,x.price,x.org_id").Where("x.ctime >=? and x.ctime<=? and x.org_id = ?", startime, endtime, orgid).Group("x.good_id").Scan(&houseOutInfo).Error
+	return houseOutInfo, err
+}
+
+func GetGoodInfomationList(orgid int64) (goodInfo []*models.GoodInfo, err error) {
+
+	err = XTReadDB().Where("org_id = ? and status = 1", orgid).Find(&goodInfo).Error
+	return goodInfo, err
+}