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

controllers/supply_order_api_contorller.go

@@ -1883,7 +1883,7 @@ func (this *SupplyOrderApiController) UpdateGoodOrder() {
 				warehouse_info_id := int64(items["warehouse_info_id"].(float64))
 
 				if items["warehousing_id"] == nil || reflect.TypeOf(items["warehousing_id"]).String() != "float64" {
-					utils.ErrorLog("warehouse_info_id")
+					utils.ErrorLog("warehousing_id")
 					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 					return
 				}
@@ -2645,6 +2645,14 @@ func (this *SupplyOrderApiController) SaveGoodReturnOrder() {
 
 	for _, item := range warehouseCancel {
 		service.CreateCancelReturnOrder(item)
+		//查询该商品在退库单中是否存在
+		_, errcodes := service.GetSupplyWarehouseOutIsExsit(item.WarehouseOutId, item.ProjectId, orgId)
+		//如果不存在则情况退库单的关联信息
+		if errcodes == gorm.ErrRecordNotFound {
+			service.ModfySupplyCancel(item.WarehouseCancelId, orgId)
+
+		}
+
 	}
 
 	cancelOrder, err := service.GetReturnCancelOrder(order.ID, orgId)
@@ -3139,185 +3147,251 @@ func (this *SupplyOrderApiController) CheckReturnOrder() {
 	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,
-					SupplyCancelOutId:       id,
-					SupplyWarehouseId:       warehouse_out_id,
-				}
-				// 查询今日是否存在出库单
-				_, errcodes := service.GetDrugWarehouseOutById(orgId, record_date)
-				if errcodes == gorm.ErrRecordNotFound {
-					service.AddSigleDrugWarehouseOut(&warehouseOut)
-				}
+	//获取退库单详情
+	list, _ := service.GetSupplyCancelOrderDetail(id, orgId)
+	for _, item := range list {
 
-				lastDrug, _ := service.GetLastDrugWarehouseById(orgId, record_date)
+		var total_count int64
+		var prescribing_number_total int64
+		//药品
+		if item.IsSource == 1 {
 
-				//获取
-				warehouseOutInfo := &models.DrugWarehouseOutInfo{
+			//获取药品库存
+			info, _ := service.GetDrugTotalCountTwenTy(item.ProjectId, item.SupplyWarehouseDetailInfo)
 
-					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,
-					SupplyCancelOutId:       id,
-					SupplyWarehouseId:       warehouse_out_id,
-				}
-
-				drup, _ := service.FindBaseDrugLibRecord(orgId, item.ProjectId)
-				if drup.ID > 0 {
-					prescribingNumber := item.Count
-					service.AutoDrugDeliverInfoNight(orgId, prescribingNumber, &warehouseOut, &drup, warehouseOutInfo)
-				}
-
-				//修改原数据
-				orderInfo := models.SpSupplierWarehousingCancelOrder{
-					SourceCount: item.Count - item.SourceCount,
-				}
-				service.UpdateSupplyCancelById(item.ID, orderInfo)
+			for _, it := range info {
+				total_count += it.StockMaxNumber*it.MinNumber + it.StockMinNumber
 			}
+			//查询改药品信息
+			medical, _ := service.GetBaseDrugMedical(item.ProjectId)
 
-			//耗材
-			if item.IsSource == 2 {
+			//判断单位是否相等
+			if medical.MaxUnit == item.SupplyUnit {
+				//转化为最小单位
+				prescribing_number_total = item.Count * medical.MinNumber
+			}
+			if medical.MinUnit == item.SupplyUnit {
+				prescribing_number_total = item.Count
+			}
+
+			//判断单位
+			if total_count == 0 {
+				goodObj, _ := service.GetDrugByGoodId(item.ProjectId)
+				this.ServeSuccessJSON(map[string]interface{}{
+					"msg":        "3",
+					"drug_name":  goodObj.DrugName,
+					"dose":       goodObj.Dose,
+					"dose_unit":  goodObj.DoseUnit,
+					"min_number": goodObj.MinNumber,
+					"min_unit":   goodObj.MinUnit,
+					"max_unit":   goodObj.MaxUnit,
+				})
+				return
+			}
+
+			if prescribing_number_total > total_count {
+
+				goodObj, _ := service.GetDrugByGoodId(item.ProjectId)
+				this.ServeSuccessJSON(map[string]interface{}{
+					"msg":        "3",
+					"drug_name":  goodObj.DrugName,
+					"dose":       goodObj.Dose,
+					"dose_unit":  goodObj.DoseUnit,
+					"min_number": goodObj.MinNumber,
+					"min_unit":   goodObj.MinUnit,
+					"max_unit":   goodObj.MaxUnit,
+				})
+				return
+			}
+
+			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,
+				SupplyCancelOutId:       id,
+				SupplyWarehouseId:       warehouse_out_id,
+			}
+			// 查询今日是否存在出库单
+			_, 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,
+				SupplyCancelOutId:       id,
+				SupplyWarehouseId:       warehouse_out_id,
+			}
+
+			drup, _ := service.FindBaseDrugLibRecord(orgId, item.ProjectId)
+			if drup.ID > 0 {
+				prescribingNumber := item.Count
+				service.AutoDrugDeliverInfoNight(orgId, prescribingNumber, &warehouseOut, &drup, warehouseOutInfo)
+			}
+
+			//修改原数据
+			orderInfo := models.SpSupplierWarehousingCancelOrder{
+				SourceCount: item.Count - item.SourceCount,
+			}
+			service.UpdateSupplyCancelById(item.ID, orderInfo)
+		}
+
+		//耗材
+		if item.IsSource == 2 {
+			// 查询该耗材是否有库存
+			warehouseOne, _ := service.FindWarehousingInfoTwenTy(item.ProjectId, item.SupplyWarehouseDetailInfo)
+
+			// 如果出库数量大于该批次剩余库存数量
+			if item.Count > warehouseOne.StockCount {
 
-				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,
-					SupplyCancelOutId:       id,
-					SupplyWarehouseId:       warehouse_out_id,
-					IsSys:                   0,
-				}
-				//查询是否生成出库单
-				_, errcodes := service.FindStockOutByIsSys(orgId, 0, operation_time)
-				if errcodes == gorm.ErrRecordNotFound {
-					service.AddSigleWarehouseOut(&warehouseOut)
-				}
-				outWarehouse, _ := service.GetlastWarehouseOutById(orgId, record_date)
 				goodObj, _ := service.GetGoodInformationByGoodId(item.ProjectId)
-				info := &models.WarehouseOutInfo{
-					WarehouseOutOrderNumber: outWarehouse.WarehouseOutOrderNumber,
-					WarehouseOutId:          outWarehouse.ID,
-					WarehouseInfotId:        0,
-					GoodId:                  item.ProjectId,
-					GoodTypeId:              goodObj.GoodTypeId,
-					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,
-					OrgId:                   orgId,
-					SupplyWarehouseId:       warehouse_out_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
-				}
-				//更改原退库数据
-				order := models.SpSupplierWarehousingCancelOrder{
-					SourceCount: item.SourceCount - item.Count,
-				}
-				service.UpdateSupplyCancelById(item.ID, order)
+				this.ServeSuccessJSON(map[string]interface{}{
+					"msg":                "2",
+					"good_name":          goodObj.GoodName,
+					"specification_name": goodObj.SpecificationName,
+				})
+				return
+
+			}
+			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,
+				SupplyCancelOutId:       id,
+				SupplyWarehouseId:       warehouse_out_id,
+				IsSys:                   0,
+			}
+			//查询是否生成出库单
+			_, errcodes := service.FindStockOutByIsSys(orgId, 0, operation_time)
+			if errcodes == gorm.ErrRecordNotFound {
+				service.AddSigleWarehouseOut(&warehouseOut)
+			}
+			outWarehouse, _ := service.GetlastWarehouseOutById(orgId, record_date)
+			goodObj, _ := service.GetGoodInformationByGoodId(item.ProjectId)
+			info := &models.WarehouseOutInfo{
+				WarehouseOutOrderNumber: outWarehouse.WarehouseOutOrderNumber,
+				WarehouseOutId:          outWarehouse.ID,
+				WarehouseInfotId:        0,
+				GoodId:                  item.ProjectId,
+				GoodTypeId:              goodObj.GoodTypeId,
+				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,
+				OrgId:                   orgId,
+				SupplyWarehouseId:       warehouse_out_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
+			}
+			//更改原退库数据
+			order := models.SpSupplierWarehousingCancelOrder{
+				SourceCount: item.SourceCount - item.Count,
 			}
+			service.UpdateSupplyCancelById(item.ID, order)
 		}
 	}
