Merge branch '20201014_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20201014_xt_api_new_branch

controllers/drug_stock_api_contorller.go

 		return
 	}
 
-	warehousingInfo, err := service.FindDrugWarehousingInfoById(id, admin.CurrentOrgId)
-	fmt.Println("warehousinginfo000000000000000", warehousingInfo)
+	warehousingInfo, err := service.FindDrugWarehousingInfoByIdThree(id, admin.CurrentOrgId)
+
 	if err == nil {
 		c.ServeSuccessJSON(map[string]interface{}{
 			"info":             warehousingInfo,

controllers/self_drug_api_congtroller.go

 				return
 			}
 			warehouse_info_id := int64(items["warehouse_info_id"].(float64))
+
+			if items["total"] == nil || reflect.TypeOf(items["total"]).String() != "string" {
+				utils.ErrorLog("total")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+
+			total := items["total"].(string)
 			inventory := models.XtDrugInventory{
 
 				DrugName:          drug_name,
 				ProductDate:       product_date,
 				Number:            numbers,
 				//BatchNumber:       batch_number,
+				Total:           total,
 				WarehouseInfoId: warehouse_info_id,
 			}
 			err = service.CreateDrugInventory(inventory)
 	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

service/stock_service.go

 	return list, err
 }
 
+func FindDrugWarehousingInfoByIdThree(id int64, org_id int64) (list []*VMDrugWarehouseInfo, err error) {
+	err = readDb.Model(&VMDrugWarehouseInfo{}).Preload("Drug", "status = 1 AND org_id = ?", org_id).Where("warehousing_id = ? AND status = 1", id).Find(&list).Error
+	return list, err
+}
+
 func FindDrugWarehousingInfoByIdOne(id []string, org_id int64) (list []*models.StDrugWarehouseInfo, err error) {
 
 	db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status = 1")