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

conf/app.conf

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

controllers/self_drug_api_congtroller.go

@@ -69,6 +69,14 @@ func SelfDrugRouters() {
 	beego.Router("/api/drug/deletedrugdamage", &SelfDrugApiController{}, "Get:DeleteDrugDamage")
 	beego.Router("/api/drug/getdrugdamageprint", &SelfDrugApiController{}, "Get:GetDrugDamagePrint")
 	beego.Router("/api/drug/warehouseinfobyid", &SelfDrugApiController{}, "Get:GetWarehoseInfoById")
+	beego.Router("/api/drug/savedruginventory", &SelfDrugApiController{}, "Post:SaveDrugInventory")
+	beego.Router("/api/drug/getdruginventorylist", &SelfDrugApiController{}, "Get:GetDrugInventoryList")
+	beego.Router("/api/drug/savedrugcheckinventory", &SelfDrugApiController{}, "Get:SaveDrugCheckInventory")
+	beego.Router("/api/drug/getdruginventorydetail", &SelfDrugApiController{}, "Get:GetDrugInventoryDetail")
+	beego.Router("/api/drug/modifyinventory", &SelfDrugApiController{}, "Get:ModifyInventory")
+	beego.Router("/api/drug/deletedruginventory", &SelfDrugApiController{}, "Delete:DeleteDrugInventory")
+	beego.Router("/api/drug/getdruginventoryprintlist", &SelfDrugApiController{}, "Get:GetDrugInventoryPrintList")
+	beego.Router("/api/drug/getinventorydetaillist", &SelfDrugApiController{}, "Get:GetDrugInventoryDetailList")
 }
 
 func (this *SelfDrugApiController) GetCurrentPatient() {
@@ -1391,8 +1399,7 @@ func (this *SelfDrugApiController) GetDrugDamageList() {
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更新设备失败")
 		return
 	}
-	fmt.Println("list232332", list)
-	fmt.Println("total", total)
+
 	this.ServeSuccessJSON(map[string]interface{}{
 		"total":      total,
 		"list":       list,
@@ -1554,3 +1561,373 @@ func (this *SelfDrugApiController) GetWarehoseInfoById() {
 		"list": list,
 	})
 }
+
+func (this *SelfDrugApiController) SaveDrugInventory() {
+
+	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["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()
+			}
+
+			if items["product_date"] == nil || reflect.TypeOf(items["product_date"]).String() != "float64" {
+				utils.ErrorLog("product_date")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			product_date := int64(items["product_date"].(float64))
+			if items["expiry_date"] == nil || reflect.TypeOf(items["expiry_date"]).String() != "float64" {
+				utils.ErrorLog("expiry_date")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			expiry_date := int64(items["expiry_date"].(float64))
+			orgId := this.GetAdminUserInfo().CurrentOrgId
+			Creater := this.GetAdminUserInfo().AdminUser.Id
+
+			if items["number"] == nil || reflect.TypeOf(items["number"]).String() != "string" {
+				utils.ErrorLog("number")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+
+			numbers := items["number"].(string)
+
+			if items["batch_number"] == nil || reflect.TypeOf(items["batch_number"]).String() != "string" {
+				utils.ErrorLog("batch_number")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+
+			batch_number := items["batch_number"].(string)
+
+			inventory := models.XtDrugInventory{
+
+				DrugName:          drug_name,
+				SpecificationName: specification_name,
+				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,
+				LicenseNumber:     "",
+				StartTime:         startTime,
+				Creater:           Creater,
+				Checker:           0,
+				CheckerStatus:     2,
+				CheckerTime:       0,
+				ExpiryDate:        expiry_date,
+				ProductDate:       product_date,
+				Number:            numbers,
+				BatchNumber:       batch_number,
+			}
+			err = service.CreateDrugInventory(inventory)
+			fmt.Println(err)
+		}
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"msg": "msg",
+	})
+}
+
+func (this *SelfDrugApiController) GetDrugInventoryList() {
+	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.GetDrugInventoryList(keyword, page, limit, orgId, startTime, endTime)
+	fmt.Println("list23232323223", list)
+	doctorList, _ := 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) SaveDrugCheckInventory() {
+
+	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")
+	inventory := models.XtDrugInventory{
+		Checker:       checker,
+		CheckerStatus: 1,
+		CheckerTime:   checkTime,
+	}
+	err = service.UpdateDrugInventory(ids, inventory)
+	fmt.Println(err)
+	returnData := make(map[string]interface{}, 0)
+	returnData["msg"] = "ok"
+	this.ServeSuccessJSON(returnData)
+}
+
+func (this *SelfDrugApiController) GetDrugInventoryDetail() {
+
+	id, _ := this.GetInt64("id")
+	detail, err := service.GetDrugInventoryDetail(id)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更新设备失败")
+		return
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"detail": detail,
+	})
+}
+
+func (this *SelfDrugApiController) ModifyInventory() {
+
+	id, _ := this.GetInt64("id")
+	drug_id, _ := this.GetInt64("drug_id")
+	drug_name := this.GetString("drug_name")
+	specification_name := this.GetString("specification_name")
+	retailPrice := this.GetString("retail_price")
+	retail_price, _ := strconv.ParseFloat(retailPrice, 64)
+	warehousing_order := this.GetString("warehousing_order")
+	number := this.GetString("number")
+	manufacturer := this.GetString("manufacturer")
+	remark := this.GetString("remark")
+	warehousing_unit := this.GetString("warehousing_unit")
+	total, _ := this.GetInt64("total")
+	lastPrice := this.GetString("last_price")
+	last_price, _ := strconv.ParseFloat(lastPrice, 64)
+	count, _ := this.GetInt64("count")
+	drug_origin_place := this.GetString("drug_origin_place")
+	inventory := models.XtDrugInventory{
+		DrugName:          drug_name,
+		SpecificationName: specification_name,
+		WarehousingUnit:   warehousing_unit,
+		Count:             count,
+		LastPrice:         last_price,
+		RetailPrice:       retail_price,
+		Manufacturer:      manufacturer,
+		Remark:            remark,
+		DrugId:            drug_id,
+		WarehousingOrder:  warehousing_order,
+		Number:            number,
+		Total:             total,
+		DrugOriginPlace:   drug_origin_place,
+	}
+	err := service.ModifyDrugInventory(id, inventory)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更新设备失败")
+		return
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"inventory": inventory,
+	})
+}
+
+func (this *SelfDrugApiController) DeleteDrugInventory() {
+
+	id, _ := this.GetInt64("id")
+	err := service.DeleteDrugInventory(id)
+	fmt.Println(err)
+	returnData := make(map[string]interface{}, 0)
+	returnData["msg"] = "ok"
+	this.ServeSuccessJSON(returnData)
+}
+
+func (this *SelfDrugApiController) GetDrugInventoryPrintList() {
+
+	ids := this.GetString("ids")
+
+	idssplit := strings.Split(ids, ",")
+	list, err := service.GetDrugInventoryPrintList(idssplit)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更新设备失败")
+		return
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+	})
+}
+
+func (this *SelfDrugApiController) GetDrugInventoryDetailList() {
+
+	keyword := this.GetString("keyword")
+	limit, _ := this.GetInt64("limit")
+	page, _ := this.GetInt64("page")
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	list, total, err := service.GetDrugInventoryDetailList(keyword, page, limit, orgId)
+	fmt.Println("list23232323223", list)
+	doctorList, _ := service.GetAllDoctorThree(orgId)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更新设备失败")
+		return
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"total":      total,
+		"list":       list,
+		"doctorList": doctorList,
+	})
+}