+	cancel := models.SpSupplierWarehouseCancel{
+		IsCheck:   1,
+		Checker:   checker,
+		CheckTime: record_date,
+	}
+	err := service.CheckReturnOrder(id, orgId, cancel)
+
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"msg":        "1",
+			"drug_name":  "",
+			"dose":       "",
+			"dose_unit":  "",
+			"min_number": "",
+			"min_unit":   "",
+			"max_unit":   "",
+		})
+		return
+	}
 
-	this.ServeSuccessJSON(map[string]interface{}{
-		"msg":        "1",
-		"drug_name":  "",
-		"dose":       "",
-		"dose_unit":  "",
-		"min_number": "",
-		"min_unit":   "",
-		"max_unit":   "",
-	})
-	return
 }
 
 func (this *SupplyOrderApiController) DeletePurchaseOrder() {

models/drug_stock.go

@@ -295,14 +295,16 @@ type VmDrugAutomaticReduceDetail struct {
 }
 
 type VmDrugWarehouseInfo struct {
-	DrugId         int64  `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
-	Count          int64  `gorm:"column:count" json:"count" form:"count"`
-	MaxUnit        string `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
-	MinUnit        string `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
-	CountUnit      string `gorm:"column:count_unit" json:"count_unit" form:"count_unit"`
-	StockMinNumber int64  `gorm:"column:stock_min_number" json:"stock_min_number" form:"stock_min_number"`
-	StockMaxNumber int64  `gorm:"column:stock_max_number" json:"stock_max_number" form:"stock_max_number"`
-	MinNumber      int64  `gorm:"column:min_number" json:"min_number" form:"min_number"`
+	DrugId                    int64  `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Count                     int64  `gorm:"column:count" json:"count" form:"count"`
+	MaxUnit                   string `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinUnit                   string `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	CountUnit                 string `gorm:"column:count_unit" json:"count_unit" form:"count_unit"`
+	StockMinNumber            int64  `gorm:"column:stock_min_number" json:"stock_min_number" form:"stock_min_number"`
+	StockMaxNumber            int64  `gorm:"column:stock_max_number" json:"stock_max_number" form:"stock_max_number"`
+	MinNumber                 int64  `gorm:"column:min_number" json:"min_number" form:"min_number"`
+	SupplyWarehouseId         int64  `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
+	SupplyWarehouseDetailInfo int64  `gorm:"column:supply_warehouse_detail_info" json:"supply_warehouse_detail_info" form:"supply_warehouse_detail_info"`
 }
 
 type StDrugWarehouseOutInfo struct {

service/supply_service.go

@@ -2,6 +2,7 @@ package service
 
 import (
 	"XT_New/models"
+	"fmt"
 	"github.com/jinzhu/gorm"
 	"strings"
 	"time"
@@ -1009,3 +1010,47 @@ func ModfySupplyWarehouseOut(warehousing_id int64, orgid int64) error {
 	err := XTWriteDB().Model(&out).Where("warehousing_id = ? and user_org_id =? and status = 1", warehousing_id, orgid).Updates(map[string]interface{}{"warehousing_id": 0, "number": ""}).Error
 	return err
 }
+
+func FindWarehousingInfoTwenTy(goodId int64, supply_warehouse_detail_info int64) (models.WarehousingInfo, error) {
+	info := models.WarehousingInfo{}
+	err := XTReadDB().Select(" good_id,sum(stock_count) as stock_count").Where("good_id = ? and status = 1 and supply_warehouse_detail_info =?", goodId, supply_warehouse_detail_info).Find(&info).Error
+	return info, err
+}
+
+func GetDrugTotalCountTwenTy(drugid int64, supply_warehouse_detail_info int64) (list []*models.VmDrugWarehouseInfo, err error) {
+
+	db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status = 1")
+	table := XTReadDB().Table("xt_base_drug as d").Where("d.status = 1")
+	fmt.Println(table)
+	if drugid > 0 {
+		db = db.Where("x.drug_id = ?", drugid)
+	}
+	if supply_warehouse_detail_info > 0 {
+		db = db.Where("x.supply_warehouse_detail_info = ?", supply_warehouse_detail_info)
+	}
+	err = db.Select("x.drug_id,x.stock_max_number,x.stock_min_number,d.min_number").Joins("left join xt_base_drug as d on d.id = x.drug_id").Scan(&list).Error
+
+	return list, err
+}
+
+func GetSupplyWarehouseOutIsExsit(warehouse_out_id int64, project_id int64, orgid int64) (*models.SpSupplierWarehousingOutOrder, error) {
+
+	out := models.SpSupplierWarehousingOutOrder{}
+	var err error
+	err = XTReadDB().Where("warehouse_out_id = ? and project_id = ? and user_org_id = ? and status = 1", warehouse_out_id, project_id, orgid).Find(&out).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &out, nil
+}
+
+func ModfySupplyCancel(id int64, orgid int64) error {
+
+	err := XTWriteDB().Model(models.SpSupplierWarehouseCancel{}).Where("id = ? and user_org_id = ? and status = 1", id, orgid).Updates(map[string]interface{}{"warehouse_out_id": 0}).Error
+
+	err = XTWriteDB().Model(models.SpSupplierWarehousingCancelOrder{}).Where("warehouse_cancel_id = ? and user_org_id = ? and status = 1", id, orgid).Updates(map[string]interface{}{"warehouse_info_id": 0, "warehouse_out_id": 0, "warehousing_id": 0, "good_number": "", "order_number": ""}).Error
+	return err
+}