耗材参数

controllers/drug_stock_api_contorller.go

@@ -1179,19 +1179,25 @@ func (c *StockDrugApiController) CreateDrugWarehouseOut() {
 				}
 				price, _ := strconv.ParseFloat(items["price"].(string), 64)
 
-				if items["last_price"] == nil || reflect.TypeOf(items["last_price"]).String() != "string" {
-					utils.ErrorLog("last_price")
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-					return
-				}
-				last_price, _ := strconv.ParseFloat(items["last_price"].(string), 64)
-
+				//if items["last_price"] == nil || reflect.TypeOf(items["last_price"]).String() != "string" {
+				//	utils.ErrorLog("last_price")
+				//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				//	return
+				//}
+				//last_price, _ := strconv.ParseFloat(items["last_price"].(string), 64)
+				//fmt.Println(last_price)
 				count, _ := strconv.ParseInt(items["count"].(string), 10, 64)
 
 				total := float64(count) * price
-				retail_price_total := float64(count) * last_price
+				retail_price_total := float64(count) * price
 				remark := items["remark"].(string)
 				max_unit := items["max_unit"].(string)
+				dealer := int64(items["dealer"].(float64))
+				fmt.Println("dealer2222222222222222222", dealer)
+				manufacturer := int64(items["manufacturer"].(float64))
+				fmt.Println("manufacturer22222222222222", manufacturer)
+				number := items["number"].(string)
+				batch_number := items["batch_number"].(string)
 				var productDates int64
 				var expiryDates int64
 				if items["expiry_date"] == nil || reflect.TypeOf(items["expiry_date"]).String() != "string" {
@@ -1222,13 +1228,6 @@ func (c *StockDrugApiController) CreateDrugWarehouseOut() {
 
 				}
 
-				dealer := int64(items["dealer"].(float64))
-
-				manufacturer := int64(items["manufacturer"].(float64))
-
-				number := items["number"].(string)
-				batch_number := items["batch_number"].(string)
-
 				warehouseOutInfo := &models.DrugWarehouseOutInfo{
 					WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
 					WarehouseOutId:          warehouseOut.ID,
@@ -1243,13 +1242,14 @@ func (c *StockDrugApiController) CreateDrugWarehouseOut() {
 					Type:                    types,
 					Manufacturer:            manufacturer,
 					Dealer:                  dealer,
-					RetailPrice:             last_price,
+					RetailPrice:             price,
 					RetailTotalPrice:        retail_price_total,
 					CountUnit:               max_unit,
 					ExpiryDate:              expiryDates,
 					ProductDate:             productDates,
 					Number:                  number,
 					BatchNumber:             batch_number,
+					IsSys:                   0,
 				}
 				warehousingOutInfo = append(warehousingOutInfo, warehouseOutInfo)
 
@@ -1488,7 +1488,7 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 					return
 				}
 				price, _ := strconv.ParseFloat(items["price"].(string), 64)
-
+				fmt.Println("price23223232323232323232323232322322", price)
 				if items["retail_price"] == nil || reflect.TypeOf(items["retail_price"]).String() != "string" {
 					utils.ErrorLog("retail_price")
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)

controllers/stock_in_api_controller.go

@@ -92,6 +92,7 @@ func StockManagerApiRegistRouters() {
 	beego.Router("/api/stock/getexportstocklist", &StockManagerApiController{}, "Get:GetExprotStockList")
 	beego.Router("/api/stock/getoutexprotlist", &StockManagerApiController{}, "Get:GetOutExprotList")
 	beego.Router("/api/stock/getsinglecancelorder", &StockManagerApiController{}, "Get:GetSingleCancelOrder")
+	beego.Router("/api/stock/getcancelstockorderprint", &StockManagerApiController{}, "Get:GetCancelStockOrderPrint")
 
 }
 
@@ -1141,7 +1142,7 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 					return
 				}
 				price, _ := strconv.ParseFloat(items["price"].(string), 64)
-
+				fmt.Println("999999992932323232323223232322323", price)
 				count, _ := strconv.ParseInt(items["count"].(string), 10, 64)
 
 				total := float64(count) * price
