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

controllers/base_api_controller.go

 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10164 //机构id
+		subscibe.OrgId = 10677 //机构id
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10164 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10677 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 12123 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10164 //机构id小英9675或4
+		subscibe.OrgId = 10677 //机构id小英9675或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10164 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10677 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 12123 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes

controllers/drug_pharmacy_management_controller.go

 
 	idArrayOne := strings.Split(hisStr, ",")
 
-	fmt.Println("idArray23332233223", idArray)
-	fmt.Println("idArrayOne23332233223", idArrayOne)
+	fmt.Println("", idArrayOne)
 
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	service.UpdatePharmacyAdviceBaseDrug(idArray, orgId)

controllers/his_api_controller.go

 						out, _ := service.FindPrescriptionWarehouseOut(adminInfo.CurrentOrgId, nowtime)
 
 						if out.ID == 0 {
-							service.AddSigleWarehouseOut(&warehouseOut)
+							service.AddSigleWarehouseOutOne(&warehouseOut)
 						}
 
 						lastOut, _ := service.FindLastPrescriptionWarehouseOut(adminInfo.CurrentOrgId, nowtime)
 					//查询是否生成出库单
 					out, _ := service.FindAllSettleWarehouseOut(orgId, nowtime, 5)
 					if out.ID == 0 {
-						service.AddSigleWarehouseOut(&warehouseOut)
+						service.AddSigleWarehouseOutOne(&warehouseOut)
 					}
 
 					lastOut, _ := service.FindAllSettleWarehouseOut(orgId, nowtime, 5)

controllers/mobile_api_controllers/dialysis_api_controller.go

 				StorehouseId:            houseConfig.StorehouseOutInfo,
 				IsCheck:                 1,
 			}
