打印单单位修改

models/self_drug_models.go

@@ -645,6 +645,7 @@ type StDrugWarehouseInfo struct {
 	LastPrice        string  `json:"last_price"`
 	PackingUnit      string  `json:"packing_unit"`
 	Dosage           int64   `json:"dosage"`
+	LimaxUnit        string  `json:"limax_unit"`
 }
 
 type VmDrugWarehouseOutInfo struct {

service/stock_service.go

@@ -728,6 +728,11 @@ func CreateDrugFlowOne(flow models.DrugFlow) error {
 	return err
 }
 
+//func CreateDrugFlowOneTX(flow models.DrugFlow,tx *gorm.DB) error {
+//	err := tx.Create(&flow).Error
+//	return err
+//}
+
 func UpdateDrugFlowSeven(patientid int64, recorddate int64, drugid int64, advice_id int64) (models.DrugAutomaticReduceDetail, error) {
 
 	detail := models.DrugAutomaticReduceDetail{}
@@ -1150,7 +1155,7 @@ func FindDrugWarehousingInfoByIdOne(id []string, org_id int64) (list []*models.S
 	if org_id > 0 {
 		db = db.Where("x.org_id = ?", org_id)
 	}
-	err = db.Select("x.id,x.warehousing_id,x.drug_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.warehouseing_unit,x.stock_max_number,x.stock_min_number,x.price,x.remark,x.batch_number,x.batch_number,x.manufacturer,x.dealer,t.drug_name,t.last_price,t.dose_unit,t.dose,t.min_number,t.min_unit,t.max_unit,t.drug_type").Joins("left join xt_base_drug as t on t.id = x.drug_id").Scan(&list).Error
+	err = db.Select("x.id,x.max_unit as limax_unit,x.warehousing_id,x.drug_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.warehouseing_unit,x.stock_max_number,x.stock_min_number,x.price,x.remark,x.batch_number,x.batch_number,x.manufacturer,x.dealer,t.drug_name,t.last_price,t.dose_unit,t.dose,t.min_number,t.min_unit,t.max_unit,t.drug_type").Joins("left join xt_base_drug as t on t.id = x.drug_id").Scan(&list).Error
 	return list, err
 }
 
@@ -1292,9 +1297,13 @@ func FindAllCancelStockTotal(org_id int64) (total int64, err error) {
 func FindAllDrugCancelStockTotal(org_id int64) (total int64, err error) {
 	err = readDb.Model(&models.DrugCancelStock{}).Where("org_id = ?", org_id).Count(&total).Error
 	return total, err
-
 }
 
+//func FindAllDrugCancelStockTotalTX(org_id int64,tx *gorm.DB) (total int64, err error) {
+//	err = tx.Model(&models.DrugCancelStock{}).Where("org_id = ?", org_id).Count(&total).Error
+//	return total, err
+//}
+
 func FindAllReturnList(orgId int64, page int64, limit int64, startTime int64, endTime int64, types int64, keywords string) (list []*models.SalesReturn, total int64, err error) {
 	db := readDb.Model(&models.SalesReturn{})
 	db = db.Where("xt_sales_return.org_id = ? AND xt_sales_return.status = 1 AND xt_sales_return.type = ?", orgId, types)
@@ -1806,6 +1815,12 @@ func GetLastDrugCancelStockById(orgid int64) (models.DrugCancelStock, error) {
 	return stock, err
 }
 
+//func GetLastDrugCancelStockByIdTX(orgid int64,tx *gorm.DB) (models.DrugCancelStock, error) {
+//	stock := models.DrugCancelStock{}
+//	err := tx.Where("org_id = ? and status = 1", orgid).Last(&stock).Error
+//	return stock, err
+//}
+
 func GetManufactureById(id int64) (models.Manufacturer, error) {
 	manufacturer := models.Manufacturer{}
 	err := XTReadDB().Model(&manufacturer).Where("id = ? and status = 1", id).Find(&manufacturer).Error
@@ -1821,9 +1836,13 @@ func GetDealerById(id int64) (models.Dealer, error) {
 func AddSigleDrugCancelStock(cancelStock *models.DrugCancelStock) error {
 	err := writeDb.Create(&cancelStock).Error
 	return err
-
 }
 
+//func AddSigleDrugCancelStockTX(cancelStock *models.DrugCancelStock,tx *gorm.DB) error {
+//	err := tx.Create(&cancelStock).Error
+//	return err
+//}
+
 func CreateCancelStockInfo(cancelStockInfo []*models.CancelStockInfo) (err error) {
 	if len(cancelStockInfo) > 0 {
 		utx := writeDb.Begin()
@@ -1873,6 +1892,11 @@ func CreateCancelStockInfoTwo(info *models.DrugCancelStockInfo) error {
 	return err
 }
 
+//func CreateCancelStockInfoTwoTX(info *models.DrugCancelStockInfo,tx *gorm.DB) error {
+//	err := tx.Create(&info).Error
+//	return err
+//}
+
 func GetLastStockInfoThree(drugid int64) (models.DrugCancelStockInfo, error) {
 
 	info := models.DrugCancelStockInfo{}
@@ -1881,6 +1905,12 @@ func GetLastStockInfoThree(drugid int64) (models.DrugCancelStockInfo, error) {
 	return info, err
 }
 
+//func GetLastStockInfoThreeTX(drugid int64,tx *gorm.DB) (models.DrugCancelStockInfo, error) {
+//	info := models.DrugCancelStockInfo{}
+//	err := tx.Model(&info).Where("drug_id = ? and status = 1", drugid).Find(&info).Error
+//	return info, err
+//}
+
 func CreateCancelStockInfoOne(info *models.CancelStockInfo) error {
 
 	err := XTWriteDB().Create(&info).Error
@@ -3489,11 +3519,22 @@ func GetAllManufacturerList(orgid int64) (list []*models.Manufacturer, err error
 	return list, err
 }
 
+//func GetAllManufacturerListTX(orgid int64,tx *gorm.DB) (list []*models.Manufacturer, err error) {
+//
+//	err = tx.Where("org_id = ? and status = 1", orgid).Find(&list).Error
+//	return list, err
+//}
+
 func GetAllDealerList(orgid int64) (list []*models.Dealer, err error) {
 
 	err = XTReadDB().Where("org_id = ? and status = 1", orgid).Find(&list).Error
 	return list, err
 }
+
+//func GetAllDealerListTX(orgid int64,tx *gorm.DB) (list []*models.Dealer, err error) {
+//	err = tx.Where("org_id = ? and status = 1", orgid).Find(&list).Error
+//	return list, err
+//}
 func GetDealerByName(orgid int64, name string) (*models.Dealer, error) {
 	var dealer models.Dealer
 	var err error
@@ -5101,6 +5142,16 @@ func GetDrugWarehouseInfo(id int64) (models.XtDrugWarehouseInfo, error) {
 	return info, err
 }
 
+//func GetDrugWarehouseInfoTX(id int64,tx *gorm.DB) (models.XtDrugWarehouseInfo, error) {
+//	info := models.XtDrugWarehouseInfo{}
+//	db := tx.Model(&info).Where("status = 1")
+//	if id > 0 {
+//		db = db.Where("id = ?", id)
+//	}
+//	err := db.Select("drug_id,warehousing_count,stock_max_number,stock_min_number").Find(&info).Error
+//	return info, err
+//}
+
 func GetDrugWarehouseInfoPrescription(drugid int64, orgid int64) (info []*models.DrugWarehouseInfo, err error) {
 
 	err = XTReadDB().Where("drug_id = ? and org_id =? and status = 1", drugid, orgid).Find(&info).Error
@@ -5181,6 +5232,11 @@ func UpdateDrugWarehouseInfo(info *models.XtDrugWarehouseInfo, id int64) error {
 	return err
 }
 
+//func UpdateDrugWarehouseInfoTX(info *models.XtDrugWarehouseInfo, id int64,tx *gorm.DB) error {
+//	err = tx.Model(&models.XtDrugWarehouseInfo{}).Where("id = ? and status = 1", id).UpdateColumn("stock_max_number", gorm.Expr("stock_max_number + ?", info.StockMaxNumber)).Error
+//	return err
+//}
+
 func UpdateDrugWarehouseInfoOne(info *models.XtDrugWarehouseInfo, id int64) error {
 
 	//err := XTWriteDB().Model(&info).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"stock_min_number": info.StockMaxNumber}).Error
@@ -5190,6 +5246,11 @@ func UpdateDrugWarehouseInfoOne(info *models.XtDrugWarehouseInfo, id int64) erro
 	return err
 }
 
+//func UpdateDrugWarehouseInfoOneTX(info *models.XtDrugWarehouseInfo, id int64,tx *gorm.DB) error {
+//	err = tx.Model(&models.XtDrugWarehouseInfo{}).Where("id = ? and status = 1", id).UpdateColumn("stock_min_number", gorm.Expr("stock_min_number + ?", info.StockMinNumber)).Error
+//	return err
+//}
+
 func GetLastCancelStockInfo(id int64) (models.DrugCancelStockInfo, error) {
 
 	info := models.DrugCancelStockInfo{}
@@ -5358,6 +5419,12 @@ func UpdateDrugCancel(id int64) (models.DrugCancelStock, error) {
 	return stock, err
 }
 
+//func UpdateDrugCancelTX(id int64,tx *gorm.DB) (models.DrugCancelStock, error) {
+//	stock := models.DrugCancelStock{}
+//	err := tx.Model(&stock).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"status": 0}).Error
+//	return stock, err
+//}
+
 func GetDrugWarehouseOutInfo(warehouse_info_id int64, drug_id int64) (info []*models.DrugWarehouseOutInfo, err error) {
 
 	db := XTReadDB().Model(&info)
@@ -5372,12 +5439,29 @@ func GetDrugWarehouseOutInfo(warehouse_info_id int64, drug_id int64) (info []*mo
 	return info, err
 }
 
+//func GetDrugWarehouseOutInfoTX(warehouse_info_id int64, drug_id int64,tx *gorm.DB) (info []*models.DrugWarehouseOutInfo, err error) {
+//	db := tx.Model(&info)
+//	if warehouse_info_id > 0 {
+//		db = db.Where("warehouse_info_id = ?", warehouse_info_id)
+//	}
+//	if drug_id > 0 {
+//		db = db.Where("drug_id = ? and status =1", drug_id)
+//	}
+//	err = db.Find(&info).Error
+//	return info, err
+//}
+
 func GetCancelDrugStockOutInfo(warehouse_info_id int64, drug_id int64) (info []*models.DrugCancelStockInfo, err error) {
 
 	err = XTReadDB().Model(&info).Where("batch_number_id =? and drug_id = ? and status = 1", warehouse_info_id, drug_id).Find(&info).Error
 	return info, err
 }
 
+//func GetCancelDrugStockOutInfoTX(warehouse_info_id int64, drug_id int64,tx *gorm.DB) (info []*models.DrugCancelStockInfo, err error) {
+//	err = tx.Model(&info).Where("batch_number_id =? and drug_id = ? and status = 1", warehouse_info_id, drug_id).Find(&info).Error
+//	return info, err
+//}
+
 func GetTemplateSummary(orgid int64) (config []*models.Dataconfig, err error) {
 
 	err = XTReadDB().Model(&config).Where("module='template_summary' and parent_id=? and org_id in (?)", 0, orgid).Find(&config).Error
@@ -6418,6 +6502,11 @@ func UpdateMedicalSumCount(drug_id int64, sum_count int64, sum_in_count int64, o
 	return err
 }
 
+//func UpdateMedicalSumCountTX(drug_id int64, sum_count int64, sum_in_count int64, orgid int64,tx *gorm.DB) error {
+//	err := tx.Model(&models.BaseDrugLib{}).Where("id = ? and org_id = ? and status = 1", drug_id, orgid).Update(map[string]interface{}{"sum_count": sum_count, "sum_in_count": sum_in_count}).Error
+//	return err
+//}
+
 func UpdateGoodByGoodId(good_id int64, sum_count int64, sum_in_count int64, orgid int64) error {
 	err := XTWriteDB().Model(&models.GoodInfo{}).Where("id = ? and org_id = ? and status = 1", good_id, orgid).Update(map[string]interface{}{"sum_count": sum_count, "sum_in_count": sum_in_count}).Error
 	return err