@@ -1232,6 +1233,7 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 			})
 			return
 		} else {
+			fmt.Println("jiage223444444444444444444", item.Price)
 			_, errcodes := service.FindStockOutByIsSys(adminUserInfo.CurrentOrgId, 0, operation_time)
 			if errcodes == gorm.ErrRecordNotFound {
 				service.AddSigleWarehouseOut(&warehouseOut)
@@ -1678,11 +1680,12 @@ func (c *StockManagerApiController) CreateCancelStock() {
 
 	// 改变入库单的值
 	for _, item := range cancelStockInfos {
-
+		fmt.Println("经理俄2433444 我认为侮辱侮辱侮辱侮辱侮辱侮辱我无污染武荣", item.GoodId, item.OrgId)
 		//查询该耗材的入库记录
 		list, _ := service.GetWarehoureOrderInfoList(item.GoodId, item.OrgId)
 		//调用退库的方法
-		service.UpdateCancelOut(list, item.Count)
+		parseDateErr := service.UpdateCancelOut(list, item.Count)
+		fmt.Println("999999999999", parseDateErr)
 	}
 
 	if errs != nil {
@@ -1789,9 +1792,6 @@ func (this *StockManagerApiController) DeleteCancelStockInfo() {
 func (c *StockManagerApiController) EditCancelStock() {
 	cancel_time := c.GetString("cancel_time")
 	id, _ := c.GetInt64("id", 0)
-	types, _ := c.GetInt64("type", 0)
-	manufacturer_id, _ := c.GetInt64("manufacturer_id", 0)
-	dealer_id, _ := c.GetInt64("dealer_id", 0)
 
 	if id == 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -1812,11 +1812,9 @@ func (c *StockManagerApiController) EditCancelStock() {
 	cancelStock, _ := service.FindCancelStockById(id, c.GetAdminUserInfo().CurrentOrgId)
 
 	tempCancelStock := models.CancelStock{
-		ID:           cancelStock.ID,
-		Mtime:        mtime,
-		ReturnTime:   cancelDate.Unix(),
-		Manufacturer: manufacturer_id,
-		Dealer:       dealer_id,
+		ID:         cancelStock.ID,
+		Mtime:      mtime,
+		ReturnTime: cancelDate.Unix(),
 	}
 
 	service.EditCancelStock(tempCancelStock)
@@ -1878,9 +1876,6 @@ func (c *StockManagerApiController) EditCancelStock() {
 						OrderNumber:   cancelStock.OrderNumber,
 						CancelStockId: cancelStock.ID,
 						Mtime:         time.Now().Unix(),
-						Type:          types,
-						Manufacturer:  manufacturer_id,
-						Dealer:        dealer_id,
 					}
 					cancelStockInfos = append(cancelStockInfos, cancelStockInfo)
 
@@ -1896,9 +1891,6 @@ func (c *StockManagerApiController) EditCancelStock() {
 						OrderNumber:   cancelStock.OrderNumber,
 						CancelStockId: cancelStock.ID,
 						Mtime:         time.Now().Unix(),
-						Type:          types,
-						Manufacturer:  manufacturer_id,
-						Dealer:        dealer_id,
 					}
 					upDateCancelStockInfos = append(upDateCancelStockInfos, cancelStockInfo)
 				}
@@ -1908,11 +1900,42 @@ func (c *StockManagerApiController) EditCancelStock() {
 	var errs error
 	if len(cancelStockInfos) > 0 {
 		errs = service.CreateCancelStockInfo(cancelStockInfos)
+		// 改变入库单的值
+		for _, item := range cancelStockInfos {
+			//查询该耗材的入库记录
+			list, _ := service.GetWarehoureOrderInfoList(item.GoodId, item.OrgId)
+			//调用退库的方法
+			parseDateErr := service.UpdateCancelOut(list, item.Count)
+			if parseDateErr != nil {
+				utils.ErrorLog(errs.Error())
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockInFail)
+				return
+			}
+
+			c.ServeSuccessJSON(map[string]interface{}{
+				"msg": "编辑成功",
+			})
+		}
 	}
 
 	if len(upDateCancelStockInfos) > 0 {
 		for _, item := range upDateCancelStockInfos {
+
 			errs = service.UpDateCancelStockInfo(item)
+			list, _ := service.GetWarehoureOrderInfoList(item.GoodId, item.OrgId)
+			//调用退库的方法
+			parseDateErr := service.UpdateCancelOut(list, item.Count)
+			fmt.Println("999999999999", parseDateErr)
+
+			if parseDateErr != nil {
+				utils.ErrorLog(errs.Error())
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockInFail)
+				return
+			}
+
+			c.ServeSuccessJSON(map[string]interface{}{
+				"msg": "编辑成功",
+			})
 		}
 	}
 
@@ -3910,11 +3933,12 @@ func (this *StockManagerApiController) GetStockDrugCount() {
 	count, _ := service.GetStockDrugCount(startTime, endTime, orgId)
 	outList, _ := service.GetAutoDiallysisBefor(startTime, endTime, orgId)
 	autoCount, _ := service.GetOutStockTotalCountFour(startTime, endTime, orgId)
-
+	totalCount, _ := service.GetCancelOutTotalCount(startTime, endTime, orgId)
 	this.ServeSuccessJSON(map[string]interface{}{
-		"count":     count,
-		"outList":   outList,
-		"autoCount": autoCount,
+		"count":      count,
+		"outList":    outList,
+		"autoCount":  autoCount,
+		"totalCount": totalCount,
 	})
 }
 
@@ -3995,7 +4019,7 @@ func (this *StockManagerApiController) GetExprotStockList() {
 		}
 		endTime = theTime.Unix()
 	}
-
+	fmt.Println("ids2222222222222222", ids)
 	list, _ := service.GetExprotStockList(orgId, ids, startTime, endTime)
 	this.ServeSuccessJSON(map[string]interface{}{
 		"list": list,
@@ -4050,3 +4074,12 @@ func (this *StockManagerApiController) GetSingleCancelOrder() {
 		"list": order,
 	})
 }
+
+func (this *StockManagerApiController) GetCancelStockOrderPrint() {
+	id := this.GetString("id")
+	idStr := strings.Split(id, ",")
+	list, _ := service.GetCancelStockOrderPrint(idStr)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+	})
+}

models/self_drug_models.go

@@ -596,6 +596,7 @@ type StDrugWarehouseInfo struct {
 	RetailTotalPrice float64 `gorm:"column:retail_total_price" json:"retail_total_price" form:"retail_total_price"`
 	StockMaxNumber   int64   `gorm:"column:stock_max_number" json:"stock_max_number"`
 	StockMinNumber   int64   `gorm:"column:stock_min_number" json:"stock_min_number"`
+	BatchNumber      string  `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
 	DrugName         string  `json:"drug_name"`
 	DrugType         int64   `json:"drug_type"`
 	MaxUnit          string  `json:"max_unit"`

models/stock_models.go

@@ -97,6 +97,7 @@ type StWarehousingInfo struct {
 	PackingUnit       string  `json:"packing_unit"`
 	TotalCount        int64   `json:"total_count"`
 	SpecificationName string  `json:"specification_name"`
+	LicenseNumber     string  `gorm:"column:license_number" json:"license_number" form:"license_number"`
 }
 
 func (StWarehousingInfo) TableName() string {
@@ -273,6 +274,12 @@ func (SalesReturnInfo) TableName() string {
 	return "xt_sales_return_info"
 }
 
+type VmCancelStockInfo struct {
+	GoodId int64 `gorm:"column:good_id" json:"good_id"`
+	Count  int64 `gorm:"column:count" json:"count"`
+	OrgId  int64 `gorm:"column:org_id" json:"org_id"`
+}
+
 type CancelStockInfo struct {
 	ID            int64       `gorm:"column:id" json:"id"`
 	GoodId        int64       `gorm:"column:good_id" json:"good_id"`

models/stock_query_models.go

@@ -8,6 +8,7 @@ type StockInfo struct {
 	GoodTypeId            int64                   `gorm:"column:good_type_id" json:"good_type_id"`
 	GoodUnit              int64                   `gorm:"column:good_unit" json:"good_unit"`
 	MinUnit               string                  `gorm:"column:min_unit" json:"min_unit"`
+	PackingUnit           string                  `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
 	QueryWarehousingInfo  []QueryWarehousingInfo  `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"query_warehousing_info"`
 	QuerySalesReturnInfo  []QuerySalesReturnInfo  `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"query_sales_return_info"`
 	QueryWarehouseOutInfo []QueryWarehouseOutInfo `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"query_warehouseout_info"`

service/gobal_config_service.go

@@ -256,7 +256,7 @@ func GetDrugInOrderDetail(startime int64, endtime int64, orgid int64, orderType
 
 	if len(keyword) > 0 {
 
-		db = db.Where("x.warehousing_order like ? or t.drug_spec like ? or s.creater like ?", likeKey, likeKey, likeKey)
+		db = db.Where("x.warehousing_order like ? or t.drug_name like ? or s.creater like ?", likeKey, likeKey, likeKey)
 
 	}
 
@@ -327,7 +327,7 @@ func GetDrugOutOrder(startime int64, endtime int64, orgid int64, orderType int64
 	}
 
 	if len(keyword) > 0 {
-		db = db.Where("x.warehouse_out_order_number like ? or b.drug_spec like ? or t.creater like ?", likeKey, likeKey, likeKey)
+		db = db.Where("x.warehouse_out_order_number like ? or b.drug_name like ? or t.creater like ?", likeKey, likeKey, likeKey)
 	}
 
 	if manufacturerId > 0 {

service/stock_service.go

@@ -743,7 +743,7 @@ func FindDrugWarehousingInfoByIdOne(id []string, org_id int64) (list []*models.S
 	if org_id > 0 {
 		db = db.Where("x.org_id = ?", org_id)
 	}
-	err = db.Select("x.id,x.warehousing_id,x.drug_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.warehouseing_unit,x.max_unit,x.min_unit,x.stock_max_number,x.stock_min_number,x.price,x.remark,x.batch_number,t.manufacturer,t.dealer,t.drug_name,t.last_price,t.dose_unit,t.dose,t.min_number,t.min_unit,t.max_unit,t.drug_type").Joins("left join xt_base_drug as t on t.id = x.drug_id").Scan(&list).Error
+	err = db.Select("x.id,x.warehousing_id,x.drug_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.warehouseing_unit,x.stock_max_number,x.stock_min_number,x.price,x.remark,x.batch_number,x.batch_number,t.manufacturer,t.dealer,t.drug_name,t.last_price,t.dose_unit,t.dose,t.min_number,t.min_unit,t.max_unit,t.drug_type").Joins("left join xt_base_drug as t on t.id = x.drug_id").Scan(&list).Error
 	return list, err
 }
 
@@ -3146,7 +3146,7 @@ func GetExprotStockList(orgid int64, orderid []string, startime int64, endtime i
 	if endtime > 0 {
 		db = db.Where("x.ctime<=?", endtime)
 	}
-	err = db.Select("x.id,x.good_id,x.good_type_id,x.number,x.product_date,x.expiry_date,Sum(x.warehousing_count)as total_count,x.price,x.dealer,x.manufacturer,x.remark,t.good_name,t.packing_unit,t.specification_name,t.manufacturer,t.dealer").Joins("left join xt_good_information as t on t.id = x.good_id").Group("x.good_id").Scan(&info).Error
+	err = db.Select("x.id,x.good_id,x.good_type_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.price,x.dealer,x.manufacturer,x.remark,x.license_number,t.good_name,t.packing_unit,t.specification_name,t.manufacturer,t.dealer").Joins("left join xt_good_information as t on t.id = x.good_id").Scan(&info).Error
 
 	return info, err
 }
@@ -3189,7 +3189,7 @@ func GetOutExprotList(orgid int64, ids []string, startime int64, endtime int64)
 		db = db.Where("x.ctime<=?", endtime)
 	}
 
-	err = db.Select("x.id,x.warehouse_out_id,x.good_id,x.good_type_id,x.warehousing_out_target,Sum(x.count) as count,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.remark,x.number,t.good_name,t.specification_name,t.min_number,t.packing_price,t.min_unit,t.packing_unit,t.manufacturer,t.dealer").Joins("left join xt_good_information as t on t.id = x.good_id").Group("x.good_id").Scan(&out).Error
+	err = db.Select("x.id,x.warehouse_out_id,x.good_id,x.good_type_id,x.warehousing_out_target,x.count,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.remark,x.number,x.license_number,t.good_name,t.specification_name,t.min_number,t.packing_price,t.min_unit,t.packing_unit,t.manufacturer,t.dealer").Joins("left join xt_good_information as t on t.id = x.good_id").Scan(&out).Error
 	return out, err
 
 }
@@ -3316,13 +3316,13 @@ func GetWarehoureOrderInfoList(goodid int64, orgid int64) (info []*models.Wareho
 		db = db.Where("x.org_id = ?", orgid)
 	}
 
-	err = db.Select("x.id,x.warehousing_id,x.good_id,x.good_type_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.price,x.total_price,x.dealer,x.manufacturer,x.remark,x.is_return,x.warehousing_order,x.warehousing_unit,x.stock_count,x.license_number").Order("x.ctime desc").Find(&info).Error
+	err = db.Select("x.id,x.warehousing_id,x.good_id,x.good_type_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.price,x.total_price,x.dealer,x.manufacturer,x.remark,x.is_return,x.warehousing_order,x.warehousing_unit,x.stock_count,x.license_number,x.org_id").Find(&info).Error
 	return info, err
 }
 
 func UpdateWarehousingCount(info *models.WarehousingInfo, goodid int64, orgid int64, warehousingId int64) error {
 
-	err := XTWriteDB().Model(&info).Where("good_id = ? and org_id = ? and status =1 and warehousing_id = ?", goodid, orgid, warehousingId).Updates(map[string]interface{}{"stock_cout": info.StockCount}).Error
+	err := XTWriteDB().Model(&info).Where("good_id = ? and org_id = ? and status =1 and warehousing_id = ?", goodid, orgid, warehousingId).Updates(map[string]interface{}{"stock_count": info.StockCount}).Error
 	return err
 }
 
@@ -3332,11 +3332,10 @@ func GetSingleCancelOrder(id int64, orgid int64) (info []*models.CancelStockInfo
 	return info, err
 }
 
-func UpdateCancelOut(list []*models.WarehousingInfo, count int64) {
+func UpdateCancelOut(list []*models.WarehousingInfo, count int64) error {
 
 	//遍历循环入库数据
-	for _, item := range list {
-
+	for i, item := range list {
 		//计算每个批次剩余库存与入库数据的差 然后和退库数量比较
 		if (item.WarehousingCount - item.StockCount) >= count {
 			//如果差距大于退库数量，则直接把退库数量增加到该批次中
@@ -3344,7 +3343,7 @@ func UpdateCancelOut(list []*models.WarehousingInfo, count int64) {
 				GoodId:        item.GoodId,
 				OrgId:         item.OrgId,
 				WarehousingId: item.WarehousingId,
-				StockCount:    count,
+				StockCount:    item.StockCount + count,
 			}
 			UpdateWarehousingCount(&info, item.GoodId, item.OrgId, item.WarehousingId)
 			break
@@ -3354,19 +3353,61 @@ func UpdateCancelOut(list []*models.WarehousingInfo, count int64) {
 
 			//如果该批次小于退库数量,则先出库该相差数量
 			var countOne = item.WarehousingCount - item.StockCount
+
 			infoOne := models.WarehousingInfo{
 				GoodId:        item.GoodId,
 				OrgId:         item.OrgId,
 				WarehousingId: item.WarehousingId,
-				StockCount:    countOne,
+				StockCount:    countOne + item.StockCount,
 			}
 
-			UpdateWarehousingCount(&infoOne, item.GoodId, item.OrgId, item.WarehousingId)
+			err := UpdateWarehousingCount(&infoOne, item.GoodId, item.OrgId, item.WarehousingId)
+			if err == nil {
+				//剩余的出库到第二个批次
+				var countTwo = count - countOne
+				infos := append(list, list[i+1])
+				var idArray []*models.WarehousingInfo
+				for _, it := range infos {
+					if it.WarehousingId != item.WarehousingId {
+						idArray = append(idArray, it)
+					}
+				}
+				//查询更新后的库存
+				UpdateCancelOut(idArray, countTwo)
+				return err
+			} else {
+				return err
+			}
 
-			//剩余的出库到第二个批次
-			var countTwo = count - countOne
-			UpdateCancelOut(list, countTwo)
 		}
 	}
 
+	return err
+}
+
+func GetCancelStockOrderPrint(idstr []string) (info []*models.CancelStockInfo, err error) {
+
+	if len(idstr) > 0 {
+		err = XTReadDB().Model(&info).Where("cancel_stock_id in(?)", idstr).Preload("GoodInfo", "status = 1").Find(&info).Error
+	} else {
+		err = XTReadDB().Model(&info).Preload("GoodInfo", "status = 1").Find(&info).Error
+	}
+	return info, err
+}
+
+func GetCancelOutTotalCount(startime int64, endtime int64, orgid int64) (info []*models.VmCancelStockInfo, err error) {
+
+	db := XTReadDB().Table("xt_cancel_stock_info as x").Where("x.status = 1")
+
+	if startime > 0 {
+		db = db.Where("x.ctime >=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("x.ctime <= ?", endtime)
+	}
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+	err = db.Select("x.good_id,sum(x.count) as count").Group("x.good_id").Scan(&info).Error
+	return info, err
 }

service/warhouse_service.go

@@ -522,23 +522,30 @@ func AutoDrugDeliverInfo(orgID int64, prescribingNumber int64, warehouseout *mod
 	// 将该批次的剩余库存数量转换为拆零数量
 
 	stock_number = warehouse.StockMaxNumber*drup.MinNumber + warehouse.StockMinNumber
-	fmt.Println("88i8uu7777777777777777777777777777", stock_number)
-	fmt.Println("77777544656666666666666666", deliver_number)
+
 	// 当库存数量大于或等于出库数量的话，则正常出库该批次
 	if stock_number >= deliver_number {
+		fmt.Println("价格表32322222222222222222232322332", advice.Price)
 		warehouseOutInfo := &models.DrugWarehouseOutInfo{
 			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
 			WarehouseOutId:          warehouseout.ID,
 			Status:                  1,
 			Ctime:                   time.Now().Unix(),
-			Remark:                  "",
+			Remark:                  advice.Remark,
 			OrgId:                   orgID,
 			Type:                    1,
-			Manufacturer:            0,
-			Dealer:                  0,
+			Manufacturer:            advice.Manufacturer,
+			Dealer:                  advice.Dealer,
 			IsSys:                   0,
 			SysRecordTime:           advice.Ctime,
 			DrugId:                  advice.DrugId,
+			ExpiryDate:              advice.ExpiryDate,
+			ProductDate:             advice.ProductDate,
+			Number:                  advice.Number,
+			BatchNumber:             advice.BatchNumber,
+			Count:                   advice.Count,
+			RetailPrice:             advice.RetailPrice,
+			Price:                   advice.Price,
 		}
 
 		warehouseOutInfo.Count = deliver_number
@@ -591,14 +598,21 @@ func AutoDrugDeliverInfo(orgID int64, prescribingNumber int64, warehouseout *mod
 			WarehouseOutId:          warehouseout.ID,
 			Status:                  1,
 			Ctime:                   time.Now().Unix(),
-			Remark:                  "",
+			Remark:                  advice.Remark,
 			OrgId:                   orgID,
 			Type:                    1,
-			Manufacturer:            0,
-			Dealer:                  0,
+			Manufacturer:            advice.Manufacturer,
+			Dealer:                  advice.Dealer,
 			IsSys:                   0,
 			SysRecordTime:           advice.Ctime,
 			DrugId:                  advice.DrugId,
+			ExpiryDate:              advice.ExpiryDate,
+			ProductDate:             advice.ProductDate,
+			Number:                  advice.Number,
+			BatchNumber:             advice.BatchNumber,
+			Count:                   advice.Count,
+			RetailPrice:             advice.RetailPrice,
+			Price:                   advice.Price,
 		}
 
 		warehouseOutInfo.Count = stock_number
@@ -1130,6 +1144,7 @@ func ConsumablesDeliveryOne(orgID int64, record_time int64, goods *models.Wareho
 	fmt.Println("8888888888888888888", deliver_number)
 	// 当库存数量大于或等于出库数量的话，则正常出库该批次
 	if stock_number >= deliver_number {
+		fmt.Println("g2332232332323232232323322332", goods.Price)
 		warehouseOutInfo := &models.WarehouseOutInfo{
 			WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
 			WarehouseOutId:          warehouseOut.ID,
@@ -1152,8 +1167,8 @@ func ConsumablesDeliveryOne(orgID int64, record_time int64, goods *models.Wareho
 			LicenseNumber:           goods.LicenseNumber,
 		}
 		warehouseOutInfo.Count = goods.Count
-		stockInInfo, _ := FindLastStockInInfoRecord(goods.GoodId, orgID)
-		warehouseOutInfo.Price = stockInInfo.Price
+		//stockInInfo, _ := FindLastStockInInfoRecord(goods.GoodId, orgID)
+		//warehouseOutInfo.Price = stockInInfo.Price
 
 		errOne := AddSigleWarehouseOutInfo(warehouseOutInfo)
 		if errOne != nil {
@@ -1202,9 +1217,9 @@ func ConsumablesDeliveryOne(orgID int64, record_time int64, goods *models.Wareho
 			LicenseNumber:           goods.LicenseNumber,
 		}
 		warehouseOutInfo.Count = stock_number
-		stockInInfo, _ := FindLastStockInInfoRecord(goods.GoodId, orgID)
-		fmt.Println("stockINFO2232232323223322332323223323223", stockInInfo)
-		warehouseOutInfo.Price = stockInInfo.Price
+		//stockInInfo, _ := FindLastStockInInfoRecord(goods.GoodId, orgID)
+		//fmt.Println("stockINFO2232232323223322332323223323223", stockInInfo)
+		//warehouseOutInfo.Price = stockInInfo.Price
 
 		errOne := AddSigleWarehouseOutInfo(warehouseOutInfo)
 		fmt.Println("errOne2232323232323232333232323", errOne)