-			err := service.AddSigleWarehouseOut(&warehouseOut)
+			err := service.AddSigleWarehouseOutOne(&warehouseOut)
 			if err != nil {
 				goodErrcode := models.XtGoodErrcode{
 					UserOrgId:      adminInfo.Org.Id,
 				StorehouseId:            houseConfig.StorehouseOutInfo,
 				IsCheck:                 1,
 			}
-			err := service.AddSigleWarehouseOut(&warehouseOut)
+			err := service.AddSigleWarehouseOutOne(&warehouseOut)
 			if err != nil {
 				goodErrcode := models.XtGoodErrcode{
 					UserOrgId:      adminInfo.Org.Id,
 						_, errcod := service.GetWarehouseOutInfoIsExistOne(item.GoodId, patient_id, record_time, 0)
 
 						if errcod == gorm.ErrRecordNotFound {
-							service.AddSigleWarehouseOutInfo(warehouseOutInfo)
+							service.AddSigleWarehouseOutInfoOne(warehouseOutInfo)
 							//插入详情明细表
 							stockFlow := models.VmStockFlow{
 								WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
 									StorehouseId:            houseConfig.StorehouseOutInfo,
 									IsCheck:                 1,
 								}
-								service.AddSigleWarehouseOut(&warehouseOut)
+								service.AddSigleWarehouseOutOne(&warehouseOut)
 
 							}
 							//出库
 	_, errcod := service.GetWarehouseOutInfoIsExistOne(good_yc.GoodId, good_yc.PatientId, record_time, good_yc.ProjectId)
 
 	if errcod == gorm.ErrRecordNotFound {
-		errOne := service.AddSigleWarehouseOutInfo(warehouseOutInfo)
+		errOne := service.AddSigleWarehouseOutInfoOne(warehouseOutInfo)
 		//插入详情明细表
 		stockFlow := models.VmStockFlow{
 			WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
 				StorehouseId:            houseConfig.StorehouseOutInfo,
 				IsCheck:                 1,
 			}
-			err := service.AddSigleWarehouseOut(&warehouseOut)
+			err := service.AddSigleWarehouseOutOne(&warehouseOut)
 			if err != nil {
 				utils.TraceLog("创建出库单失败 err = %v", err)
 				return err
 		warehouseOutInfo.Count = delete_count
 		stockInInfo, _ := service.FindLastStockInInfoRecord(good_yc.GoodId, orgID)
 		warehouseOutInfo.Price = stockInInfo.Price
-		errOne := service.AddSigleWarehouseOutInfo(warehouseOutInfo)
+		errOne := service.AddSigleWarehouseOutInfoOne(warehouseOutInfo)
 
 		if errOne != nil {
 			return errOne
 	_, errcod := service.GetWarehouseOutInfoIsExistOne(good_yc.GoodId, good_yc.PatientId, record_time, good_yc.ProjectId)
 
 	if errcod == gorm.ErrRecordNotFound {
-		errOne := service.AddSigleWarehouseOutInfo(warehouseOutInfo)
+		errOne := service.AddSigleWarehouseOutInfoOne(warehouseOutInfo)
 
 		//插入详情明细表
 		if errOne != nil {

controllers/mobile_api_controllers/dialysis_api_controller_extend.go

 	scheduleType, _ := this.GetInt64("schedule_type")
 	modeID, _ := this.GetInt64("mode")
 	bedID, _ := this.GetInt64("bed")
-	if patientID <= 0 || scheduleType < 1 || scheduleType > 3 || modeID < 1 || modeID > 14 || bedID <= 0 {
+	if patientID <= 0 || scheduleType < 1 || scheduleType > 3 || modeID < 1 || bedID <= 0 {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}

controllers/secondary_order_api_contorller.go

 package controllers
 
 import (
-	"XT_New/enums"
-	"XT_New/models"
-	"XT_New/service"
-	"XT_New/utils"
 	"encoding/json"
 	"fmt"
-	"github.com/astaxie/beego"
-	"github.com/jinzhu/gorm"
 	"math/rand"
 	"reflect"
 	"strconv"
 	"strings"
 	"time"
+
+	"XT_New/enums"
+	"XT_New/models"
+	"XT_New/service"
+	"XT_New/utils"
+	"github.com/astaxie/beego"
+	"github.com/jinzhu/gorm"
 )
 
 type SecondaryOrderApiController struct {
 					//查询今日是否存在调拨出库
 					_, errcodes := service.FindStockOutByIsSysSix(orgId, 12, record_date, item.WarehouseId)
 					if errcodes == gorm.ErrRecordNotFound {
-						service.AddSigleWarehouseOut(&warehouseOut)
+						service.AddSigleWarehouseOutOne(&warehouseOut)
 					}
 
 					out, _ := service.GetLastWarehouseOutBySys(12, orgId, record_date, item.WarehouseId)
 				//查询今日是否存在调拨出库
 				_, errcodes := service.FindStockOutByIsSysSix(orgId, 12, record_date, item.WarehouseId)
 				if errcodes == gorm.ErrRecordNotFound {
-					service.AddSigleWarehouseOut(&warehouseOut)
+					service.AddSigleWarehouseOutOne(&warehouseOut)
 				}
 
 				out, _ := service.GetLastWarehouseOutBySys(12, orgId, record_date, item.WarehouseId)

controllers/sign_api_controller.go

 	//	}
 	//}
 
-	adviceList, _ := service.GetHisDoctorAdviceNoCheck(10721)
-
-	if len(adviceList) > 0 {
-		for _, item := range adviceList {
-			checkObj, _ := service.GetDobuleCheckOne(item.UserOrgId, item.AdviceDate, item.PatientId)
-			service.UpdateHisAdvice(item.PatientId, item.AdviceDate, item.UserOrgId, checkObj.Creater, checkObj.CheckDate)
-		}
-	}
+	//adviceList, _ := service.GetHisDoctorAdviceNoCheck(10721)
+	//
+	//if len(adviceList) > 0 {
+	//	for _, item := range adviceList {
+	//		checkObj, _ := service.GetDobuleCheckOne(item.UserOrgId, item.AdviceDate, item.PatientId)
+	//		service.UpdateHisAdvice(item.PatientId, item.AdviceDate, item.UserOrgId, checkObj.Creater, checkObj.CheckDate)
+	//	}
+	//}
 
 	this.ServeSuccessJSON(map[string]interface{}{
 		"msg": "ok",

controllers/stock_in_api_controller.go

 	ctime := time.Now().Unix()
 	adminUserInfo := c.GetAdminUserInfo()
 
+	// 开始外部循环的事务
+	db := service.XTWriteDB()
+	tx := db.Begin()
+
+	// 在函数结束时处理事务回滚
+	defer func() {
+		if r := recover(); r != nil {
+			tx.Rollback()
+		}
+	}()
+
 	warehousingDate, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", warehousing_time)
 	if parseDateErr != nil {
 		c.ErrorLog("日期(%v)解析错误：%v", warehousingDate, parseDateErr)
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
+
 	timeStr := time.Now().Format("2006-01-02")
 	timeArr := strings.Split(timeStr, "-")
-	total, _ := service.FindAllWarehouseTotal(adminUserInfo.CurrentOrgId)
+	total, _ := service.FindNewAllWarehouseTotal(adminUserInfo.CurrentOrgId, tx)
 	total = total + 1
 	warehousing_order := "RKD" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
 	operation_time := time.Now().Unix()
 		IsCheck:          2,
 	}
 	if warehousing_info_id == 0 {
-		service.AddSigleWarehouse(&warehousing)
+
+		service.AddNewSigleWarehouse(&warehousing, tx)
 	}
 	if warehousing_info_id > 0 {
-		service.UpdateWarehouse(warehousing_info_id, storehouse_id)
+
+		service.UpdateNewWarehouse(warehousing_info_id, storehouse_id, tx)
 	}
-	info, _ := service.FindLastWarehousingSix(adminUserInfo.CurrentOrgId)
+	info, _ := service.FindNewLastWarehousingSix(adminUserInfo.CurrentOrgId, tx)
 	dataBody := make(map[string]interface{}, 0)
 	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
 	if err != nil {
 
 	for _, item := range warehousingInfo {
 		if item.ID == 0 {
-			service.CreatedWarehouseingDetail(item)
+			service.CreatedNewWarehouseingDetail(item, tx)
 		}
 		if item.ID > 0 {
-			service.UpdateWarehouseDetail(item, item.ID)
+
+			service.UpdateNewWarehouseDetail(item, item.ID, tx)
 		}
 
 	}
 
 	//查询入库数据
-	list, _ := service.GetGoodWarehouseInfoById(info.ID, info.OrgId)
+	list, _ := service.GetNewGoodWarehouseInfoById(info.ID, info.OrgId, tx)
+
+	tx.Commit()
 	dealerList, _ := service.GetAllDealerList(adminUserInfo.CurrentOrgId)
 	manufacturerList, _ := service.GetAllManufacturerList(adminUserInfo.CurrentOrgId)
 
 	}
 }
 func (c *StockManagerApiController) EditWarehouse() {
+
+	// 开始外部循环的事务
+	db := service.XTWriteDB()
+	tx := db.Begin()
+
+	// 在函数结束时处理事务回滚
+	defer func() {
+		if r := recover(); r != nil {
+			tx.Rollback()
+		}
+	}()
+
 	warehousing_time := c.GetString("warehousing_time")
 	id, _ := c.GetInt64("id", 0)
 	types, _ := c.GetInt64("type", 0)
 		return
 	}
 
-	warehouse, _ := service.FindWarehousingById(id)
+	warehouse, _ := service.FindNewWarehousingById(id, tx)
 
 	warehousing := models.Warehousing{
 		WarehousingOrder: warehouse.WarehousingOrder,
 		StorehouseId:     storehouse_id,
 	}
 
-	service.EditWarehousing(warehousing)
+	service.EditNewWarehousing(warehousing, tx)
 
 	dataBody := make(map[string]interface{}, 0)
 	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
 
 	var warehousingInfo []*models.WarehousingInfo
 	var upDateWarehousingInfo []*models.WarehousingInfo
-	var stockFlow []*models.VmStockFlow
-
 	if dataBody["stockIn"] != nil && reflect.TypeOf(dataBody["stockIn"]).String() == "[]interface {}" {
 		thisStockIn, _ := dataBody["stockIn"].([]interface{})
 		if len(thisStockIn) > 0 {
 					}
 					upDateWarehousingInfo = append(upDateWarehousingInfo, warehouseInfo)
 
-					flow := &models.VmStockFlow{
-						WarehousingOrder:    warehousing.WarehousingOrder,
-						WarehousingId:       id,
-						GoodId:              good_id,
-						Number:              number,
-						ProductDate:         productDates,
-						ExpireDate:          expiryDates,
-						Count:               warehousing_count,
-						Price:               price,
-						Status:              1,
-						Ctime:               ctime,
-						UserOrgId:           adminUserInfo.CurrentOrgId,
-						Manufacturer:        manufacturer,
-						Dealer:              dealer,
-						LicenseNumber:       license_number,
-						IsEdit:              2,
-						Creator:             adminUserInfo.AdminUser.Id,
-						SystemTime:          ctime,
-						ConsumableType:      1,
-						WarehousingDetailId: warehouseInfo.ID,
-						StorehouseId:        storehouse_id,
-						RegisterNumber:      register_number,
-						GoodCode:            good_code,
-					}
-
-					stockFlow = append(stockFlow, flow)
 				}
 			}
 		}
 	}
 	var errs error
 	if len(warehousingInfo) > 0 {
-		errs = service.CreateWarehousingInfo(warehousingInfo)
+
+		errs = service.CreateNewWarehousingInfo(warehousingInfo, tx)
 	}
 
 	if len(upDateWarehousingInfo) > 0 {
 		for _, item := range upDateWarehousingInfo {
-			service.UpdateWarehouseInfoByGoodIdOne(item, item.ID)
+			if item.ID > 0 {
+				service.UpdateNewWarehouseInfoByGoodIdOne(item, item.ID, tx)
+			}
+
 		}
 	}
 
 		return
 	}
 
-	list, _ := service.GetAllStockInList(id, adminUserInfo.CurrentOrgId)
+	list, _ := service.GetNewAllStockInList(id, adminUserInfo.CurrentOrgId, tx)
+	tx.Commit()
 	manufacturerList, _ := service.GetAllManufacturerList(adminUserInfo.CurrentOrgId)
 	dealerList, _ := service.GetAllDealerList(adminUserInfo.CurrentOrgId)
 	c.ServeSuccessJSON(map[string]interface{}{
 		return
 	}
 
+	// 开始外部循环的事务
+	db := service.XTWriteDB()
+	tx := db.Begin()
+
+	// 在函数结束时处理事务回滚
+	defer func() {
+		if r := recover(); r != nil {
+			tx.Rollback()
+		}
+	}()
+
 	if warehouseOut_id == 0 {
 		//查询是否生成出库单
-		warehouseOutObj, _ := service.FindStockOutByIsSysOne(adminUserInfo.CurrentOrgId, 0, operation_time, warehousing_out_order)
+		warehouseOutObj, _ := service.FindStockOutByIsSysOne(adminUserInfo.CurrentOrgId, 0, operation_time, warehousing_out_order, tx)
 
 		if warehouseOutObj.ID == 0 {
-			service.AddSigleWarehouseOut(&warehouseOut)
+			service.AddSigleWarehouseOut(&warehouseOut, tx)
 		}
 
 	}
 
 	if warehouseOut_id > 0 {
-		service.UpdateSingleWarehoseOut(warehouseOut_id, storehouse_id)
+		service.UpdateSingleWarehoseOut(warehouseOut_id, storehouse_id, tx)
 	}
 
 	var warehousingOutInfo []*models.WarehouseOutInfo
 		}
 	}
 
-	goodWarehouseOut, _ := service.GetLastGoodWarehouseOutTwenty(adminUserInfo.CurrentOrgId)
+	goodWarehouseOut, _ := service.GetLastGoodWarehouseOutTwentyOne(adminUserInfo.CurrentOrgId, tx)
 
 	if len(warehousingOutInfo) > 0 {
 		for _, it := range warehousingOutInfo {
 			if it.ID == 0 {
 
 				//查询改耗材是否出库
-				outInfo, _ := service.GetGoodsIsExsit(it.GoodId, it.SysRecordTime, it.OrgId, goodWarehouseOut.ID)
+				outInfo, _ := service.GetGoodsIsExsit(it.GoodId, it.SysRecordTime, it.OrgId, goodWarehouseOut.ID, tx)
 				if outInfo.ID == 0 {
-					service.AddSigleWarehouseOutInfo(warehouseOutInfo)
+					service.AddSigleWarehouseOutInfo(warehouseOutInfo, tx)
 				}
 
 			}
 			if it.ID > 0 {
-				service.ModifyWarehouseOutInfo(it.ID, warehouseOutInfo)
+				service.ModifyWarehouseOutInfo(it.ID, warehouseOutInfo, tx)
 			}
 		}
 	}
 
 	appId := adminUserInfo.CurrentAppId
 
-	warehouseOutInfoList, _ := service.GetLastGoodWarehouseOutInfo(adminUserInfo.CurrentOrgId, goodWarehouseOut.ID)
+	warehouseOutInfoList, _ := service.GetLastGoodWarehouseOutInfo(adminUserInfo.CurrentOrgId, goodWarehouseOut.ID, tx)
 	manufacturerList, _ := service.GetAllManufacturerList(adminUserInfo.CurrentOrgId)
 	dealerList, _ := service.GetAllDealerList(adminUserInfo.CurrentOrgId)
 	doctorList, _ := service.GetAllDoctorListSix(adminUserInfo.CurrentOrgId, appId)
+	tx.Commit()
 	c.ServeSuccessJSON(map[string]interface{}{
 		"msg":                  "2",
 		"good_name":            "",
 func (c *StockManagerApiController) GetWarehouseOutInfoList() {
 	id, _ := c.GetInt64("id", 0)
 	warehouseOutInfo, _ := service.FindWarehouseOutInfoById(id)
-	warehouseOut, _ := service.FindWareHouseOutById(id)
+	warehouseOut, _ := service.FindWareHouseOutByIdOne(id)
 	adminUserInfo := c.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
 	wareoutList, _ := service.GetWareOutInfoById(id, orgId)
 
 }
 func (c *StockManagerApiController) EditWarehouseOut() {
+
 	warehouse_out_time := c.GetString("warehouse_out_time")
 	id, _ := c.GetInt64("id", 0)
 	types, _ := c.GetInt64("type", 0)
 		return
 	}
 
-	warehouseOut, _ := service.FindWareHouseOutById(id)
+	// 开始外部循环的事务
+	db := service.XTWriteDB()
+	tx := db.Begin()
+
+	// 在函数结束时处理事务回滚
+	defer func() {
+		if r := recover(); r != nil {
+			tx.Rollback()
+		}
+	}()
+
+	warehouseOut, _ := service.FindWareHouseOutById(id, tx)
 
 	tempWarehouseOut := models.WarehouseOut{
 		ID:               warehouseOut.ID,
 		StorehouseId:     storehouse_id,
 	}
 
-	service.EditWarehouseOut(tempWarehouseOut)
+	service.EditWarehouseOut(tempWarehouseOut, tx)
 
 	dataBody := make(map[string]interface{}, 0)
 	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
 
 		for _, item := range warehousingOutInfo {
 			//查询改耗材是否出库
-			outInfo, _ := service.GetGoodsIsExsit(item.GoodId, item.SysRecordTime, item.OrgId, item.WarehouseOutId)
+			outInfo, _ := service.GetGoodsIsExsit(item.GoodId, item.SysRecordTime, item.OrgId, item.WarehouseOutId, tx)
 			if outInfo.ID == 0 {
-				service.AddSigleWarehouseOutInfo(item)
+				service.AddSigleWarehouseOutInfo(item, tx)
 			}
 
 		}
 
 	if len(upDateWarehouseOutInfos) > 0 {
 		for _, item := range upDateWarehouseOutInfos {
-			service.UpDateWarehouseOutInfo(item)
+			if item.ID > 0 {
+				service.UpDateWarehouseOutInfo(item, tx)
+			}
+
 		}
 	}
 
+	tx.Commit()
 	if errs != nil {
 		utils.ErrorLog(errs.Error())
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockInFail)
 	_, errcodes := service.FindStockOutByIsSys(adminUserInfo.CurrentOrgId, 0, operation_time)
 
 	if errcodes == gorm.ErrRecordNotFound {
-		service.AddSigleWarehouseOut(&warehouseOut)
+		service.AddSigleWarehouseOutOne(&warehouseOut)
 
 	}
 	out, _ := service.GetLastGoodWarehouseOut(adminUserInfo.CurrentOrgId)
 			LicenseNumber:           item.LicenseNumber,
 			GoodTypeId:              goodinfo.GoodTypeId,
 		}
-		errOne := service.AddSigleWarehouseOutInfo(warehouseOutInfo)
-		fmt.Println("99999999999999", errOne)
+		errOne := service.AddSigleWarehouseOutInfoOne(warehouseOutInfo)
+		fmt.Println("", errOne)
 
 		//更改库存
 		info, _ := service.GetWarehouseInfoById(item.WarehousingInfoId)
 				ProductDate:             warehouseInfo.ProductDate,
 				ExpireDate:              warehouseInfo.ExpiryDate,
 			}
-			errOne := service.AddSigleWarehouseOutInfo(warehouseOutInfo)
+			errOne := service.AddSigleWarehouseOutInfoOne(warehouseOutInfo)
 			fmt.Println(errOne)
 			//创建出库明细
 			service.CreateStockFlowOne(stockFlow)
 
 	id, _ := this.GetInt64("id")
 	orgId := this.GetAdminUserInfo().CurrentOrgId
-	creater := this.GetAdminUserInfo().AdminUser.Id
-	warehouseOut, _ := service.GetWarehouseById(id)
+	// 开始外部循环的事务
+	db := service.XTWriteDB()
+	tx := db.Begin()
+
+	// 在函数结束时处理事务回滚
+	defer func() {
+		if r := recover(); r != nil {
+			tx.Rollback()
+		}
+	}()
+
+	warehouseOut, _ := service.GetNewWarehouseById(id, tx)
 
 	//查询已保存的单据
-	warehousingOutInfo, _ := service.GetWarehouseOutById(id, orgId)
+	warehousingOutInfo, _ := service.GetNewWarehouseOutById(id, orgId, tx)
 
 	////出库逻辑
 	for _, item := range warehousingOutInfo {
 		// 查询该耗材是否有库存
-		warehouseOne, _ := service.FindWarehousingInfoTen(item.GoodId, item.StorehouseId)
-		storehouse, _ := service.FindStoreHouseByStorehouseId(item.StorehouseId, item.OrgId)
+		warehouseOne, _ := service.FindNewWarehousingInfoTen(item.GoodId, item.StorehouseId, tx)
+
+		storehouse, _ := service.FindNewStoreHouseByStorehouseId(item.StorehouseId, item.OrgId, tx)
 
 		// 如果出库数量大于该批次剩余库存数量
 		if item.Count > warehouseOne.StockCount {
-
-			goodErrcode := models.XtGoodErrcode{
-				UserOrgId:      orgId,
-				Errcode:        "出库数量大于该批次剩余库存",
-				GoodId:         0,
-				Status:         0,
-				Ctime:          0,
-				Mtime:          0,
-				Count:          0,
-				StockCount:     0,
-				Creater:        creater,
-				BatchNumberId:  warehouseOne.ID,
-				WarehouseOutId: item.ID,
-			}
-			service.CreateGoodErrcode(goodErrcode)
-			goodObj, _ := service.GetGoodInformationByGoodId(item.GoodId)
+			goodObj, _ := service.GetNewGoodInformationByGoodId(item.GoodId, tx)
+			tx.Rollback()
 			this.ServeSuccessJSON(map[string]interface{}{
 				"msg":                "1",
 				"good_name":          goodObj.GoodName,
 		creater := this.GetAdminUserInfo().AdminUser.Id
 
 		//出库
-		err := service.ConsumablesDeliveryThirty(orgId, item.SysRecordTime, item, &warehouseOut, item.Count, creater)
+		err := service.ConsumablesNewDeliveryThirty(orgId, item.SysRecordTime, item, &warehouseOut, item.Count, creater, tx)
+
 		if err != nil {
-			goodErrcode := models.XtGoodErrcode{
-				UserOrgId:      orgId,
-				Errcode:        "调用出库接口报错",
-				GoodId:         item.GoodId,
-				Status:         1,
-				Ctime:          time.Now().Unix(),
-				Mtime:          0,
-				Count:          0,
-				StockCount:     0,
-				Creater:        creater,
-				BatchNumberId:  0,
-				WarehouseOutId: 0,
-			}
-			service.CreateGoodErrcode(goodErrcode)
+			tx.Rollback()
+			return
 		}
 
-		goodList, _ := service.GetSumGoodList(orgId, item.StorehouseId, item.GoodId)
+		goodList, _ := service.GetNewSumGoodList(orgId, item.StorehouseId, item.GoodId, tx)
 		var flush_count int64
 		for _, it := range goodList {
 			flush_count += it.StockCount
 		}
-		errs := service.UpdateSumGood(orgId, item.StorehouseId, item.GoodId, flush_count)
-		if errs != nil {
-			goodErrcode := models.XtGoodErrcode{
-				UserOrgId:      orgId,
-				Errcode:        "手动出库更新剩余出库失败",
-				GoodId:         item.GoodId,
-				Status:         1,
-				Ctime:          time.Now().Unix(),
-				Mtime:          0,
-				Count:          0,
-				StockCount:     0,
-				Creater:        creater,
-				BatchNumberId:  0,
-				WarehouseOutId: 0,
-			}
-			service.CreateGoodErrcode(goodErrcode)
-		}
+		service.UpdateNewSumGood(orgId, item.StorehouseId, item.GoodId, flush_count, tx)
 
 		orgId := this.GetAdminUserInfo().CurrentOrgId
 		//查询默认仓库
-		storeHouseConfig, _ := service.GetAllStoreHouseConfig(orgId)
-		stockList, _ := service.GetStockCountByGoodId(item.GoodId, storeHouseConfig.StorehouseOutInfo, orgId)
+		storeHouseConfig, _ := service.GetNewAllStoreHouseConfig(orgId, tx)
+		stockList, _ := service.GetNewStockCountByGoodId(item.GoodId, storeHouseConfig.StorehouseOutInfo, orgId, tx)
 		var total_count int64
 		for _, it := range stockList {
 			total_count += it.StockCount
 		}
 		//基础库扣减库存
-		errsum := service.UpdateGoodInfoReduceSumCount(item.GoodId, total_count, orgId)
-		if errsum != nil {
-			goodErrcode := models.XtGoodErrcode{
-				UserOrgId:      orgId,
-				Errcode:        "基础库扣减库存报错",
-				GoodId:         item.GoodId,
-				Status:         1,
-				Ctime:          time.Now().Unix(),
-				Mtime:          0,
-				Count:          0,
-				StockCount:     0,
-				Creater:        creater,
-				BatchNumberId:  0,
-				WarehouseOutId: 0,
-			}
-			service.CreateGoodErrcode(goodErrcode)
-		}
+		service.UpdateNewGoodInfoReduceSumCount(item.GoodId, total_count, orgId, tx)
+
 	}
 
 	//审核单据
-	err := service.UpdatedWarehouseOut(id)
-	if err != nil {
-		goodErrcode := models.XtGoodErrcode{
-			UserOrgId:      orgId,
-			Errcode:        "审核单据报错",
-			GoodId:         0,
-			Status:         1,
-			Ctime:          time.Now().Unix(),
-			Mtime:          0,
-			Count:          0,
-			StockCount:     0,
-			Creater:        creater,
-			BatchNumberId:  0,
-			WarehouseOutId: 0,
-		}
-		service.CreateGoodErrcode(goodErrcode)
-	}
+	err := service.UpdatedNewWarehouseOut(id, tx)
+
+	tx.Commit()
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
 			"msg":                "2",
 
 	id, _ := this.GetInt64("id")
 	orgId := this.GetAdminUserInfo().CurrentOrgId
-	creater := this.GetAdminUserInfo().AdminUser.Id
+
+	// 开始外部循环的事务
+	db := service.XTWriteDB()
+	tx := db.Begin()
+
+	// 在函数结束时处理事务回滚
+	defer func() {
+		if r := recover(); r != nil {
+			tx.Rollback()
+		}
+	}()
 	// 查询出库数据
-	list, err := service.GetWarehouseOutById(id, orgId)
-	if err != nil {
-		goodErrcode := models.XtGoodErrcode{
-			UserOrgId:      orgId,
-			Errcode:        "反审核查询出库单报错",
-			GoodId:         0,
-			Status:         1,
-			Ctime:          time.Now().Unix(),
-			Mtime:          0,
-			Count:          0,
-			StockCount:     0,
-			Creater:        creater,
-			BatchNumberId:  0,
-			WarehouseOutId: 0,
-		}
-		service.CreateGoodErrcode(goodErrcode)
-	}
+	list, err := service.GetNewWarehouseOutById(id, orgId, tx)
 	for _, item := range list {
 		//回退库存
-		err := service.UpdateaGoodWarehouseInfo(item.Count, item.GoodId, item.OrgId, item.WarehouseInfotId)
-		if err != nil {
-			goodErrcode := models.XtGoodErrcode{
-				UserOrgId:      orgId,
-				Errcode:        "反审核回退库存报错",
-				GoodId:         0,
-				Status:         1,
-				Ctime:          time.Now().Unix(),
-				Mtime:          0,
-				Count:          0,
-				StockCount:     0,
-				Creater:        creater,
-				BatchNumberId:  0,
-				WarehouseOutId: 0,
-			}
-			service.CreateGoodErrcode(goodErrcode)
-		}
+		service.UpdateaNewGoodWarehouseInfo(item.Count, item.GoodId, item.OrgId, item.WarehouseInfotId, tx)
+
 		//查询默认仓库
-		storeHouseConfig, errs := service.GetAllStoreHouseConfig(orgId)
-		if errs != nil {
-			goodErrcode := models.XtGoodErrcode{
-				UserOrgId:      orgId,
-				Errcode:        "反审核查询默认仓库报错",
-				GoodId:         0,
-				Status:         1,
-				Ctime:          time.Now().Unix(),
-				Mtime:          0,
-				Count:          0,
-				StockCount:     0,
-				Creater:        creater,
-				BatchNumberId:  0,
-				WarehouseOutId: 0,
-			}
-			service.CreateGoodErrcode(goodErrcode)
-		}
-		stockList, errcodes := service.GetStockCountByGoodId(item.GoodId, storeHouseConfig.StorehouseOutInfo, orgId)
-		if errcodes != nil {
-			goodErrcode := models.XtGoodErrcode{
-				UserOrgId:      orgId,
-				Errcode:        "反审核查询默认仓库库存报错",
-				GoodId:         0,
-				Status:         1,
-				Ctime:          time.Now().Unix(),
-				Mtime:          0,
-				Count:          0,
-				StockCount:     0,
-				Creater:        creater,
-				BatchNumberId:  0,
-				WarehouseOutId: 0,
-			}
-			service.CreateGoodErrcode(goodErrcode)
-		}
+		storeHouseConfig, _ := service.GetNewAllStoreHouseConfig(orgId, tx)
+
+		stockList, _ := service.GetNewStockCountByGoodId(item.GoodId, storeHouseConfig.StorehouseOutInfo, orgId, tx)
+
 		var total_count int64
 		for _, it := range stockList {
 			total_count += it.StockCount
 		}
 		//基础库扣减库存
-		errs = service.UpdateGoodInfoReduceSumCount(item.GoodId, total_count, orgId)
-		if errs != nil {
-			goodErrcode := models.XtGoodErrcode{
-				UserOrgId:      orgId,
-				Errcode:        "反审核基础库扣减库存报错",
-				GoodId:         0,
-				Status:         1,
-				Ctime:          time.Now().Unix(),
-				Mtime:          0,
-				Count:          0,
-				StockCount:     0,
-				Creater:        creater,
-				BatchNumberId:  0,
-				WarehouseOutId: 0,
-			}
-			service.CreateGoodErrcode(goodErrcode)
-		}
+		service.UpdateNewGoodInfoReduceSumCount(item.GoodId, total_count, orgId, tx)
 
-		goodList, _ := service.GetSumGoodList(orgId, item.StorehouseId, item.GoodId)
+		goodList, _ := service.GetNewSumGoodList(orgId, item.StorehouseId, item.GoodId, tx)
 		var flush_count int64
 		for _, it := range goodList {
 			flush_count += it.StockCount
 		}
-		erros := service.UpdateSumGood(orgId, item.StorehouseId, item.GoodId, flush_count)
-		if erros != nil {
-			goodErrcode := models.XtGoodErrcode{
-				UserOrgId:      orgId,
-				Errcode:        "手动出库更新剩余库存报错",
-				GoodId:         0,
-				Status:         1,
-				Ctime:          time.Now().Unix(),
-				Mtime:          0,
-				Count:          0,
-				StockCount:     0,
-				Creater:        creater,
-				BatchNumberId:  0,
-				WarehouseOutId: 0,
-			}
-			service.CreateGoodErrcode(goodErrcode)
-		}
+		service.UpdateNewSumGood(orgId, item.StorehouseId, item.GoodId, flush_count, tx)
+
 		//扣减出库数据
-		errcoeds := service.ModifyReduceGoodSumCount(item.StorehouseId, item.Count, orgId, item.GoodId)
-		if errcoeds != nil {
-			goodErrcode := models.XtGoodErrcode{
-				UserOrgId:      orgId,
-				Errcode:        "反审核扣减出库数据报错",
-				GoodId:         0,
-				Status:         1,
-				Ctime:          time.Now().Unix(),
-				Mtime:          0,
-				Count:          0,
-				StockCount:     0,
-				Creater:        creater,
-				BatchNumberId:  0,
-				WarehouseOutId: 0,
-			}
-			service.CreateGoodErrcode(goodErrcode)
-		}
+		service.ModifyNewReduceGoodSumCount(item.StorehouseId, item.Count, orgId, item.GoodId, tx)
 
 	}
 	//删除流水，改变审核状态
-	errcos := service.ModifyGoodWarehouseOut(id)
-	if errcos != nil {
-		goodErrcode := models.XtGoodErrcode{
-			UserOrgId:      orgId,
-			Errcode:        "反审核删除流水，改变审核状态报错",
-			GoodId:         0,
-			Status:         1,
-			Ctime:          time.Now().Unix(),
-			Mtime:          0,
-			Count:          0,
-			StockCount:     0,
-			Creater:        creater,
-			BatchNumberId:  0,
-			WarehouseOutId: 0,
-		}
-		service.CreateGoodErrcode(goodErrcode)
-	}
+	service.ModifyNewGoodWarehouseOut(id, tx)
+
+	tx.Commit()
 
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
 	warehousing_info_id, _ := this.GetInt64("warehousing_info_id")
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	Creator := this.GetAdminUserInfo().AdminUser.Id
+
+	// 开始外部循环的事务
+	db := service.XTWriteDB()
+	tx := db.Begin()
+
+	// 在函数结束时处理事务回滚
+	defer func() {
+		if r := recover(); r != nil {
+			tx.Rollback()
+		}
+	}()
+
 	//查询默认仓库
-	storeHouseConfig, _ := service.GetAllStoreHouseConfig(orgId)
+	storeHouseConfig, _ := service.GetNewAllStoreHouseConfig(orgId, tx)
 
 	checker := this.GetAdminUserInfo().AdminUser.Id
 	//更改审核状态
-	err := service.UpdateCheckWarehouseInfo(warehousing_info_id, checker)
+	err := service.UpdateNewCheckWarehouseInfo(warehousing_info_id, checker, tx)
 	if err == nil {
-		list, _ := service.GetWarehouseInfoList(warehousing_info_id, orgId)
+		list, _ := service.GetNewWarehouseInfoList(warehousing_info_id, orgId, tx)
 
 		for _, item := range list {
-			service.UpdateWarehouseInfoByIdListThree(item.WarehousingCount, item.ID)
+			service.UpdateNewWarehouseInfoByIdListThree(item.WarehousingCount, item.ID, tx)
 
 			//查询该耗材剩余库存库
-			stockList, _ := service.GetStockCountByGoodId(item.GoodId, storeHouseConfig.StorehouseOutInfo, orgId)
+			stockList, _ := service.GetNewStockCountByGoodId(item.GoodId, storeHouseConfig.StorehouseOutInfo, orgId, tx)
 			var total_count int64
 			var sum_in_count int64
 			for _, it := range stockList {
 				sum_in_count += it.WarehousingCount
 			}
 			//基础库插入数据
-			service.UpdateGoodInfoAddSumCount(item.GoodId, total_count, orgId, sum_in_count)
+			service.UpdateNewGoodInfoAddSumCount(item.GoodId, total_count, orgId, sum_in_count, tx)
 
 			//查询该仓库是否有数据
-			_, errcode := service.GetGoodStockCount(orgId, item.StorehouseId, item.GoodId)
-			goodList, _ := service.GetSumGoodList(orgId, item.StorehouseId, item.GoodId)
+			_, errcode := service.GetNewGoodStockCount(orgId, item.StorehouseId, item.GoodId, tx)
+
+			goodList, _ := service.GetNewSumGoodList(orgId, item.StorehouseId, item.GoodId, tx)
 			var flush_count int64
 			for _, it := range goodList {
 				flush_count += it.StockCount
 				GoodCode:                item.GoodCode,
 			}
 			//创建出库流水
-			service.CreateStockFlowOne(stockFlow)
+			service.CreateNewStockFlowOne(stockFlow, tx)
 
 			if errcode == gorm.ErrRecordNotFound {
 
 					FlushCount:       flush_count,
 					StockActOutCount: 0,
 				}
-				service.CreateGoodCount(goodCount)
+				service.CreateNewGoodCount(goodCount, tx)
 			}
 			if errcode == nil {
-				service.UpdateGoodStockCount(orgId, item.StorehouseId, item.GoodId, item.WarehousingCount, flush_count)
+				service.UpdateNewGoodStockCount(orgId, item.StorehouseId, item.GoodId, item.WarehousingCount, flush_count, tx)
 			}
 		}
 	}
 
+	tx.Commit()
+
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
 			"list": "list",
 
 	warehousing_info_id, _ := this.GetInt64("warehousing_info_id")
 	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	// 开始外部循环的事务
+	db := service.XTWriteDB()
+	tx := db.Begin()
+
+	// 在函数结束时处理事务回滚
+	defer func() {
+		if r := recover(); r != nil {
+			tx.Rollback()
+		}
+	}()
+
 	//查询入库数据
-	list, _ := service.GetWarehouseInfoList(warehousing_info_id, orgId)
+	list, _ := service.GetNewWarehouseInfoList(warehousing_info_id, orgId, tx)
 	for _, item := range list {
 		//查询该耗材 是否有出库数据
-		outlist, _ := service.GetWarehouseOutByWarehouseInfoId(item.ID, item.GoodId, item.OrgId)
+		outlist, _ := service.GetNewWarehouseOutByWarehouseInfoId(item.ID, item.GoodId, item.OrgId, tx)
 
 		if len(outlist) > 0 {
+			tx.Rollback()
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCheckGoodParamWrong)
 			return
 		}
 	}
-	//for _, item := range list {
-	//
-	//	//扣减数量
-	//	service.UpdateWarehouseInfoByIdListTwo(item.WarehousingCount, item.ID)
-	//
-	//	//删除流水
-	//	service.UpdateWarehouseInfoFlow(item.ID)
-	//
-	//	goodList, _ := service.GetSumGoodList(orgId, item.StorehouseId, item.GoodId)
-	//	var flush_count int64
-	//	for _, it := range goodList {
-	//		flush_count += it.StockCount
-	//	}
-	//
-	//	//扣减数量
-	//	service.UpdateGoodInCount(item.WarehousingCount, item.OrgId, item.GoodId, item.StorehouseId, flush_count)
-	//
-	//	//查询默认仓库
-	//	storeHouseConfig, _ := service.GetAllStoreHouseConfig(orgId)
-	//	//查询该耗材剩余多少库存
-	//	stockList, _ := service.GetStockCountByGoodId(item.GoodId, storeHouseConfig.StorehouseOutInfo, orgId)
-	//	var sum_count int64
-	//	var sum_in_count int64
-	//	for _, it := range stockList {
-	//		sum_count += it.StockCount
-	//		sum_in_count += it.WarehousingCount
-	//	}
-	//	service.UpdateGoodInfoAddSumCount(item.GoodId, sum_count, orgId, sum_in_count)
-	//}
-	//err := service.ReturnCheckWarehouseInfo(warehousing_info_id)
 
-	err := service.UpdateWarehouseInfoMap(list, warehousing_info_id, orgId)
+	err := service.UpdateNewWarehouseInfoMap(list, warehousing_info_id, orgId, tx)
+	tx.Commit()
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
 			"msg": "反审核成功!",
 	//	service.UpdateDealerManufacturerOne(item.ID, manufacturer.ManufacturerName)
 	//}
 
-	drugList, _ := service.GetAllBaseDrugListTwentyOne(10598)
+	drugList, _ := service.GetAllBaseDrugListTwentyOne(10215)
 
 	for _, item := range drugList {
 		var drug_spec = item.Dose + item.DoseUnit + "*" + strconv.FormatInt(item.MinNumber, 10) + item.MinUnit + "/" + item.MaxUnit

controllers/supply_order_api_contorller.go

 package controllers
 
 import (
-	"XT_New/enums"
-	"XT_New/models"
-	"XT_New/service"
-	"XT_New/utils"
 	"encoding/json"
 	"fmt"
-	"github.com/astaxie/beego"
-	"github.com/jinzhu/gorm"
 	"reflect"
 	"strconv"
 	"strings"
 	"time"
+
+	"XT_New/enums"
+	"XT_New/models"
+	"XT_New/service"
+	"XT_New/utils"
+	"github.com/astaxie/beego"
+	"github.com/jinzhu/gorm"
 )
 
 type SupplyOrderApiController struct {
 			//查询是否生成出库单
 			_, errcodes := service.FindStockOutByIsSys(orgId, 0, record_date)
 			if errcodes == gorm.ErrRecordNotFound {
-				service.AddSigleWarehouseOut(&warehouseOut)
+				service.AddSigleWarehouseOutOne(&warehouseOut)
 			}
 			outWarehouse, _ := service.GetlastWarehouseOutById(orgId, record_date)
 

service/new_stock_service.go

 	return &goodStock, nil
 }
 
+func GetNewGoodStockCount(user_org_id int64, storehouse_id int64, good_id int64, tx *gorm.DB) (*models.XtGoodStockCount, error) {
+
+	goodStock := models.XtGoodStockCount{}
+	var err error
+	err = tx.Where("user_org_id = ? and storehouse_id = ? and good_id = ?", user_org_id, storehouse_id, good_id).Find(&goodStock).Error
+	if err == gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return nil, err
+		}
+
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &goodStock, nil
+}
+
 func CreateGoodCount(good models.XtGoodStockCount) error {
 
 	db := writeDb.Begin()
 	return err
 }
 
+func CreateNewGoodCount(good models.XtGoodStockCount, tx *gorm.DB) error {
+
+	err := tx.Create(&good).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}
+
 func UpdateGoodStockCount(user_org_id int64, storehouse_id int64, good_id int64, count int64, flush_count int64) error {
 
 	db := writeDb.Begin()
 	return err
 }
 
+func UpdateNewGoodStockCount(user_org_id int64, storehouse_id int64, good_id int64, count int64, flush_count int64, tx *gorm.DB) error {
+
+	err = tx.Model(&models.XtGoodStockCount{}).Where("user_org_id = ? and storehouse_id  = ? and good_id  = ? and status = 1", user_org_id, storehouse_id, good_id).UpdateColumn("stock_in_count", gorm.Expr("stock_in_count + ?", count)).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	err = tx.Model(&models.XtGoodStockCount{}).Where("user_org_id = ? and storehouse_id = ? and good_id = ? and status = 1", user_org_id, storehouse_id, good_id).Update(map[string]interface{}{"flush_count": flush_count}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+
+	return err
+}
+
 func UpdateGoodInCount(count int64, user_org_id int64, good_id int64, storehouse_id int64, flush_count int64) error {
 	db := writeDb.Begin()
 	err := db.Model(&models.XtGoodStockCount{}).Where("user_org_id = ? and good_id  = ? and storehouse_id = ? and status = 1", user_org_id, good_id, storehouse_id).UpdateColumn("stock_in_count", gorm.Expr("stock_in_count - ?", count)).Error
 	return info, err
 }
 
+func GetNewSumGoodList(orgid int64, storehouse_id int64, good_id int64, tx *gorm.DB) (info []*models.WarehousingInfo, err error) {
+
+	err = tx.Where("org_id = ? and storehouse_id = ? and good_id = ? and status =1  and is_check = 1", orgid, storehouse_id, good_id).Find(&info).Error
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			return info, err
+		}
+	}
+	return info, err
+}
+
 func UpdateSumGood(orgid int64, storehouse_id int64, good_id int64, flush_count int64) error {
 	db := writeDb.Begin()
 	err := db.Model(&models.XtGoodStockCount{}).Where("user_org_id = ? and storehouse_id = ? and good_id = ? and status = 1", orgid, storehouse_id, good_id).Updates(map[string]interface{}{"flush_count": flush_count}).Error
 	return err
 }
 
+func UpdateNewSumGood(orgid int64, storehouse_id int64, good_id int64, flush_count int64, tx *gorm.DB) error {
+
+	err := tx.Model(&models.XtGoodStockCount{}).Where("user_org_id = ? and storehouse_id = ? and good_id = ? and status = 1", orgid, storehouse_id, good_id).Updates(map[string]interface{}{"flush_count": flush_count}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}
+
 func ReduceSumOutCount(good_id int64, total_count int64, storehouse_id int64, user_org_id int64) error {
 	ut := XTWriteDB().Begin()
 
 	return &drugStockCount, nil
 }
 
+func GetNewDrugStockCount(storehouse_id int64, drug_id int64, org_id int64, tx *gorm.DB) (*models.XtDrugStockCount, error) {
+	drugStockCount := models.XtDrugStockCount{}
+	var err error
+	err = tx.Where("storehouse_id = ? and drug_id = ? and user_org_id  = ? and status = 1", storehouse_id, drug_id, org_id).Find(&drugStockCount).Error
+	if err == gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return nil, err
+		}
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &drugStockCount, nil
+}
+
 func GetDrugStockCountSix(storehouse_id int64, drug_id int64, org_id int64) (models.XtDrugStockCount, error) {
 
 	drugStockCount := models.XtDrugStockCount{}
 	return err
 }
 
+func CreateNewDrugStockSum(drug models.XtDrugStockCount, tx *gorm.DB) error {
+
+	err := tx.Create(&drug).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}
+
 func AddDrugStockSum(storehouse_id int64, drug_id int64, user_org_id int64, waresing_count int64, over_count int64) error {
 
 	db := writeDb.Begin()
 	return err
 }
 
+func UpdateNewDrugStockSum(storehouse_id int64, drug_id int64, user_org_id int64, waresing_count int64, over_count int64, tx *gorm.DB) error {
+
+	err = tx.Model(&models.XtDrugStockCount{}).Where("user_org_id = ? and storehouse_id  = ? and drug_id  = ? and status = 1", user_org_id, storehouse_id, drug_id).Update(map[string]interface{}{"sum_in_count": waresing_count}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	err = tx.Model(&models.XtDrugStockCount{}).Where("user_org_id = ? and storehouse_id = ? and drug_id = ? and status = 1", user_org_id, storehouse_id, drug_id).Update(map[string]interface{}{"flush_count": over_count}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}
+
 func ReduceDrugStockCount(storehouse_id int64, drug_id int64, user_org_id int64, waresing_count int64, over_count int64) error {
 	db := writeDb.Begin()
 	err = db.Model(&models.XtDrugStockCount{}).Where("user_org_id = ? and storehouse_id  = ? and drug_id = ? and status = 1", user_org_id, storehouse_id, drug_id).UpdateColumn("sum_in_count", gorm.Expr("sum_in_count - ?", waresing_count)).Error
 	return err
 }
 
+func ReduceNewDrugStockCount(storehouse_id int64, drug_id int64, user_org_id int64, waresing_count int64, over_count int64, tx *gorm.DB) error {
+
+	err = tx.Model(&models.XtDrugStockCount{}).Where("user_org_id = ? and storehouse_id  = ? and drug_id = ? and status = 1", user_org_id, storehouse_id, drug_id).UpdateColumn("sum_in_count", gorm.Expr("sum_in_count - ?", waresing_count)).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	err = tx.Model(&models.XtDrugStockCount{}).Where("user_org_id = ? and storehouse_id = ? and drug_id = ? and status = 1", user_org_id, storehouse_id, drug_id).Update(map[string]interface{}{"flush_count": over_count}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}
+
 func AddCancelSumCount(storehouse_id int64, drug_id int64, user_org_id int64, cancel_count int64, over_count int64) error {
 
 	db := writeDb.Begin()

service/new_warehouse_service.go

 		}
 		_, errcodes := GetWarehouseOutInfoIsExistOne(goods.GoodId, patient_id, record_time, goods.ProjectId)
 		if errcodes == gorm.ErrRecordNotFound {
-			errOne := AddSigleWarehouseOutInfo(warehouseOutInfo)
+			errOne := AddSigleWarehouseOutInfoOne(warehouseOutInfo)
 			if errOne != nil {
 				return errOne
 			}
 		_, errcodes := GetWarehouseOutInfoIsExistOne(goods.GoodId, patient_id, record_time, goods.ProjectId)
 
 		if errcodes == gorm.ErrRecordNotFound {
-			errOne := AddSigleWarehouseOutInfo(warehouseOutInfo)
+			errOne := AddSigleWarehouseOutInfoOne(warehouseOutInfo)
 			if errOne != nil {
 				return errOne
 			}
 	return err
 }
 
+func ReduceNewDrugCount(drug_id int64, org_id int64, storehouse_id int64, out_count int64, tx *gorm.DB) error {
+
+	err := tx.Model(&models.XtDrugStockCount{}).Where("storehouse_id = ? and status = 1 and user_org_id = ? and drug_id = ?", storehouse_id, org_id, drug_id).UpdateColumn("sum_out_count", gorm.Expr("sum_out_count - ?", out_count)).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	err = tx.Model(&models.XtDrugStockCount{}).Where("storehouse_id = ? and status = 1 and user_org_id = ? and drug_id = ?", storehouse_id, org_id, drug_id).UpdateColumn("sum_act_out_count", gorm.Expr("sum_act_out_count - ?", out_count)).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}
+
 func ReduceDrugCountTwo(drug_id int64, org_id int64, storehouse_id int64, out_count int64) error {
 	ut := XTWriteDB().Begin()
 	err := ut.Model(&models.XtDrugStockCount{}).Where("storehouse_id = ? and status = 1 and user_org_id = ? and drug_id = ?", storehouse_id, org_id, drug_id).UpdateColumn("sum_out_count", gorm.Expr("sum_out_count - ?", out_count)).Error

service/secondary_service.go

 
 	config := models.XtStorehouseConfig{}
 	err = XTReadDB().Where("user_org_id = ? and status = 1", orgid).First(&config).Error
+
 	return config, err
 }
 
 	return storehouse, err
 }
 
+func FindNewStoreHouseByStorehouseId(id int64, user_org_id int64, tx *gorm.DB) (models.XtStorehouse, error) {
+	storehouse := models.XtStorehouse{}
+	err := tx.Where("id = ? and user_org_id = ? and status = 1", id, user_org_id).Find(&storehouse).Error
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return storehouse, err
+		}
+	}
+	return storehouse, err
+}
+
 func GetSecondWarehouseByNumber(user_org_id int64, warehousing_order string) (*models.XtSecondWarehouse, error) {
 
 	warehouse := models.XtSecondWarehouse{}
 	return info, err
 }
 
+func GetNewDrugSumCountByStorehouseId(storehouse_id int64, orgid int64, drug_id int64, tx *gorm.DB) (info []*models.DrugWarehouseInfo, err error) {
+
+	err = tx.Where("storehouse_id = ? and org_id = ? and status = 1  and drug_id =? and is_check = 1", storehouse_id, orgid, drug_id).Find(&info).Error
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return info, err
+		}
+
+	}
+	return info, err
+}
+
 func GetDrugSumCountByStorehouseIdSix(storehouse_id int64, orgid int64) (info []*models.DrugWarehouseInfo, err error) {
 
 	err = XTReadDB().Where("storehouse_id = ? and org_id = ? and status = 1 and (stock_max_number >0 or stock_min_number>0)", storehouse_id, orgid).Find(&info).Error

service/self_drug_service.go

 	return drug, err
 }
 
-func GetDrugWarehosueInfoById(drug_id int64, org_id int64) (drugInfo []*models.XtDrugWarehouseInfo, err error) {
-
-	err = XTReadDB().Where("drug_id = ? and org_id = ? and status =1", drug_id, org_id).Find(&drugInfo).Error
-
-	return drugInfo, err
-}
-
-func GetBaseDrugMedicalOne(id int64, tx *gorm.DB) (models.XtBaseDrug, error) {
+func GetNewBaseDrugMedical(id int64, tx *gorm.DB) (models.XtBaseDrug, error) {
 	drug := models.XtBaseDrug{}
 	err := tx.Model(&drug).Where("id = ? and status = 1", id).Find(&drug).Error
 	if err != gorm.ErrRecordNotFound {
 			tx.Rollback()
 			return drug, err
 		}
-
 	}
 	return drug, err
 }
 
-func GetNewBaseDrugMedical(id int64, tx *gorm.DB) (models.XtBaseDrug, error) {
+func GetDrugWarehosueInfoById(drug_id int64, org_id int64) (drugInfo []*models.XtDrugWarehouseInfo, err error) {
+
+	err = XTReadDB().Where("drug_id = ? and org_id = ? and status =1", drug_id, org_id).Find(&drugInfo).Error
+
+	return drugInfo, err
+}
+
+func GetBaseDrugMedicalOne(id int64, tx *gorm.DB) (models.XtBaseDrug, error) {
 	drug := models.XtBaseDrug{}
 	err := tx.Model(&drug).Where("id = ? and status = 1", id).Find(&drug).Error
 	if err != gorm.ErrRecordNotFound {

service/supply_service.go

 package service
 
 import (
-	"XT_New/models"
 	"fmt"
-	"github.com/jinzhu/gorm"
 	"strings"
 	"time"
+
+	"XT_New/models"
+	"github.com/jinzhu/gorm"
 )
 
 // 根据供应商编号获取首要联系人
 	return out, err
 }
 
+func GetNewWarehouseOutById(id int64, orgid int64, tx *gorm.DB) (out []*models.WarehouseOutInfo, err error) {
+
+	err = tx.Where("warehouse_out_id = ? and status= 1 and org_id = ?", id, orgid).Find(&out).Error
+
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return out, err
+		}
+	}
+	return out, err
+}
+
 func DeleteWarehouseOutById(id int64) error {
 
 	err := XTWriteDB().Model(&models.WarehouseOut{}).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"status": 0}).Error

service/warhouse_service.go

 				StorehouseId:            houseConfig.StorehouseOutInfo,
 				IsCheck:                 1,
 			}
-			err := AddSigleWarehouseOut(&warehouseOut)
+			err := AddSigleWarehouseOutOne(&warehouseOut)
 			if err != nil {
 				utils.TraceLog("创建出库单失败 err = %v", err)
 				return err
 
 		_, errcodes := GetWarehouseOutInfoIsExistOne(goods.GoodId, patient_id, record_time, goods.ProjectId)
 		if errcodes == gorm.ErrRecordNotFound {
-			errOne := AddSigleWarehouseOutInfo(warehouseOutInfo)
+			errOne := AddSigleWarehouseOutInfoOne(warehouseOutInfo)
 			if errOne != nil {
 				return errOne
 			}
 		_, errcodes := GetWarehouseOutInfoIsExistOne(goods.GoodId, goods.PatientId, record_time, goods.ProjectId)
 
 		if errcodes == gorm.ErrRecordNotFound {
-			errOne := AddSigleWarehouseOutInfo(warehouseOutInfo)
+			errOne := AddSigleWarehouseOutInfoOne(warehouseOutInfo)
 
 			if errOne != nil {
 				return errOne
 	return out, err
 }
 
+func GetNewWarehouseById(id int64, tx *gorm.DB) (models.WarehouseOut, error) {
+	out := models.WarehouseOut{}
+	err := tx.Where("id=? and status = 1", id).Find(&out).Error
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			return out, err
+		}
+	}
+	return out, err
+}
+
 // 耗材出库
 func ConsumablesDeliveryOne(orgID int64, record_time int64, goods *models.WarehouseOutInfo, warehouseOut *models.WarehouseOut, count int64, creator int64) (err error) {
 
 		}
 		warehouseOutInfo.Count = goods.Count
 		//添加出库单详情
-		errOne := AddSigleWarehouseOutInfo(warehouseOutInfo)
+		errOne := AddSigleWarehouseOutInfoOne(warehouseOutInfo)
 		if errOne != nil {
 			return errOne
 		}
 		info, errcodes := GetStockInRecoredByGoodIdOne(goods.GoodId, goods.GoodTypeId, goods.SysRecordTime, goods.OrgId)
 		if errcodes == gorm.ErrRecordNotFound {
 			//创建出库单
-			errOne := AddSigleWarehouseOutInfo(warehouseOutInfo)
+			errOne := AddSigleWarehouseOutInfoOne(warehouseOutInfo)
 			if errOne != nil {
 				return errOne
 			}
 		}
 		warehouseOutInfo.Count = goods.Count
 
-		errOne := AddSigleWarehouseOutInfo(warehouseOutInfo)
+		errOne := AddSigleWarehouseOutInfoOne(warehouseOutInfo)
 		if errOne != nil {
 			return errOne
 		}
 		}
 		warehouseOutInfo.Count = stock_number
 
-		errOne := AddSigleWarehouseOutInfo(warehouseOutInfo)
+		errOne := AddSigleWarehouseOutInfoOne(warehouseOutInfo)
 		if errOne != nil {
 			return errOne
 		}
 		}
 		warehouseOutInfo.Count = goods.Count
 		//添加出库单详情
-		errOne := AddSigleWarehouseOutInfo(warehouseOutInfo)
+		errOne := AddSigleWarehouseOutInfoOne(warehouseOutInfo)
 		if errOne != nil {
 			return errOne
 		}
 		info, errcodes := GetStockInRecoredByGoodIdOne(goods.GoodId, goods.GoodTypeId, goods.SysRecordTime, goods.OrgId)
 		if errcodes == gorm.ErrRecordNotFound {
 			//创建出库单
-			errOne := AddSigleWarehouseOutInfo(warehouseOutInfo)
+			errOne := AddSigleWarehouseOutInfoOne(warehouseOutInfo)
 			if errOne != nil {
 				return errOne
 			}
 
 		warehouseOutInfo.Count = goods.Count
 		//添加出库单详情
-		errOne := AddSigleWarehouseOutInfo(warehouseOutInfo)
+		errOne := AddSigleWarehouseOutInfoOne(warehouseOutInfo)
 		if errOne != nil {
 			return errOne
 		}
 		info, errcodes := GetStockInRecoredByGoodIdOne(goods.GoodId, goods.GoodTypeId, goods.SysRecordTime, goods.OrgId)
 		if errcodes == gorm.ErrRecordNotFound {
 			//创建出库单
-			errOne := AddSigleWarehouseOutInfo(warehouseOutInfo)
+			errOne := AddSigleWarehouseOutInfoOne(warehouseOutInfo)
 			if errOne != nil {
 				return errOne
 			}
 	return err
 }
 
+func UpdateNewDrugWarehouseOutInfo(id int64, warehouse_info_id int64, org_id int64, over_count int64, drug_price float64, tx *gorm.DB) error {
+
+	err = tx.Model(&models.DrugWarehouseOutInfo{}).Where("id = ? and org_id = ? and status = 1", id, org_id).Update(map[string]interface{}{"warehouse_info_id": warehouse_info_id, "over_count": over_count, "price": drug_price, "retail_price": drug_price}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}
+
 func UpdateGoodWarehouseOutById(id int64, warehouse_info_id int64, org_id int64, over_count int64) error {
 	utx := XTWriteDB().Begin()
 	err := utx.Model(models.WarehouseOutInfo{}).Where("id = ?  and org_id = ? and status = 1", id, org_id).Update(map[string]interface{}{"warehouse_info_id": warehouse_info_id, "over_count": over_count}).Error
 	return info, err
 }
 
+func FindNewDrugWarehouseInfoList(drugid int64, orgid int64, tx *gorm.DB) (info []*models.DrugWarehouseInfo, err error) {
+
+	err = tx.Where("drug_id = ? and org_id = ? and status =1 and is_check =1  and (stock_max_number>0 or stock_min_number>0)", drugid, orgid).Find(&info).Error
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return info, err
+		}
+	}
+	return info, err
+}
+
 func CreatedDrugFlushInfo(info models.XtDrugWarehouseFlushInfo) error {
 	ut := writeDb.Begin()
 	err := ut.Create(&info).Error
 	return err
 }
 
+func CreatedNewDrugFlushInfo(info models.XtDrugWarehouseFlushInfo, tx *gorm.DB) error {
+
+	err := tx.Create(&info).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}
+
 func UpdateWarehouseFlushInfo(warehouse_out_id int64, record_time int64, patient_id int64, batch_nubmer_id int64, good_id int64, sum_count int64, orgid int64) error {
 
 	err := XTWriteDB().Model(&models.XtWarehouseFlushInfo{}).Where("warehouse_out_id = ? and system_time = ? and patient_id = ? and batch_number_id = ? and good_id = ? and user_org_id = ?", warehouse_out_id, record_time, patient_id, batch_nubmer_id, good_id, orgid).Update(map[string]interface{}{"flush_count": sum_count}).Error
 	return err
 }
 
+func ModifyNewReduceDrugInformation(id int64, count int64, orgid int64, tx *gorm.DB) error {
+
+	err = tx.Model(&models.BaseDrugLib{}).Where("id = ? and status = 1 and org_id = ?", id, orgid).UpdateColumn("sum_out_count", gorm.Expr("sum_out_count - ?", count)).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}
+
 func ModifyAddCancelAddInfomation(id int64, count int64, orgid int64, storehouse_id int64) error {
 	ut := XTWriteDB().Begin()
 	err = ut.Model(&models.XtDrugStockCount{}).Where("drug_id = ? and status = 1 and user_org_id = ? and storehouse_id = ?", id, orgid, storehouse_id).UpdateColumn("sum_cancel_count", gorm.Expr("sum_cancel_count + ?", count)).Error
 	return err
 }
 
+func ModifyNewReduceGoodSumCount(storehouse_id int64, count int64, user_org_id int64, good_id int64, tx *gorm.DB) error {
+
+	err = tx.Model(&models.XtGoodStockCount{}).Where("storehouse_id = ? and status = 1 and user_org_id  = ? and good_id =?", storehouse_id, user_org_id, good_id).UpdateColumn("stock_out_count", gorm.Expr("stock_out_count - ?", count)).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+
+	err = tx.Model(&models.XtGoodStockCount{}).Where("storehouse_id = ? and status = 1 and user_org_id  = ? and good_id =?", storehouse_id, user_org_id, good_id).UpdateColumn("stock_act_out_count", gorm.Expr("stock_act_out_count - ?", count)).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+
+	return err
+}
+
 func ModifyReduceGoodSumCountTwenty(storehouse_id int64, count int64, user_org_id int64, good_id int64) error {
 	ut := XTWriteDB().Begin()
 
 	return info, err
 }
 
+func FindNewDrugWarehouseInfoFlushCount(drug_id int64, orgid int64, tx *gorm.DB) (info []*models.DrugWarehouseInfo, err error) {
+
+	err = tx.Where("drug_id = ? and org_id = ? and status = 1 and is_check = 1", drug_id, orgid).Find(&info).Error
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return info, err
+		}
+	}
+	return info, err
+}
+
 func FindDrugWarehouseInfoFlushCountByStorehouse(drug_id int64, orgid int64, storehouse_id int64) (info []*models.DrugWarehouseInfo, err error) {
 
 	err = XTReadDB().Where("drug_id = ? and org_id = ? and status = 1 and is_check = 1 and storehouse_id =?", drug_id, orgid, storehouse_id).Find(&info).Error
 	return info, err
 }
 
