11月8日库存管理

controllers/drug_stock_api_contorller.go

@@ -1337,8 +1337,6 @@ func (c *StockDrugApiController) CreateDrugWarehouseOut() {
 
 	var warehousingOutInfo []*models.DrugWarehouseOutInfo
 
-	//var drugFlow []*models.DrugFlow
-
 	if dataBody["stockOut"] != nil && reflect.TypeOf(dataBody["stockOut"]).String() == "[]interface {}" {
 		thisStockIn, _ := dataBody["stockOut"].([]interface{})
 

controllers/manager_center_api_controller.go

@@ -1495,6 +1495,8 @@ func (c *ManagerCenterApiController) CreateGoodInfo() {
 	packing_price, _ := c.GetFloat("packing_price")
 	min_unit := c.GetString("min_unit")
 	default_count_unit := c.GetString("default_count_unit")
+	is_user, _ := c.GetInt64("is_user")
+	fmt.Println("is_user23232332323232233323223232323", is_user)
 	adminUserInfo := c.GetAdminUserInfo()
 
 	totals := service.FindGoodInfoByNameTwo(specification_name, adminUserInfo.CurrentOrgId, good_id, good_name)
@@ -1555,6 +1557,7 @@ func (c *ManagerCenterApiController) CreateGoodInfo() {
 		MinUnit:                     min_unit,
 		RegisterNumber:              register_number,
 		ProvincesCode:               provinces_code,
+		IsUser:                      is_user,
 	}
 	err, goodInfos := service.AddSigleGoodInfo(&goodInfo)
 	if err == nil {
@@ -1620,7 +1623,7 @@ func (c *ManagerCenterApiController) ModifyGoodInfo() {
 	min_unit := c.GetString("min_unit")
 	total, _ := c.GetFloat("total")
 	register_number := c.GetString("register_number")
-
+	is_user, _ := c.GetInt64("is_user")
 	adminUserInfo := c.GetAdminUserInfo()
 
 	goodInfo := models.GoodInfo{
@@ -1673,6 +1676,7 @@ func (c *ManagerCenterApiController) ModifyGoodInfo() {
 		MinUnit:                     min_unit,
 		Total:                       total,
 		RegisterNumber:              register_number,
+		IsUser:                      is_user,
 	}
 
 	totals := service.FindGoodInfoByNameOne(specification_name, adminUserInfo.CurrentOrgId, good_id, id, good_name)

controllers/supply_order_api_contorller.go

@@ -88,6 +88,15 @@ func SupplyOrderApiRegistRouters() {
 	beego.Router("/api/supply/deletegoodorder", &SupplyOrderApiController{}, "Get:DeleteGoodOrder")
 	//生成采购退货单数据
 	beego.Router("/api/supply/getsupplywarehouseoutbyid", &SupplyOrderApiController{}, "Get:GetSupplyWarehouseById")
+	//审核采购单
+	beego.Router("/api/supply/checkgoodorderbyid", &SupplyOrderApiController{}, "Get:CheckGoodOrderById")
+	//审核退货单
+	beego.Router("/api/supply/checkreturnorder", &SupplyOrderApiController{}, "Get:CheckReturnOrder")
+
+	//删除采购订单
+	beego.Router("api/supply/deletepurchaseorder", &SupplyOrderApiController{}, "Get:DeletePurchaseOrder")
+	//删除采购单
+	beego.Router("/api/supply/deletegoodorderbyid", &SupplyOrderApiController{}, "Get:DeleteGoodOrderById")
 }
 
 //获取供应商列表GetSupplyList
@@ -2099,14 +2108,14 @@ func (this *SupplyOrderApiController) GetGoodOrderCountList() {
 		service.CreateStockFlowOne(flow)
 	}
 	//创建入库单
-	errs := service.CreateDrugWarehousingInfo(warehouseInfoDetail)
+	errs := service.CreateDrugWarehousingInfoSix(warehouseInfoDetail)
 	fmt.Println(errs)
 	for _, items := range drugFlow {
 		drugWarehouseInfo, _ := service.GetLastDrugWarehouseInfo(items.DrugId)
 		items.WarehousingDetailId = drugWarehouseInfo.ID
 	}
 	//创建流水单
-	service.CreateDrugFlow(drugFlow)
+	service.CreateDrugFlowSix(drugFlow)
 
 	drugList, _ := service.GetSupplyDrugList(orgId)
 	if err == nil {
@@ -2147,7 +2156,7 @@ func (this *SupplyOrderApiController) SaveGoodReturnOrder() {
 	return_remark := dataBody["return_marke"].(string)
 
 	supplier_id, _ := this.GetInt64("supplier_id")
-	start_time := this.GetString("start")
+	start_time := this.GetString("start_time")
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	var startTime int64
@@ -2316,6 +2325,40 @@ func (this *SupplyOrderApiController) SaveGoodReturnOrder() {
 				}
 				supply_manufacturer := items["supply_manufacturer"].(string)
 
+				if items["supply_batch_number"] == nil || reflect.TypeOf(items["supply_batch_number"]).String() != "string" {
+					utils.ErrorLog("supply_batch_number")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				supply_batch_number := items["supply_batch_number"].(string)
+
+				if items["supply_product_date"] == nil || reflect.TypeOf(items["supply_product_date"]).String() != "float64" {
+					utils.ErrorLog("supply_product_date")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				supply_product_date := int64(items["supply_product_date"].(float64))
+
+				if items["supply_expiry_date"] == nil || reflect.TypeOf(items["supply_expiry_date"]).String() != "float64" {
+					utils.ErrorLog("supply_expiry_date")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				supply_expiry_date := int64(items["supply_expiry_date"].(float64))
+
+				if items["warehousing_id"] == nil || reflect.TypeOf(items["warehousing_id"]).String() != "float64" {
+					utils.ErrorLog("warehousing_id")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				warehousing_id := int64(items["warehousing_id"].(float64))
+
+				if items["warehouse_info_id"] == nil || reflect.TypeOf(items["warehouse_info_id"]).String() != "float64" {
+					utils.ErrorLog("warehouse_info_id")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				warehouse_info_id := int64(items["warehouse_info_id"].(float64))
 				cancelOrder := &models.SpSupplierWarehousingCancelOrder{
 					ManufacturerId:          manufacturer_id,
 					OrderNumber:             order_number,
@@ -2342,6 +2385,11 @@ func (this *SupplyOrderApiController) SaveGoodReturnOrder() {
 					Name:                    name,
 					SupplyUnit:              supply_unit,
 					SupplyLicenseNumber:     supply_license_number,
+					SupplyBatchNumber:       supply_batch_number,
+					SupplyExpiryDate:        supply_expiry_date,
+					SupplyProductDate:       supply_product_date,
+					WarehouseInfoId:         warehouse_info_id,
+					WarehousingId:           warehousing_id,
 				}
 				warehouseCancel = append(warehouseCancel, cancelOrder)
 			}
@@ -2807,3 +2855,224 @@ func (this *SupplyOrderApiController) GetSupplyWarehouseById() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 	}
 }
+
+func (this *SupplyOrderApiController) CheckGoodOrderById() {
+
+	id, _ := this.GetInt64("id")
+	recordDateStr := time.Now().Format("2006-01-02")
+	recordDate, _ := utils.ParseTimeStringToTime("2006-01-02", recordDateStr)
+
+	record_date := recordDate.Unix()
+	checker := this.GetAdminUserInfo().AdminUser.Id
+
+	out := models.SpSupplierWarehouseOut{
+		IsCheck:   1,
+		Checker:   checker,
+		CheckTime: record_date,
+	}
+
+	err := service.UpdateSupplyGoodOrder(id, out)
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"out": out,
+		})
+	} else {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+	}
+}
+
+func (this *SupplyOrderApiController) CheckReturnOrder() {
+
+	id, _ := this.GetInt64("id")
+	warehouse_out_id, _ := this.GetInt64("warehouse_out_id")
+	recordDateStr := time.Now().Format("2006-01-02")
+	recordDate, _ := utils.ParseTimeStringToTime("2006-01-02", recordDateStr)
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	record_date := recordDate.Unix()
+	checker := this.GetAdminUserInfo().AdminUser.Id
+	cancel := models.SpSupplierWarehouseCancel{
+		IsCheck:   1,
+		Checker:   checker,
+		CheckTime: record_date,
+	}
+	err := service.CheckReturnOrder(id, orgId, cancel)
+	//审核成功,出库
+	if err == nil {
+		//获取退库单详情
+		list, _ := service.GetSupplyCancelOrderDetail(id, orgId)
+		for _, item := range list {
+
+			//药品
+			if item.IsSource == 1 {
+				ctime := time.Now().Unix()
+				timeStr := time.Now().Format("2006-01-02")
+				timeArr := strings.Split(timeStr, "-")
+				total, _ := service.FindAllDrugWarehouseOut(orgId)
+
+				total = total + 1
+				warehousing_out_order := strconv.FormatInt(orgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
+				number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
+				number = number + total
+				warehousing_out_order = "YPCKD" + strconv.FormatInt(number, 10)
+				operation_time := time.Now().Unix()
+				creater := this.GetAdminUserInfo().AdminUser.Id
+				recordDateStr := time.Now().Format("2006-01-02")
+				recordDate, _ := utils.ParseTimeStringToTime("2006-01-02", recordDateStr)
+				orgId := this.GetAdminUserInfo().CurrentOrgId
+				record_date := recordDate.Unix()
+				warehouseOut := models.DrugWarehouseOut{
+					WarehouseOutOrderNumber: warehousing_out_order,
+					OperationTime:           operation_time,
+					OrgId:                   orgId,
+					Creater:                 creater,
+					Ctime:                   ctime,
+					Status:                  1,
+					WarehouseOutTime:        record_date,
+					Type:                    1,
+				}
+				// 查询今日是否存在出库单
+				_, errcodes := service.GetDrugWarehouseOutById(orgId, record_date)
+				if errcodes == gorm.ErrRecordNotFound {
+					service.AddSigleDrugWarehouseOut(&warehouseOut)
+				}
+
+				lastDrug, _ := service.GetLastDrugWarehouseById(orgId, record_date)
+
+				//获取
+				warehouseOutInfo := &models.DrugWarehouseOutInfo{
+
+					WarehouseOutOrderNumber: lastDrug.WarehouseOutOrderNumber,
+					WarehouseOutId:          lastDrug.ID,
+					DrugId:                  item.ProjectId,
+					Count:                   item.Count,
+					Price:                   item.Price,
+					Status:                  1,
+					Ctime:                   ctime,
+					Remark:                  "",
+					OrgId:                   orgId,
+					Type:                    1,
+					Manufacturer:            item.ManufacturerId,
+					Dealer:                  0,
+					CountUnit:               item.SupplyUnit,
+					ExpiryDate:              item.SupplyExpiryDate,
+					ProductDate:             item.SupplyProductDate,
+					Number:                  item.SupplyLicenseNumber,
+					BatchNumber:             item.SupplyBatchNumber,
+					IsSys:                   0,
+					WarehouseInfoId:         0,
+				}
+
+				drup, _ := service.FindBaseDrugLibRecord(orgId, item.ProjectId)
+				if drup.ID > 0 {
+					prescribingNumber := item.Count
+					service.AutoDrugDeliverInfoNight(orgId, prescribingNumber, &warehouseOut, &drup, warehouseOutInfo)
+				}
+
+			}
+
+			//耗材
+			if item.IsSource == 2 {
+
+				ctime := time.Now().Unix()
+
+				timeStr := time.Now().Format("2006-01-02")
+				timeArr := strings.Split(timeStr, "-")
+				total, _ := service.FindAllWarehouseOut(orgId)
+
+				total = total + 1
+				warehousing_out_order := strconv.FormatInt(orgId, 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 := this.GetAdminUserInfo().AdminUser.Id
+				recordDateStr := time.Now().Format("2006-01-02")
+				recordDate, _ := utils.ParseTimeStringToTime("2006-01-02", recordDateStr)
+
+				record_date := recordDate.Unix()
+				warehouseOut := models.WarehouseOut{
+					WarehouseOutOrderNumber: warehousing_out_order,
+					OperationTime:           operation_time,
+					OrgId:                   orgId,
+					Creater:                 creater,
+					Ctime:                   ctime,
+					Status:                  1,
+					WarehouseOutTime:        record_date,
+					Type:                    1,
+				}
+				//查询是否生成出库单
+				_, errcodes := service.FindStockOutByIsSys(orgId, 0, operation_time)
+				if errcodes == gorm.ErrRecordNotFound {
+					service.AddSigleWarehouseOut(&warehouseOut)
+				}
+				outWarehouse, _ := service.GetlastWarehouseOutById(orgId, record_date)
+				info := &models.WarehouseOutInfo{
+					WarehouseOutOrderNumber: outWarehouse.WarehouseOutOrderNumber,
+					WarehouseOutId:          outWarehouse.ID,
+					WarehouseInfotId:        0,
+					GoodId:                  item.ProjectId,
+					GoodTypeId:              0,
+					Count:                   item.Count,
+					Price:                   item.Price,
+					TotalPrice:              0,
+					ProductDate:             item.SupplyProductDate,
+					ExpiryDate:              item.SupplyExpiryDate,
+					Type:                    0,
+					Dealer:                  0,
+					Manufacturer:            item.ManufacturerId,
+					IsSys:                   0,
+					SysRecordTime:           record_date,
+					Number:                  item.SupplyBatchNumber,
+					LicenseNumber:           item.SupplyLicenseNumber,
+					ConsumableType:          0,
+					SupplyCancelOutId:       id,
+				}
+				//出库逻辑
+				parseDateErr := service.ConsumablesDeliveryNight(orgId, record_date, info, &warehouseOut, item.Count, creater, warehouse_out_id, id)
+				if parseDateErr != nil {
+					utils.ErrorLog(parseDateErr.Error())
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockInFail)
+					return
+				}
+			}
+		}
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"msg":        "1",
+		"drug_name":  "",
+		"dose":       "",
+		"dose_unit":  "",
+		"min_number": "",
+		"min_unit":   "",
+		"max_unit":   "",
+	})
+	return
+}
+
+func (this *SupplyOrderApiController) DeletePurchaseOrder() {
+
+	id, _ := this.GetInt64("id")
+	err := service.DeletePurchaseOrder(id)
+	if err == nil {
+		returnData := make(map[string]interface{}, 0)
+		returnData["msg"] = "ok"
+		this.ServeSuccessJSON(returnData)
+		return
+	} else {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+	}
+}
+
+func (this *SupplyOrderApiController) DeleteGoodOrderById() {
+	id, _ := this.GetInt64("id")
+	err := service.DeleteGoodOrderById(id)
+	if err == nil {
+		returnData := make(map[string]interface{}, 0)
+		returnData["msg"] = "ok"
+		this.ServeSuccessJSON(returnData)
+		return
+	} else {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+	}
+}

models/good_models.go

@@ -83,6 +83,7 @@ type GoodInfo struct {
 	CancelStockInfo             []*CancelStockInfo   `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"cancel_stock_info"`
 	RegisterNumber              string               `gorm:"column:register_number" json:"register_number" form:"register_number"`
 	GoodSotckInfo               []*GoodSotckInfo     `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"good_stock_in"`
+	IsUser                      int64                `gorm:"column:is_user" json:"is_user" form:"is_user"`
 }
 
 func (GoodInfo) TableName() string {

models/stock_models.go

@@ -237,6 +237,7 @@ type WarehouseOutInfo struct {
 	LicenseNumber           string       `gorm:"column:license_number" json:"license_number" form:"license_number"`
 	ConsumableType          int64        `gorm:"column:consumable_type" json:"consumable_type" form:"consumable_type"`
 	ProjectId               int64        `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	SupplyCancelOutId       int64        `gorm:"column:supply_cancel_out_id" json:"supply_cancel_out_id" form:"supply_cancel_out_id"`
 }
 
 func (WarehouseOutInfo) TableName() string {

models/supply.models.go

@@ -357,6 +357,11 @@ type SpSupplierWarehousingCancelOrder struct {
 	Name                    string  `gorm:"column:name" json:"name" form:"name"`
 	SupplyUnit              string  `gorm:"column:supply_unit" json:"supply_unit" form:"supply_unit"`
 	SupplyLicenseNumber     string  `gorm:"column:supply_license_number" json:"supply_license_number" form:"supply_license_number"`
+	SupplyBatchNumber       string  `gorm:"column:supply_batch_number" json:"supply_batch_number" form:"supply_batch_number"`
+	SupplyProductDate       int64   `gorm:"column:supply_product_date" json:"supply_product_date" form:"supply_product_date"`
+	SupplyExpiryDate        int64   `gorm:"column:supply_expiry_date" json:"supply_expiry_date" form:"supply_expiry_date"`
+	WarehousingId           int64   `gorm:"column:warehousing_id" json:"warehousing_id" form:"warehousing_id"`
+	WarehouseInfoId         int64   `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
 }
 
 func (SpSupplierWarehousingCancelOrder) TableName() string {

service/mobile_dialysis_service.go

@@ -2741,7 +2741,7 @@ func MobileGetDialysisGoods(orgID int64, scheduleDate int64, schedule_type int64
 			return db.Preload("VMGoodInfo", "status = 1 AND org_id = ?", orgID).Preload("GoodsType", "status = 1 AND (org_id = ? OR org_id = 0) ", orgID).Where("status = 1 AND user_org_id = ? AND record_date = ?  AND count > 0 ", orgID, scheduleDate)
 		}).
 		Preload("AutomaticReduceDetail", func(db *gorm.DB) *gorm.DB {
-			return db.Preload("VMGoodInfo", "status = 1 AND org_id = ?  ", orgID).Preload("GoodsType", "status = 1 AND (org_id = ? OR org_id = 0)  ", orgID).Where("status = 1 AND org_id = ? AND count > 0 AND record_time >= ? AND record_time <= ?  ", orgID, scheduleDate, end_time).Group("patient_id,good_id")
+			return db.Preload("VMGoodInfo", "status = 1 AND org_id = ?", orgID).Preload("GoodsType", "status = 1 AND (org_id = ? OR org_id = 0)  ", orgID).Where("status = 1 AND org_id = ? AND count > 0 AND record_time >= ? AND record_time <= ?  ", orgID, scheduleDate, end_time).Group("patient_id,good_id")
 		}).Where("sch.status = 1 AND sch.user_org_id = ?", orgID)
 	if scheduleDate != 0 {
 		db = db.Where("schedule_date = ?", scheduleDate)
@@ -3433,7 +3433,7 @@ func GetHisProjectConfig(orgid int64) (models.XtHisProjectConfig, error) {
 
 func GetHisPrescriptionProject(org_id int64, patient_id int64, record_date int64) (project []*models.HisPrescriptionProject, err error) {
 	err = readDb.Model(&models.HisPrescriptionProject{}).Preload("GoodInfo", func(db *gorm.DB) *gorm.DB {
-		return db.Preload("GoodsType", "status = 1").Where("status = 1 ")
+		return db.Preload("GoodsType", "status = 1").Where("status = 1 and is_user = 2")
 	}).Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND type = 3", org_id, record_date, patient_id).Find(&project).Error
 
 	return

service/stock_service.go

@@ -196,6 +196,7 @@ func FindAllGoodInfoTotal(orgId int64) (total int64) {
 }
 
 func AddSigleGoodInfo(goodInfo *models.GoodInfo) (error, *models.GoodInfo) {
+	fmt.Println("goodino232323232323232323", goodInfo.IsUse)
 	err := writeDb.Create(&goodInfo).Error
 	return err, goodInfo
 
@@ -248,6 +249,7 @@ func ModifyGoodInfo(goodInfo *models.GoodInfo) (error, *models.GoodInfo) {
 		"min_unit":                       goodInfo.MinUnit,
 		"register_number":                goodInfo.RegisterNumber,
 		"provinces_code":                 goodInfo.ProvincesCode,
+		"is_user":                        goodInfo.IsUser,
 	}).Error
 
 	writeDb.Model(&models.WarehousingInfo{}).Where("good_id = ? AND org_id = ?", goodInfo.ID, goodInfo.OrgId).Updates(map[string]interface{}{"good_type_id": goodInfo.GoodTypeId})
@@ -361,7 +363,7 @@ func FindAllGoodTypeOne(org_id int64) (goodType []*models.GoodsType, err error)
 }
 
 func FindAllGoodInfo(org_id int64) (goodInfo []*models.GoodInfo, err error) {
-	err = XTReadDB().Model(&models.GoodInfo{}).Where("org_id = ? AND status = 1", org_id).Find(&goodInfo).Error
+	err = XTReadDB().Model(&models.GoodInfo{}).Where("org_id = ? AND status = 1 and is_user = 2", org_id).Find(&goodInfo).Error
 	return goodInfo, err
 }
 
@@ -498,6 +500,53 @@ func CreateDrugWarehousingInfo(warehousingInfo []*models.DrugWarehouseInfo) (err
 	return
 }
 
+func CreateDrugWarehousingInfoSix(warehousingInfo []*models.DrugWarehouseInfo) (err error) {
+	if len(warehousingInfo) > 0 {
+		utx := writeDb.Begin()
+		if len(warehousingInfo) > 0 {
+			thisSQL := "INSERT INTO xt_drug_warehouse_info (warehousing_id, drug_id, number, product_date,expiry_date,warehousing_count,price,total_price,dealer,manufacturer,remark,ctime,mtime,status,org_id,warehousing_order,type,retail_price,retail_total_price,stock_max_number,max_unit,min_unit,batch_number,stock_min_number,supply_warehouse_id) VALUES "
+			insertParams := make([]string, 0)
+			insertData := make([]interface{}, 0)
+			for _, info := range warehousingInfo {
+				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)")
+				insertData = append(insertData, info.WarehousingId)
+				insertData = append(insertData, info.DrugId)
+				insertData = append(insertData, info.Number)
+				insertData = append(insertData, info.ProductDate)
+				insertData = append(insertData, info.ExpiryDate)
+				insertData = append(insertData, info.WarehousingCount)
+				insertData = append(insertData, info.Price)
+				insertData = append(insertData, info.TotalPrice)
+				insertData = append(insertData, info.Dealer)
+				insertData = append(insertData, info.Manufacturer)
+				insertData = append(insertData, info.Remark)
+				insertData = append(insertData, info.Ctime)
+				insertData = append(insertData, info.Mtime)
+				insertData = append(insertData, info.Status)
+				insertData = append(insertData, info.OrgId)
+				insertData = append(insertData, info.WarehousingOrder)
+				insertData = append(insertData, info.Type)
+				insertData = append(insertData, info.RetailPrice)
+				insertData = append(insertData, info.RetailTotalPrice)
+				insertData = append(insertData, info.StockMaxNumber)
+				insertData = append(insertData, info.MaxUnit)
+				insertData = append(insertData, info.MinUnit)
+				insertData = append(insertData, info.BatchNumber)
+				insertData = append(insertData, info.StockMinNumber)
+				insertData = append(insertData, info.SupplyWarehouseId)
+			}
+			thisSQL += strings.Join(insertParams, ", ")
+			err = utx.Exec(thisSQL, insertData...).Error
+			if err != nil {
+				utx.Rollback()
+				return
+			}
+		}
+		utx.Commit()
+	}
+	return
+}
+
 func UpdateDrugInfo(warehousingInfo []*models.DrugWarehouseInfo) (err error) {
 	var total float64
 	var min_number int64

service/supply_service.go

@@ -4,6 +4,7 @@ import (
 	"XT_New/models"
 	"github.com/jinzhu/gorm"
 	"strconv"
+	"strings"
 	"time"
 )
 
@@ -615,7 +616,7 @@ func GetAllGoodReturnOrderList(checkid int64, keyword string, page int64, limit
 		db = db.Where("sgj_xt.xt_supplier_warehouse_cancel.is_check = ?", checkid)
 	}
 	if len(keyword) > 0 {
-		db = db.Joins("join sgj_xt.xt_supplier_name on sgj_xt.xt_supplier_name.id = sgj_xt.xt_supplier_warehouse_out.supplier_id")
+		db = db.Joins("join sgj_xt.xt_supplier_name on sgj_xt.xt_supplier_name.id = sgj_xt.xt_supplier_warehouse_cancel.supplier_id")
 		db = db.Where("sgj_xt.xt_supplier_warehouse_cancel.number like ? or sgj_xt.xt_supplier_name.supplier_name  like ? ", likeKey, likeKey).Group("xt_supplier_warehouse_cancel.id")
 	}
 	if startime > 0 {
@@ -766,3 +767,111 @@ func GetGoodCanceListById(id int64, orgid int64) (cancel []*models.VmSpSupplierW
 	err = XTReadDB().Where("warehouse_out_id = ? and user_org_id = ? and status = 1", id, orgid).Find(&cancel).Error
 	return cancel, err
 }
+
+func CreateDrugFlowSix(drugflow []*models.DrugFlow) (err error) {
+	if len(drugflow) > 0 {
+		utx := writeDb.Begin()
+		if len(drugflow) > 0 {
+			thisSQL := "INSERT INTO xt_drug_flow (warehousing_id, drug_id, number,batch_number,count,user_org_id,patient_id,system_time,consumable_type,is_sys,warehousing_order,warehouse_out_id,warehouse_out_order_number,is_edit,cancel_stock_id,cancel_order_number,manufacturer,dealer,creator,update_creator,status,ctime,mtime,price,warehousing_detail_id,warehouse_out_detail_id,cancel_out_detail_id,expire_date,product_date,max_unit,min_unit,supply_warehouse_id) VALUES "
+			insertParams := make([]string, 0)
+			insertData := make([]interface{}, 0)
+			for _, info := range drugflow {
+
+				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)")
+				insertData = append(insertData, info.WarehousingId)
+				insertData = append(insertData, info.DrugId)
+				insertData = append(insertData, info.Number)
+				insertData = append(insertData, info.BatchNumber)
+				insertData = append(insertData, info.Count)
+				insertData = append(insertData, info.UserOrgId)
+				insertData = append(insertData, info.PatientId)
+				insertData = append(insertData, info.SystemTime)
+				insertData = append(insertData, info.ConsumableType)
+				insertData = append(insertData, info.IsSys)
+				insertData = append(insertData, info.WarehousingOrder)
+				insertData = append(insertData, info.WarehouseOutId)
+				insertData = append(insertData, info.WarehouseOutOrderNumber)
+
+				insertData = append(insertData, info.IsEdit)
+				insertData = append(insertData, info.CancelStockId)
+				insertData = append(insertData, info.CancelOrderNumber)
+				insertData = append(insertData, info.Manufacturer)
+				insertData = append(insertData, info.Dealer)
+				insertData = append(insertData, info.Creator)
+				insertData = append(insertData, info.UpdateCreator)
+				insertData = append(insertData, info.Status)
+				insertData = append(insertData, info.Ctime)
+				insertData = append(insertData, info.Mtime)
+				insertData = append(insertData, info.Price)
+				insertData = append(insertData, info.WarehousingDetailId)
+				insertData = append(insertData, info.WarehouseOutDetailId)
+				insertData = append(insertData, info.CancelOutDetailId)
+				insertData = append(insertData, info.ExpireDate)
+				insertData = append(insertData, info.ProductDate)
+				insertData = append(insertData, info.MaxUnit)
+				insertData = append(insertData, info.MinUnit)
+				insertData = append(insertData, info.SupplyWarehouseId)
+			}
+			thisSQL += strings.Join(insertParams, ", ")
+			err = utx.Exec(thisSQL, insertData...).Error
+			if err != nil {
+				utx.Rollback()
+				return
+			}
+		}
+		utx.Commit()
+	}
+	return
+}
+
+func CheckReturnOrder(id int64, orgid int64, cancel models.SpSupplierWarehouseCancel) error {
+
+	err := XTWriteDB().Model(&cancel).Where("id = ? and user_org_id = ? and status = 1", id, orgid).Updates(map[string]interface{}{"is_check": cancel.IsCheck, "checker": cancel.Checker, "check_time": cancel.CheckTime}).Error
+	return err
+}
+
+func GetSupplyCancelOrderDetail(id int64, orgid int64) (cancel []*models.SpSupplierWarehousingCancelOrder, err error) {
+
+	err = XTReadDB().Where("warehouse_cancel_id = ? and user_org_id = ? and status = 1", id, orgid).Find(&cancel).Error
+	return cancel, err
+}
+
+func DeletePurchaseOrder(id int64) error {
+
+	err := XTWriteDB().Model(&models.SupplierWarehousingInfoOrder{}).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}
+
+func DeleteGoodOrderById(id int64) error {
+
+	err := XTWriteDB().Model(&models.SpSupplierWarehousingOutOrder{}).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}
+
+func GetlastWarehouseOutById(user_org_id int64, record_date int64) (models.WarehouseOut, error) {
+
+	out := models.WarehouseOut{}
+	err := XTReadDB().Where("org_id = ? and warehouse_out_time = ? and status = 1", user_org_id, record_date).Find(&out).Error
+	return out, err
+}
+
+func GetDrugWarehouseOutById(orgid int64, record_date int64) (*models.DrugWarehouseOut, error) {
+
+	out := models.DrugWarehouseOut{}
+	var err error
+	err = XTReadDB().Where("org_id = ? and warehouse_out_time = ?", orgid, record_date).Find(&out).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &out, nil
+}
+
+func GetLastDrugWarehouseById(orgid int64, record_date int64) (models.DrugWarehouseOut, error) {
+
+	out := models.DrugWarehouseOut{}
+	err := XTReadDB().Where("org_id = ? and warehouse_out_time =? and status = 1", orgid, record_date).Find(&out).Error
+	return out, err
+}

service/warhouse_service.go

@@ -1068,6 +1068,7 @@ func ConsumablesDeliveryTotal(orgID int64, patient_id int64, record_time int64,
 			}
 
 			ConsumablesDelivery(orgID, patient_id, record_time, &prepare, &out, newCount)
+
 		}
 
 	}
@@ -2742,3 +2743,406 @@ func HisAuToReduce(orgID int64, prescribingNumber float64, warehouseout *models.
 
 	return
 }
+
+//采购管理耗材出库逻辑
+func ConsumablesDeliveryNight(orgID int64, record_time int64, goods *models.WarehouseOutInfo, warehouseOut *models.WarehouseOut, count int64, creator int64, warehouse_out_id int64, cancel_out_id int64) (err error) {
+
+	var deliver_number int64 = 0
+	var stock_number int64 = 0
+	var maxNumber int64 = 0
+
+	deliver_number = goods.Count
+
+	// 根据先进先出原则，查询最先入库的批次，进行出库
+
+	// 如果没有对应的库存，则报错
+	warehouse, err := FindFirstWarehousingInfoByStockNight(goods.GoodId, goods.GoodTypeId, warehouse_out_id)
+	if err != nil {
+
+		return err
+	}
+
+	stock_number = warehouse.StockCount
+
+	// 当库存数量大于或等于出库数量的话，则正常出库该批次
+	if stock_number >= deliver_number {
+
+		warehouseOutInfo := &models.WarehouseOutInfo{
+			WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
+			WarehouseOutId:          warehouseOut.ID,
+			WarehouseInfotId:        warehouse.ID,
+			Status:                  1,
+			Ctime:                   time.Now().Unix(),
+			Remark:                  goods.Remark,
+			OrgId:                   orgID,
+			Type:                    1,
+			Manufacturer:            goods.Manufacturer,
+			Dealer:                  goods.Dealer,
+			IsSys:                   0,
+			SysRecordTime:           record_time,
+			GoodTypeId:              goods.GoodTypeId,
+			GoodId:                  goods.GoodId,
+			ExpiryDate:              goods.ExpiryDate,
+			ProductDate:             goods.ProductDate,
+			Number:                  warehouse.Number,
+			Price:                   goods.Price,
+			LicenseNumber:           goods.LicenseNumber,
+		}
+		warehouseOutInfo.Count = goods.Count
+		//添加出库单详情
+		errOne := AddSigleWarehouseOutInfo(warehouseOutInfo)
+		if errOne != nil {
+			return errOne
+		}
+
+		stockFlow := models.VmStockFlow{
+			WarehousingId:           warehouse.ID,
+			GoodId:                  goods.GoodId,
+			Number:                  warehouse.Number,
+			LicenseNumber:           goods.LicenseNumber,
+			Count:                   goods.Count,
+			UserOrgId:               goods.OrgId,
+			PatientId:               goods.PatientId,
+			SystemTime:              record_time,
+			ConsumableType:          2,
+			IsSys:                   goods.IsSys,
+			WarehousingOrder:        "",
+			WarehouseOutId:          warehouseOut.ID,
+			WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
+			IsEdit:                  1,
+			CancelStockId:           0,
+			CancelOrderNumber:       "",
+			Manufacturer:            goods.Manufacturer,
+			Dealer:                  goods.Dealer,
+			Creator:                 creator,
+			UpdateCreator:           0,
+			Status:                  1,
+			Ctime:                   time.Now().Unix(),
+			Mtime:                   0,
+			Price:                   warehouse.PackingPrice,
+			WarehousingDetailId:     0,
+			WarehouseOutDetailId:    warehouseOutInfo.ID,
+			CancelOutDetailId:       0,
+			ProductDate:             goods.ProductDate,
+			ExpireDate:              goods.ExpiryDate,
+		}
+
+		//创建出库流水
+		CreateStockFlowOne(stockFlow)
+
+		maxNumber = goods.Count
+
+		if warehouse.StockCount < maxNumber {
+			return errors.New("库存数量不足")
+		}
+
+		warehouse.StockCount = warehouse.StockCount - maxNumber
+		warehouse.Mtime = time.Now().Unix()
+
+		//扣减库存
+		errThree := UpDateWarehouseInfoByStock(&warehouse)
+
+		if errThree != nil {
+			return errThree
+		}
+
+	} else {
+
+		// 当该批次的库存数量小于出库数量的话，则先把该批次出库完后，再进行递归出库
+		warehouseOutInfo := &models.WarehouseOutInfo{
+			WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
+			WarehouseOutId:          warehouseOut.ID,
+			WarehouseInfotId:        warehouse.ID,
+			Status:                  1,
+			Ctime:                   time.Now().Unix(),
+			Remark:                  goods.Remark,
+			OrgId:                   orgID,
+			Type:                    1,
+			Manufacturer:            goods.Manufacturer,
+			Dealer:                  goods.Dealer,
+			IsSys:                   0,
+			SysRecordTime:           record_time,
+			GoodTypeId:              goods.GoodTypeId,
+			GoodId:                  goods.GoodId,
+			ExpiryDate:              goods.ExpiryDate,
+			ProductDate:             goods.ProductDate,
+			Number:                  warehouse.Number,
+			Price:                   warehouse.PackingPrice,
+			LicenseNumber:           goods.LicenseNumber,
+		}
+		warehouseOutInfo.Count = stock_number
+
+		//查询是否已经生成出库单
+		info, errcodes := GetStockInRecoredByGoodIdOne(goods.GoodId, goods.GoodTypeId, goods.SysRecordTime, goods.OrgId)
+		if errcodes == gorm.ErrRecordNotFound {
+			//创建出库单
+			errOne := AddSigleWarehouseOutInfo(warehouseOutInfo)
+			if errOne != nil {
+				return errOne
+			}
+		} else {
+			warehouseOutInfo.Count = info.Count + stock_number
+
+			UpdateAutoMaticReduceDetailOne(goods.GoodId, goods.GoodTypeId, goods.SysRecordTime, goods.OrgId, warehouseOutInfo)
+		}
+
+		stockFlow := models.VmStockFlow{
+			WarehousingId:           warehouse.ID,
+			GoodId:                  goods.GoodId,
+			Number:                  warehouse.Number,
+			LicenseNumber:           goods.LicenseNumber,
+			Count:                   stock_number,
+			UserOrgId:               goods.OrgId,
+			PatientId:               0,
+			SystemTime:              record_time,
+			ConsumableType:          2,
+			IsSys:                   0,
+			WarehousingOrder:        "",
+			WarehouseOutId:          warehouseOut.ID,
+			WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
+			IsEdit:                  1,
+			CancelStockId:           0,
+			CancelOrderNumber:       "",
+			Manufacturer:            goods.Manufacturer,
+			Dealer:                  goods.Dealer,
+			Creator:                 creator,
+			UpdateCreator:           0,
+			Status:                  1,
+			Ctime:                   time.Now().Unix(),
+			Mtime:                   0,
+			Price:                   warehouse.PackingPrice,
+			WarehousingDetailId:     0,
+			WarehouseOutDetailId:    warehouseOutInfo.ID,
+			CancelOutDetailId:       0,
+			ProductDate:             goods.ProductDate,
+			ExpireDate:              goods.ExpiryDate,
+		}
+
+		//创建出库明细
+		CreateStockFlowOne(stockFlow)
+		// 出库完成后，要将该批次库存清零
+		warehouse.StockCount = 0
+		warehouse.Mtime = time.Now().Unix()
+
+		errThree := UpDateWarehouseInfoByStock(&warehouse)
+
+		if errThree != nil {
+			return errThree
+		}
+		// 清零完该库存后，还有剩余出库未出完，进行对应的递归操作
+		goods.Count = deliver_number - stock_number
+
+		ConsumablesDeliveryNight(orgID, record_time, goods, warehouseOut, count, creator, warehouse_out_id, cancel_out_id)
+
+	}
+	return nil
+}
+
+func FindFirstWarehousingInfoByStockNight(good_id int64, good_type_id int64, warehouse_out_id int64) (info models.WarehousingInfo, err error) {
+	err = readDb.Model(&models.WarehousingInfo{}).Where("good_id = ? AND good_type_id = ? AND status = 1 and stock_count > 0 and supply_warehouse_id = ?", good_id, good_type_id, warehouse_out_id).Order("ctime").First(&info).Error
+	return info, err
+}
+
+// 药品出库 递归方式
+func AutoDrugDeliverInfoNight(orgID int64, prescribingNumber int64, warehouseout *models.DrugWarehouseOut, drup *models.BaseDrugLib, advice *models.DrugWarehouseOutInfo) (err error) {
+
+	// 判断处方里药品单位是拆零单位还是包装单位,	如果是包装单位，则根据规格，将包装数量转为拆零数量
+	var deliver_number int64 = 0
+	var stock_number int64 = 0
+
+	if advice.CountUnit == drup.MaxUnit {
+		deliver_number = prescribingNumber * drup.MinNumber
+	} else {
+		deliver_number = prescribingNumber
+	}
+
+	// 根据先进先出原则，查询最先入库的批次，进行出库
+	// 如果没有对应的库存，则报错
+	//开启事物
+
+	warehouse, err := FindLastDrugWarehousingInfoByID(advice.DrugId)
+
+	if err != nil {
+
+		return err
+	}
+
+	// 将该批次的剩余库存数量转换为拆零数量
+
+	stock_number = warehouse.StockMaxNumber*drup.MinNumber + warehouse.StockMinNumber
+
+	// 当库存数量大于或等于出库数量的话，则正常出库该批次
+	if stock_number >= deliver_number {
+
+		warehouseOutInfo := &models.DrugWarehouseOutInfo{
+			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
+			WarehouseOutId:          warehouseout.ID,
+			Status:                  1,
+			Ctime:                   time.Now().Unix(),
+			Remark:                  advice.Remark,
+			OrgId:                   orgID,
+			Type:                    1,
+			Manufacturer:            advice.Manufacturer,
+			Dealer:                  warehouse.Dealer,
+			IsSys:                   0,
+			SysRecordTime:           advice.Ctime,
+			DrugId:                  advice.DrugId,
+			ExpiryDate:              advice.ExpiryDate,
+			ProductDate:             advice.ProductDate,
+			Number:                  advice.Number,
+			BatchNumber:             warehouse.BatchNumber,
+			Count:                   deliver_number,
+			RetailPrice:             advice.RetailPrice,
+			Price:                   advice.Price,
+			WarehouseInfoId:         warehouse.ID,
+			CountUnit:               drup.MinUnit,
+			AdviceId:                advice.ID,
+		}
+
+		warehouseOutInfo.Count = prescribingNumber
+		warehouseOutInfo.CountUnit = advice.CountUnit
+
+		errOne := AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
+		if errOne != nil {
+			return errOne
+		}
+
+		drugWareInfo, _ := GetLastWarehouseOutInfoById(advice.DrugId)
+		drugflow := models.DrugFlow{
+			WarehouseOutId:          warehouseout.ID,
+			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
+			DrugId:                  advice.DrugId,
+			Number:                  warehouse.Number,
+			ProductDate:             advice.ProductDate,
+			ExpireDate:              advice.ExpiryDate,
+			Count:                   deliver_number,
+			Price:                   advice.Price,
+			Status:                  1,
+			Ctime:                   time.Now().Unix(),
+			UserOrgId:               advice.OrgId,
+			Manufacturer:            advice.Manufacturer,
+			Dealer:                  advice.Dealer,
+			BatchNumber:             warehouse.BatchNumber,
+			MaxUnit:                 drup.MinUnit,
+			ConsumableType:          2,
+			IsEdit:                  1,
+			Creator:                 0,
+			IsSys:                   0,
+			WarehouseOutDetailId:    drugWareInfo.ID,
+			AdviceId:                advice.ID,
+		}
+
+		CreateDrugFlowOne(drugflow)
+		// 出库完成后，要减去对应批次的库存数量
+		// 判断处方里药品单位是拆零单位还是包装单位,	如果是拆零单位，则根据规格，将拆零数量转为包装数量
+		var maxNumber int64 = 0
+		var minNumber int64 = 0
+		if advice.CountUnit == drup.MinUnit {
+			maxNumber = prescribingNumber / drup.MinNumber
+			minNumber = prescribingNumber % drup.MinNumber
+		} else {
+			maxNumber = prescribingNumber
+		}
+
+		if warehouse.StockMaxNumber < maxNumber {
+
+			return errors.New("库存数量不足")
+		}
+
+		warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
+		warehouse.Mtime = time.Now().Unix()
+
+		if warehouse.StockMinNumber < minNumber {
+			warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
+			warehouse.StockMinNumber = warehouse.StockMinNumber + drup.MinNumber - minNumber
+		} else {
+			warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
+		}
+
+		if warehouse.StockMaxNumber < 0 {
+			return errors.New("库存数量不足")
+		}
+
+		errThree := UpDateDrugWarehouseInfoByStock(&warehouse)
+		if errThree != nil {
+			return errThree
+		}
+
+		return nil
+	} else {
+		// 当该批次的库存数量小于出库数量的话，则先把该批次出库完后，再进行递归出库
+		warehouseOutInfo := &models.DrugWarehouseOutInfo{
+			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
+			WarehouseOutId:          warehouseout.ID,
+			Status:                  1,
+			Ctime:                   time.Now().Unix(),
+			Remark:                  advice.Remark,
+			OrgId:                   orgID,
+			Type:                    1,
+			Manufacturer:            advice.Manufacturer,
+			Dealer:                  warehouse.Dealer,
+			IsSys:                   0,
+			SysRecordTime:           advice.Ctime,
+			DrugId:                  advice.DrugId,
+			ExpiryDate:              warehouse.ExpiryDate,
+			ProductDate:             warehouse.ProductDate,
+			Number:                  warehouse.Number,
+			BatchNumber:             warehouse.BatchNumber,
+			Count:                   stock_number,
+			RetailPrice:             advice.RetailPrice,
+			Price:                   advice.Price,
+			WarehouseInfoId:         warehouse.ID,
+			CountUnit:               drup.MinUnit,
+			AdviceId:                advice.ID,
+		}
+		warehouseOutInfo.Count = stock_number
+
+		//warehouseOutInfo.CountUnit = advice.CountUnit
+
+		errOne := AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
+		if errOne != nil {
+			return errOne
+		}
+		drugWareInfo, _ := GetLastWarehouseOutInfoById(advice.DrugId)
+		drugflow := models.DrugFlow{
+			WarehouseOutId:          warehouseout.ID,
+			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
+			DrugId:                  advice.DrugId,
+			Number:                  warehouse.Number,
+			ProductDate:             advice.ProductDate,
+			ExpireDate:              advice.ExpiryDate,
+			Count:                   stock_number,
+			Price:                   advice.Price,
+			Status:                  1,
+			Ctime:                   time.Now().Unix(),
+			UserOrgId:               advice.OrgId,
+			Manufacturer:            advice.Manufacturer,
+			Dealer:                  advice.Dealer,
+			BatchNumber:             warehouse.BatchNumber,
+			MaxUnit:                 drup.MinUnit,
+			ConsumableType:          2,
+			IsEdit:                  1,
+			Creator:                 0,
+			IsSys:                   0,
+			WarehouseOutDetailId:    drugWareInfo.ID,
+			AdviceId:                advice.ID,
+		}
+		CreateDrugFlowOne(drugflow)
+		// 出库完成后，要将该批次库存清零
+		warehouse.StockMaxNumber = 0
+		warehouse.StockMinNumber = 0
+		warehouse.Mtime = time.Now().Unix()
+		errThree := UpDateDrugWarehouseInfoByStock(&warehouse)
+		if errThree != nil {
+			return errThree
+		}
+		// 清零完该库存后，还有剩余出库未出完，进行对应的递归操作
+		prescribingNumber_two_temp := deliver_number - stock_number
+		fmt.Println("剩余库存323323223232323232323323223", prescribingNumber_two_temp)
+		advice.CountUnit = drup.MinUnit
+
+		AutoDrugDeliverInfoNight(orgID, prescribingNumber_two_temp, warehouseout, drup, advice)
+	}
+
+	return
+}