controllers/stock_in_api_controller.go

@@ -125,6 +125,7 @@ func StockManagerApiRegistRouters() {
 	beego.Router("/api/stock/getinventoryprintlist", &StockManagerApiController{}, "Get:GetInventoryPrintList")
 	beego.Router("/api/stock/getinventorydetailprintlist", &StockManagerApiController{}, "Get:GetInventoryDetailPrintList")
 	beego.Router("/api/drug/deletedrugprice", &StockManagerApiController{}, "Get:DeleteDrugPrice")
+	beego.Router("/api/stock/getgoodwarehouselist", &StockManagerApiController{}, "Get:GetGoodWarehouseList")
 }
 
 func (c *StockManagerApiController) CreateWarehouse() {
@@ -5091,13 +5092,6 @@ 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")
-			//	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)
@@ -5121,6 +5115,34 @@ func (this *StockManagerApiController) SaveReportStock() {
 				}
 				startTime = theTime.Unix()
 			}
+
+			if items["number"] == nil || reflect.TypeOf(items["number"]).String() != "string" {
+				utils.ErrorLog("number")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			number := items["number"].(string)
+
+			if items["warehousing_info_id"] == nil || reflect.TypeOf(items["warehousing_info_id"]).String() != "float64" {
+				utils.ErrorLog("warehousing_info_id")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			warehousing_info_id := int64(items["warehousing_info_id"].(float64))
+
+			if items["expiry_date"] == nil || reflect.TypeOf(items["expiry_date"]).String() != "float64" {
+				utils.ErrorLog("expiry_date")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			expiry_date := int64(items["expiry_date"].(float64))
+
+			if items["product_date"] == nil || reflect.TypeOf(items["product_date"]).String() != "float64" {
+				utils.ErrorLog("product_date")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			product_date := int64(items["product_date"].(float64))
 			orgId := this.GetAdminUserInfo().CurrentOrgId
 			Creater := this.GetAdminUserInfo().AdminUser.Id
 			reportPrice := models.XtStockReportPrice{
@@ -5130,22 +5152,25 @@ func (this *StockManagerApiController) SaveReportStock() {
 				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,
+				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,
+				Number:            number,
+				WarehousingInfoId: warehousing_info_id,
+				ExpiryDate:        expiry_date,
+				ProductDate:       product_date,
 			}
 			err := service.CreateReportPrice(&reportPrice)
 			fmt.Println(err)
@@ -5224,6 +5249,118 @@ func (this *StockManagerApiController) SaveCheckDamage() {
 	}
 	err := service.UpdateCheckDamage(ids, reportprice)
 	fmt.Println(err)
+
+	//获取当前核对的数据
+	list, _ := service.GetCheckDamageList(ids)
+
+	ctime := time.Now().Unix()
+	adminUserInfo := this.GetAdminUserInfo()
+
+	warehousing_out_time := this.GetString("warehousing_out_time")
+	warehousingOutDate, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", warehousing_out_time)
+	if parseDateErr != nil {
+		this.ErrorLog("日期(%v)解析错误：%v", warehousingOutDate, parseDateErr)
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	timeStr := time.Now().Format("2006-01-02")
+	timeArr := strings.Split(timeStr, "-")
+	total, _ := service.FindAllWarehouseOut(adminUserInfo.CurrentOrgId)
+
+	total = total + 1
+	warehousing_out_order := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
+	number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
+	number = number + total
+	warehousing_out_order = "CKD" + strconv.FormatInt(number, 10)
+	operation_time := time.Now().Unix()
+	creater := adminUserInfo.AdminUser.Id
+
+	warehouseOut := models.WarehouseOut{
+		WarehouseOutOrderNumber: warehousing_out_order,
+		OperationTime:           operation_time,
+		OrgId:                   adminUserInfo.CurrentOrgId,
+		Creater:                 creater,
+		Ctime:                   ctime,
+		Status:                  1,
+		WarehouseOutTime:        warehousingOutDate.Unix(),
+		Type:                    2,
+	}
+
+	_, errcodes := service.FindStockOutByIsSys(adminUserInfo.CurrentOrgId, 0, operation_time)
+	if errcodes == gorm.ErrRecordNotFound {
+		service.AddSigleWarehouseOut(&warehouseOut)
+	}
+	manufacturerList, _ := service.GetAllManufacturerList(adminUserInfo.CurrentOrgId)
+	dealerList, _ := service.GetAllDealerList(adminUserInfo.CurrentOrgId)
+	var manufacturer_id int64
+	var dealer_id int64
+
+	for _, item := range list {
+		for _, it := range manufacturerList {
+			if item.Manufacturer == it.ManufacturerName {
+				manufacturer_id = it.ID
+			}
+		}
+		for _, its := range dealerList {
+			if item.Dealer == its.DealerName {
+				dealer_id = its.ID
+			}
+		}
+		//插入出库单
+		warehouseOutInfo := &models.WarehouseOutInfo{
+			WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
+			WarehouseOutId:          warehouseOut.ID,
+			GoodId:                  item.GoodId,
+			Count:                   item.Count,
+			Price:                   item.PackingPrice,
+			Status:                  1,
+			Ctime:                   ctime,
+			Remark:                  item.Remark,
+			OrgId:                   adminUserInfo.CurrentOrgId,
+			Type:                    2,
+			Manufacturer:            manufacturer_id,
+			Number:                  item.Number,
+			ExpiryDate:              item.ExpiryDate,
+			ProductDate:             item.ProductDate,
+			Dealer:                  dealer_id,
+			LicenseNumber:           item.LicenseNumber,
+		}
+		errOne := service.AddSigleWarehouseOutInfo(warehouseOutInfo)
+		fmt.Println(errOne)
+
+		flow := models.VmStockFlow{
+			WarehousingId:           0,
+			GoodId:                  item.GoodId,
+			Number:                  item.Number,
+			LicenseNumber:           "",
+			Count:                   item.Count,
+			UserOrgId:               adminUserInfo.CurrentOrgId,
+			PatientId:               0,
+			SystemTime:              time.Now().Unix(),
+			ConsumableType:          5,
+			IsSys:                   0,
+			WarehousingOrder:        "",
+			WarehouseOutId:          warehouseOutInfo.ID,
+			WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
+			IsEdit:                  0,
+			CancelStockId:           0,
+			CancelOrderNumber:       "",
+			Manufacturer:            0,
+			Dealer:                  0,
+			Creator:                 adminUserInfo.AdminUser.Id,
+			UpdateCreator:           0,
+			Status:                  1,
+			Ctime:                   time.Now().Unix(),
+			Mtime:                   0,
+			Price:                   item.PackingPrice,
+			WarehousingDetailId:     0,
+			WarehouseOutDetailId:    0,
+			CancelOutDetailId:       0,
+			ProductDate:             item.ProductDate,
+			ExpireDate:              item.ExpiryDate,
+		}
+		service.CreateStockFlowOne(flow)
+	}
 	this.ServeSuccessJSON(map[string]interface{}{
 		"reportPrice": reportprice,
 	})
@@ -5483,8 +5620,17 @@ func (this *StockManagerApiController) UpdateStockPrice() {
 	id, _ := this.GetInt64("id")
 	newPrice := this.GetString("new_price")
 	new_price, _ := strconv.ParseFloat(newPrice, 64)
+	good_name := this.GetString("good_name")
+	packingPrice := this.GetString("packing_price")
+	packing_price, _ := strconv.ParseFloat(packingPrice, 64)
+	remark := this.GetString("remark")
+	good_id, _ := this.GetInt64("good_id")
 	adjust := models.XtStockAdjustPrice{
-		NewPrice: new_price,
+		NewPrice:     new_price,
+		GoodName:     good_name,
+		PackingPrice: packing_price,
+		Remark:       remark,
+		GoodId:       good_id,
 	}
 	err := service.UpdateStockPrice(adjust, id)
 	fmt.Println(err)
@@ -5624,3 +5770,12 @@ func (this *StockManagerApiController) DeleteDrugPrice() {
 	this.ServeSuccessJSON(returnData)
 	return
 }
+
+func (this *StockManagerApiController) GetGoodWarehouseList() {
+
+	id, _ := this.GetInt64("id")
+	list, _ := service.GetGoodWarehouseList(id)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+	})
+}

models/new_monitor.go

@@ -48,6 +48,7 @@ type VMMonitorDialysisOrder struct {
 	BedID        int64        `gorm:"column:bed_id" json:"bed_id"`
 	Status       int64        `gorm:"column:status" json:"status"`
 	DeviceNumber DeviceNumber `gorm:"ForeignKey:BedId" json:"device_number"`
+	StartTime    int64        `gorm:"column:start_time" json:"start_time"`
 }
 
 func (VMMonitorDialysisOrder) TableName() string {

models/self_drug_models.go

@@ -729,3 +729,73 @@ type XtDrugDamage struct {
 func (XtDrugDamage) TableName() string {
 	return "xt_drug_damage"
 }
+
+type XtDrugInventory 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"`
+	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"`
+	ExpiryDate        int64   `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
+	ProductDate       int64   `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	Number            string  `gorm:"column:number" json:"number" form:"number"`
+	BatchNumber       string  `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	UserName          string  `gorm:"column:user_name" json:"user_name" form:"user_name"`
+	Total             int64   `gorm:"column:total" json:"total" form:"total"`
+	DrugOriginPlace   string  `gorm:"column:drug_origin_place" json:"drug_origin_place" form:"drug_origin_place"`
+}
+
+func (XtDrugInventory) TableName() string {
+	return "xt_drug_inventory"
+}
+
+type VmDrugInventory 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"`
+	MinNumber         int64   `gorm:"column:min_number" json:"min_number" form:"min_number"`
+	Dose              float64 `gorm:"column:dose" json:"dose" form:"dose"`
+	DoseUnit          string  `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
+	MaxUnit           string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinUnit           string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	Total             int64   `gorm:"column:total" json:"total" form:"total"`
+	DrugOriginPlace   string  `gorm:"column:drug_origin_place" json:"drug_origin_place" form:"drug_origin_place"`
+}

models/stock_models.go

@@ -941,6 +941,10 @@ type XtStockReportPrice 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"`
+	Number            string  `gorm:"column:number" json:"number" form:"number"`
+	WarehousingInfoId int64   `gorm:"column:warehousing_info_id" json:"warehousing_info_id" form:"warehousing_info_id"`
+	ExpiryDate        int64   `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
+	ProductDate       int64   `gorm:"column:product_date" json:"product_date" form:"product_date"`
 }
 
 func (XtStockReportPrice) TableName() string {

service/self_drug_service.go

@@ -933,3 +933,82 @@ func GetWarehoseInfoById(id int64) (info []*models.XtDrugWarehouseInfo, err erro
 	err = XTReadDB().Model(&info).Where("drug_id=? and status = 1", id).Find(&info).Error
 	return info, err
 }
+
+func CreateDrugInventory(inventory models.XtDrugInventory) error {
+
+	err := XTWriteDB().Create(&inventory).Error
+	return err
+}
+
+func GetDrugInventoryList(keyword string, page int64, limit int64, orgid int64, startime int64, endtime int64) (list []*models.VmDrugInventory, total int64, err error) {
+	fmt.Println("startdate", limit, page)
+	likeKey := "%" + keyword + "%"
+	offset := (page - 1) * limit
+	db := XTReadDB().Table("xt_drug_inventory as x").Where("x.status = 1")
+	table := XTReadDB().Table("xt_base_drug 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)
+	}
+	if startime > 0 {
+		db = db.Where("x.start_time >=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("x.start_time<=?", endtime)
+	}
+	err = db.Select("x.id,x.drug_name,x.specification_name,x.warehousing_unit,x.count,x.last_price,x.retail_price,x.manufacturer,x.dealer,x.remark,x.drug_id,x.warehousing_order,x.number,x.batch_number,x.start_time,x.creater,x.checker,x.checker_status,x.checker_time,t.dose,t.dose_unit,t.max_unit,t.min_unit").Joins("left join sgj_users.sgj_user_admin_role as r on r.id = x.creater").Joins("left join xt_base_drug as t on t.id =x.drug_id").Count(&total).Offset(offset).Limit(limit).Scan(&list).Error
+	return list, total, err
+}
+
+func UpdateDrugInventory(ids []string, inventory models.XtDrugInventory) error {
+
+	err := XTWriteDB().Model(&inventory).Where("id in(?) and status = 1", ids).Updates(map[string]interface{}{"checker": inventory.Checker, "checker_status": inventory.CheckerStatus, "checker_time": inventory.CheckerTime}).Error
+	return err
+}
+
+func GetDrugInventoryDetail(id int64) (models.XtDrugInventory, error) {
+
+	inventory := models.XtDrugInventory{}
+	err := XTReadDB().Model(&inventory).Where("id = ? and status = 1", id).Find(&inventory).Error
+	return inventory, err
+}
+
+func ModifyDrugInventory(id int64, info models.XtDrugInventory) error {
+
+	err := XTWriteDB().Model(&info).Where("id=? and status = 1", id).Updates(map[string]interface{}{"drug_name": info.DrugName, "specification_name": info.SpecificationName, "warehousing_unit": info.WarehousingUnit, "count": info.Count, "last_price": info.LastPrice, "manufacturer": info.Manufacturer, "remark": info.Remark, "drug_id": info.DrugId, "warehousing_order": info.WarehousingOrder, "number": info.Number, "total": info.Number, "drug_origin_place": info.DrugOriginPlace}).Error
+	return err
+}
+
+func DeleteDrugInventory(id int64) error {
+	inventory := models.XtDrugInventory{}
+	err := XTWriteDB().Model(&inventory).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}
+
+func GetDrugInventoryPrintList(ids []string) (info []*models.XtDrugInventory, err error) {
+
+	err = XTReadDB().Where("id in(?) and status = 1", ids).Find(&info).Error
+	return info, err
+}
+
+func GetDrugInventoryDetailList(keyword string, page int64, limit int64, orgid int64) (list []*models.VmDrugInventory, total int64, err error) {
+	fmt.Println("startdate", limit, page)
+	likeKey := "%" + keyword + "%"
+	offset := (page - 1) * limit
+	db := XTReadDB().Table("xt_drug_inventory as x").Where("x.status = 1")
+	table := XTReadDB().Table("xt_base_drug 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.drug_name,x.specification_name,x.warehousing_unit,x.count,x.last_price,x.retail_price,x.manufacturer,x.dealer,x.remark,x.drug_id,x.warehousing_order,x.number,x.batch_number,x.start_time,x.creater,x.checker,x.checker_status,x.checker_time,x.total,x.drug_origin_place,t.dose,t.dose_unit,t.max_unit,t.min_unit").Joins("left join sgj_users.sgj_user_admin_role as r on r.id = x.creater").Joins("left join xt_base_drug as t on t.id =x.drug_id").Count(&total).Offset(offset).Limit(limit).Scan(&list).Error
+	return list, total, err
+}

service/stock_service.go

@@ -4323,7 +4323,7 @@ func GetAllStockPrice(orgid int64, startime int64, endtime int64, keyword string
 	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
+	err = db.Group("x.id").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.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(&list).Error
 	return list, total, err
 }
 
@@ -4376,7 +4376,7 @@ func GetReportStockList(startime int64, endtime int64, orgid int64, keyword stri
 	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
+	err = db.Group("x.id").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
 }
 
@@ -4386,6 +4386,12 @@ func UpdateCheckDamage(ids []string, reportPrice models.XtStockReportPrice) erro
 	return err
 }
 
+func GetCheckDamageList(ids []string) (report []*models.XtStockReportPrice, err error) {
+
+	err = XTReadDB().Model(&report).Where("id in(?) and status= 1", ids).Find(&report).Error
+	return report, err
+}
+
 func CreateInentory(inventory models.XtStockInventory) error {
 
 	err = XTWriteDB().Create(&inventory).Error
@@ -4430,7 +4436,7 @@ func GetModifyPriceDetail(id int64) (models.XtStockAdjustPrice, error) {
 
 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
+	err := XTWriteDB().Model(&info).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"new_price": info.NewPrice, "good_name": info.GoodName, "packing_price": info.PackingPrice, "good_id": info.GoodId, "remark": info.Remark}).Error
 	return err
 }
 
@@ -4520,3 +4526,14 @@ func DeleteDrugPrice(id int64) error {
 	err := XTReadDB().Model(&info).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"status": 0}).Error
 	return err
 }
+
+func GetGoodWarehouseList(goodid int64) (models.WarehousingInfo, error) {
+
+	info := models.WarehousingInfo{}
+	db := XTReadDB().Model(&info).Where("status = 1")
+	if goodid > 0 {
+		db = db.Where("good_id = ?", goodid)
+	}
+	err := db.Select("good_id,sum(stock_count) as stock_count").Find(&info).Error
+	return info, err
+}