+func FindNewDrugWarehouseInfoFlushCountByStorehouse(drug_id int64, orgid int64, storehouse_id int64, tx *gorm.DB) (info []*models.DrugWarehouseInfo, err error) {
+
+	err = tx.Where("drug_id = ? and org_id = ? and status = 1 and is_check = 1 and storehouse_id =?", drug_id, orgid, storehouse_id).Find(&info).Error
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return info, err
+		}
+	}
+	return info, err
+}
+
 // 结算出库
 func HisSettleDrugsDelivery(orgID int64, creater int64, advice *models.HisDoctorAdviceInfo, order_id int64) (err error) {
 
 			RegisterNumber:          warehouse.RegisterNumber,
 			OrderId:                 order_id,
 		}
-		fmt.Println("goods.count2323232233232233232322332322332", goods.Count)
+
 		OutInfo.Count = goods.Count
 
-		AddSigleWarehouseOutInfo(OutInfo)
+		AddSigleWarehouseOutInfoOne(OutInfo)
 
 		stockFlow := models.VmStockFlow{
 			WarehousingId:           warehouse.ID,
 		}
 		OutInfo.Count = stock_number
 
-		AddSigleWarehouseOutInfo(OutInfo)
+		AddSigleWarehouseOutInfoOne(OutInfo)
 
 		stockFlow := models.VmStockFlow{
 			WarehousingId:           warehouse.ID,
 
 		_, errcodes := GetNewWarehouseOutInfoIsExistSix(goods.GoodId, patient_id, record_time, goods.ProjectId, warehouse.ID)
 		if errcodes == gorm.ErrRecordNotFound {
-			errOne := AddSigleWarehouseOutInfo(OutInfo)
+			errOne := AddSigleWarehouseOutInfoOne(OutInfo)
 			if errOne != nil {
 				return errOne
 			}
 
 		_, errcodes := GetNewWarehouseOutInfoIsExistSix(goods.GoodId, patient_id, record_time, goods.ProjectId, warehouse.ID)
 		if errcodes == gorm.ErrRecordNotFound {
-			errOne := AddSigleWarehouseOutInfo(OutInfo)
+			errOne := AddSigleWarehouseOutInfoOne(OutInfo)
 			if errOne != nil {
 				return errOne
 			}
 
 	return
 }
+
+// 耗材手动出库
+func ConsumablesNewDeliveryThirty(orgID int64, record_time int64, goods *models.WarehouseOutInfo, warehouseOut *models.WarehouseOut, count int64, creator int64, tx *gorm.DB) (err error) {
+
+	var deliver_number int64 = 0
+	var stock_number int64 = 0
+	var maxNumber int64 = 0
+
+	deliver_number = goods.Count
+
+	// 根据先进先出原则，查询最先入库的批次，进行出库
+
+	// 如果没有对应的库存，则报错
+	warehouse, err := FindNewFirstWarehousingInfoByStock(goods.GoodId, goods.GoodTypeId, goods.StorehouseId, tx)
+
+	stock_number = warehouse.StockCount
+
+	// 当库存数量大于或等于出库数量的话，则正常出库该批次
+	if stock_number >= deliver_number {
+		maxNumber = goods.Count
+		warehouse.StockCount = warehouse.StockCount - maxNumber
+		warehouse.Mtime = time.Now().Unix()
+
+		//扣减库存
+		UpDateNewWarehouseInfoByStock(&warehouse, tx)
+
+		//查询剩余库存
+		goodList, _ := GetNewAllGoodSumCount(goods.GoodId, orgID, goods.StorehouseId, tx)
+		var sum_count int64
+		for _, item := range goodList {
+			sum_count += item.StockCount
+		}
+
+		warehouseOutInfo := &models.WarehouseOutInfo{
+			WarehouseInfotId: warehouse.ID,
+		}
+		//添加入库单详情ID
+		UpdatedNewSigleWarehouseOutInfo(goods.ID, warehouseOutInfo, tx)
+
+		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:        warehouse.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:                   record_time,
+			Mtime:                   time.Now().Unix(),
+			Price:                   warehouse.PackingPrice, //零售价
+			WarehousingDetailId:     warehouse.ID,
+			WarehouseOutDetailId:    goods.ID,
+			CancelOutDetailId:       0,
+			ProductDate:             goods.ProductDate,
+			ExpireDate:              goods.ExpiryDate,
+			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
+			StorehouseId:            warehouse.StorehouseId,
+			AdminUserId:             goods.AdminUserId,
+			BuyPrice:                warehouse.Price, //进货价
+			StockCount:              goods.StockCount,
+			BatchNumberCount:        warehouse.StockCount - goods.Count,
+			IsCheck:                 1,
+			OverCount:               sum_count,
+			RegisterNumber:          goods.RegisterNumber,
+			Remark:                  goods.Remark,
+		}
+		//创建出库流水
+		CreateNewStockFlowOne(stockFlow, tx)
+
+		//添加入库ID
+		UpdateNewGoodWarehouseOutById(goods.ID, warehouse.ID, goods.OrgId, sum_count, tx)
+
+		//更新出库数量
+		ModifyNewGoodSumCount(goods.StorehouseId, goods.Count, goods.OrgId, goods.GoodId, tx)
+
+		if warehouse.StockCount < maxNumber {
+			tx.Rollback()
+			return errors.New("库存数量不足")
+
+		}
+
+		return nil
+	} else {
+		// 出库完成后，要将该批次库存清零
+		warehouse.StockCount = 0
+		warehouse.Mtime = time.Now().Unix()
+
+		UpDateNewWarehouseInfoByStock(&warehouse, tx)
+
+		//查询剩余库存
+		goodList, _ := GetNewAllGoodSumCount(goods.GoodId, orgID, goods.StorehouseId, tx)
+		var sum_count int64
+		for _, item := range goodList {
+			sum_count += item.StockCount
+		}
+
+		stockFlow := models.VmStockFlow{
+			WarehousingId:           warehouse.ID,
+			GoodId:                  goods.GoodId,
+			Number:                  warehouse.Number,
+			LicenseNumber:           goods.LicenseNumber,
+			Count:                   stock_number,
+			UserOrgId:               goods.OrgId,
+			PatientId:               goods.PatientId,
+			SystemTime:              record_time,
+			ConsumableType:          2,
+			IsSys:                   goods.IsSys,
+			WarehousingOrder:        warehouse.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:                   record_time,
+			Mtime:                   time.Now().Unix(),
+			Price:                   warehouse.PackingPrice, //零售价
+			WarehousingDetailId:     warehouse.ID,
+			WarehouseOutDetailId:    goods.ID,
+			CancelOutDetailId:       0,
+			ProductDate:             goods.ProductDate,
+			ExpireDate:              goods.ExpiryDate,
+			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
+			StorehouseId:            warehouse.StorehouseId,
+			AdminUserId:             goods.AdminUserId,
+			BuyPrice:                warehouse.Price, //进货价
+			StockCount:              goods.StockCount,
+			BatchNumberCount:        0,
+			IsCheck:                 1,
+			OverCount:               sum_count,
+			RegisterNumber:          goods.RegisterNumber,
+			Remark:                  goods.Remark,
+		}
+		//创建出库流水
+		CreateNewStockFlowOne(stockFlow, tx)
+
+		UpdateNewGoodWarehouseOutById(goods.ID, warehouse.ID, goods.OrgId, sum_count, tx)
+
+		//更新出库数量
+		ModifyNewGoodSumCount(goods.StorehouseId, stock_number, goods.OrgId, goods.GoodId, tx)
+
+		goods.Count = deliver_number - stock_number
+		ConsumablesNewDeliveryThirty(orgID, record_time, goods, warehouseOut, count, creator, tx)
+	}
+	return nil
+}
+
+// 药品手动出库 递归方式
+func AutoNewDrugDeliverInfoFourtyOne(orgID int64, prescribingNumber int64, warehouseout *models.DrugWarehouseOut, drup *models.BaseDrugLib, advice *models.DrugWarehouseOutInfo, unit string, tx *gorm.DB) (err error) {
+
+	// 判断处方里药品单位是拆零单位还是包装单位,	如果是包装单位，则根据规格，将包装数量转为拆零数量
+	var deliver_number int64 = 0
+
+	var stock_number int64 = 0
+
+	var drug_price float64
+	if advice.CountUnit == drup.MaxUnit {
+		deliver_number = prescribingNumber * drup.MinNumber
+
+	} else {
+		deliver_number = prescribingNumber
+
+	}
+	if advice.CountUnit == drup.MaxUnit {
+		drug_price = drup.RetailPrice
+	}
+	fmt.Println(drug_price)
+
+	if advice.CountUnit == drup.MinUnit {
+		drug_price = drup.MinPrice
+	}
+
+	if advice.CountUnit != drup.MaxUnit || advice.CountUnit != drup.MinUnit {
+		drug_price = drup.RetailPrice
+	}
+
+	// 根据先进先出原则，查询最先入库的批次，进行出库
+	// 如果没有对应的库存，则报错
+	lastWarehouse, _ := FindNewLastDrugWarehousingInfoByID(advice.DrugId, advice.StorehouseId, tx)
+
+	if lastWarehouse.MaxUnit != lastWarehouse.MinUnit && drup.MaxUnit != drup.MinUnit && lastWarehouse.MinUnit != "" {
+		if lastWarehouse.StockMinNumber >= drup.MinNumber {
+			var stockMax int64
+			var stockMin int64
+			stockMax = lastWarehouse.StockMinNumber / drup.MinNumber
+			stockMin = lastWarehouse.StockMinNumber % drup.MinNumber
+
+			ChangeNewMaxNumberOne(lastWarehouse.ID, stockMax, tx)
+			UpdateNewMinNumber(lastWarehouse.ID, stockMin, tx)
+
+		}
+	}
+
+	if lastWarehouse.MaxUnit == lastWarehouse.MinUnit && drup.MaxUnit != drup.MinUnit && lastWarehouse.MinUnit != "" {
+
+		lastWarehouse.StockMaxNumber = lastWarehouse.StockMaxNumber + lastWarehouse.StockMinNumber
+		ChangeNewMaxNumberOne(lastWarehouse.ID, lastWarehouse.StockMaxNumber, tx)
+
+	}
+
+	warehouse, err := FindNewLastDrugWarehousingInfoByID(advice.DrugId, advice.StorehouseId, tx)
+
+	// 将该批次的剩余库存数量转换为拆零数量
+	if warehouse.MaxUnit == drup.MaxUnit && drup.MaxUnit != drup.MinUnit {
+
+		stock_number = warehouse.StockMaxNumber*drup.MinNumber + warehouse.StockMinNumber
+
+	}
+	if warehouse.MaxUnit == drup.MinUnit && drup.MaxUnit != drup.MinUnit {
+
+		stock_number = warehouse.StockMaxNumber + warehouse.StockMinNumber
+
+	}
+	if warehouse.MaxUnit == drup.MaxUnit && drup.MaxUnit == drup.MinUnit {
+
+		stock_number = warehouse.StockMaxNumber*drup.MinNumber + warehouse.StockMinNumber
+
+	}
+	if stock_number >= deliver_number {
+
+		var maxNumber int64 = 0
+		var minNumber int64 = 0
+
+		maxNumber = deliver_number / drup.MinNumber
+		minNumber = deliver_number % drup.MinNumber
+
+		if warehouse.StockMaxNumber == 0 && drup.MaxUnit == drup.MinUnit {
+			minNumber = maxNumber
+		}
+
+		if drup.MaxUnit != drup.MinUnit {
+			if warehouse.StockMaxNumber < maxNumber && warehouse.StockMinNumber < minNumber {
+				return errors.New("库存数量不足")
+			}
+		}
+
+		if drup.MinUnit == warehouse.MaxUnit && drup.MaxUnit != drup.MinUnit {
+			//fmt.Println("金1")
+			warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber*drup.MinNumber
+		}
+
+		if drup.MaxUnit == warehouse.MaxUnit && drup.MaxUnit != drup.MinUnit {
+			//fmt.Println("金2")
+			warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
+		}
+		if drup.MaxUnit == warehouse.MaxUnit && drup.MaxUnit == drup.MinUnit {
+			//fmt.Println("金3")
+			warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
+		}
+
+		if warehouse.StockMaxNumber < 0 {
+			warehouse.StockMaxNumber = 0
+		}
+		if warehouse.StockMinNumber < 0 {
+			warehouse.StockMinNumber = 0
+		}
+
+		warehouse.Mtime = time.Now().Unix()
+
+		if warehouse.StockMinNumber < minNumber {
+			//fmt.Println("金4")
+			warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
+			if warehouse.MaxUnit != warehouse.MinUnit {
+				warehouse.StockMinNumber = warehouse.StockMinNumber + drup.MinNumber - minNumber
+			}
+			if minNumber == 2 && warehouse.MaxUnit == warehouse.MinUnit && warehouse.StockMinNumber == 0 {
+				warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
+			}
+		} else {
+			//fmt.Println("金5")
+			if minNumber > 0 {
+				if (warehouse.StockMinNumber - minNumber) >= 0 {
+					warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
+				}
+
+			}
+
+			if minNumber == 0 && maxNumber != 1 && warehouse.StockMaxNumber <= 0 {
+				//fmt.Println("6")
+				if warehouse.StockMinNumber > 0 {
+					if warehouse.StockMinNumber-deliver_number >= 0 {
+						warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+					}
+
+				}
+
+			}
+
+		}
+
+		if maxNumber == 1 && minNumber == 0 && drup.MaxUnit != drup.MinUnit && warehouse.MaxUnit != warehouse.MinUnit {
+			if (warehouse.StockMinNumber - deliver_number) >= 0 {
+				//fmt.Println("金7")
+				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+			}
+
+		}
+
+		if drup.MaxUnit != drup.MinUnit {
+			if warehouse.StockMaxNumber < 0 && warehouse.StockMinNumber < 0 {
+				return errors.New("库存数量不足")
+			}
+		}
+		if warehouse.StockMinNumber <= 0 {
+			warehouse.StockMinNumber = 0
+		}
+
+		errThree := UpDateNewDrugWarehouseInfoByStock(&warehouse, tx)
+
+		if errThree != nil {
+			return errors.New("扣减库存失败")
+		}
+
+		//查询该药品剩余库存
+		infolist, _ := FindNewDrugWarehouseInfoFlushCount(advice.DrugId, advice.OrgId, tx)
+		var over_count int64
+		for _, its := range infolist {
+			if its.MaxUnit == drup.MaxUnit {
+				its.StockMaxNumber = its.StockMaxNumber * drup.MinNumber
+			}
+			over_count += its.StockMaxNumber + its.StockMinNumber
+		}
+
+		drugWareInfo, _ := GetLastNewWarehouseOutInfoById(advice.DrugId, tx)
+		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:                   warehouse.RetailPrice,
+			Status:                  1,
+			Ctime:                   advice.SysRecordTime,
+			Mtime:                   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,
+			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
+			StorehouseId:            advice.StorehouseId,
+			AdminUserId:             advice.AdminUserId,
+			LastPrice:               warehouse.Price,
+			StockCount:              advice.StockCount,
+			WarehousingDetailId:     warehouse.ID,
+			OverCount:               over_count,
+			RetailPrice:             drug_price, //手动出库出库价格
+			WarehousingId:           warehouse.ID,
+			SystemTime:              advice.SysRecordTime,
+			PatientId:               advice.PatientId,
+			Remark:                  advice.Remark,
+		}
+		if warehouse.RetailPrice == 0 {
+			drugflow.Price = advice.Price
+		}
+
+		CreateDrugFlowOne(drugflow)
+
+		//更新出库id
+		UpdateNewDrugWarehouseOutInfo(advice.ID, warehouse.ID, advice.OrgId, over_count, drug_price, tx)
+
+		return nil
+
+	} else {
+		stock_number_int := strconv.FormatInt(stock_number, 10)
+		stock_number_int_count, _ := strconv.ParseFloat(stock_number_int, 64)
+		drug_price = stock_number_int_count * advice.Price
+		//扣减库存
+		warehouse.StockMaxNumber = 0
+		warehouse.StockMinNumber = 0
+		warehouse.Mtime = time.Now().Unix()
+
+		errThree := UpDateNewDrugWarehouseInfoByStock(&warehouse, tx)
+		if errThree != nil {
+			return errThree
+		}
+
+		//查询该药品剩余库存
+		infolist, _ := FindNewDrugWarehouseInfoFlushCount(advice.DrugId, advice.OrgId, tx)
+		var over_count int64
+		for _, its := range infolist {
+			if its.MaxUnit == drup.MaxUnit {
+				its.StockMaxNumber = its.StockMaxNumber * drup.MinNumber
+			}
+			over_count += its.StockMaxNumber + its.StockMinNumber
+		}
+		drugWareInfo, _ := GetLastNewWarehouseOutInfoById(advice.DrugId, tx)
+		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:                   warehouse.RetailPrice,
+			Status:                  1,
+			Ctime:                   advice.SysRecordTime,
+			Mtime:                   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,
+			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
+			StorehouseId:            advice.StorehouseId,
+			AdminUserId:             advice.AdminUserId,
+			LastPrice:               warehouse.Price,
+			StockCount:              advice.StockCount,
+			OverCount:               over_count,
+			RetailPrice:             drug_price, //手动出库出库价格
+			WarehousingId:           warehouse.ID,
+			WarehousingDetailId:     warehouse.ID,
+			SystemTime:              advice.SysRecordTime,
+			PatientId:               advice.PatientId,
+			Remark:                  advice.Remark,
+		}
+
+		CreateNewDrugFlowOne(drugflow, tx)
+		//更新出库id
+		UpdateNewDrugWarehouseOutInfo(advice.ID, warehouse.ID, advice.OrgId, over_count, drug_price, tx)
+		// 出库完成后，要将该批次库存清零
+
+		prescribingNumber_two_temp := deliver_number - stock_number
+
+		advice.CountUnit = drup.MinUnit
+
+		AutoNewDrugDeliverInfoFourtyOne(orgID, prescribingNumber_two_temp, warehouseout, drup, advice, unit, tx)
+	}
+
+	return
+}