11月8日库存管理

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -3955,18 +3955,6 @@ func (c *DialysisAPIController) EditConsumables() {
 							err = ConsumablesDeliveryTotalSix(adminInfo.Org.Id, patient_id, record_time, beforePrepares, newBeforePrepares, adminInfo.AdminUser.Id)
 							break
 						}
-
-						//if lastInfo.StockCount >= last_total {
-						//	err = ConsumablesDeliveryTotalSix(adminInfo.Org.Id, patient_id, record_time, beforePrepares, newBeforePrepares, adminInfo.AdminUser.Id)
-						//	break
-						//}
-						//
-						////如果库存不够，则出库到下一个批次
-						//if lastInfo.StockCount < last_total {
-						//
-						//	err = ConsumablesDeliveryTotalSix(adminInfo.Org.Id, patient_id, record_time, beforePrepares, newBeforePrepares, adminInfo.AdminUser.Id)
-						//	break
-						//}
 					}
 				}
 

models/stock_models.go

@@ -1124,3 +1124,22 @@ type GoodSotckInfo struct {
 func (GoodSotckInfo) TableName() string {
 	return "xt_warehouse_info"
 }
+
+type PatientWarehouseInfo struct {
+	ID                int64  `gorm:"column:id" json:"id" form:"id"`
+	GoodId            int64  `gorm:"column:good_id" json:"good_id" form:"good_id"`
+	Number            string `gorm:"column:number" json:"number" form:"number"`
+	ProductDate       int64  `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	ExpiryDate        int64  `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
+	WarehousingUnit   string `gorm:"column:warehousing_unit" json:"warehousing_unit" form:"warehousing_unit"`
+	Dealer            int64  `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Manufacturer      int64  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	GoodName          string `gorm:"column:good_name" json:"good_name"`
+	SpecificationName string `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
+	PackingUnit       string `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
+	Remark            string `gorm:"column:remark" json:"remark" form:"remark"`
+}
+
+func (PatientWarehouseInfo) TableName() string {
+	return "xt_warehouse_info"
+}

service/self_drug_service.go

@@ -1126,7 +1126,7 @@ func CreateDrugWarehouseOutInfo(info models.DrugWarehouseOutInfo) error {
 
 func GetDamageByDrugId(drugid int64, warhousingorder string, drugtype int64) (drug []*models.VmXtDrugInventory, err error) {
 
-	db := XTReadDB().Table("xt_drug_inventory").Where("status = 1 and type = 4 ")
+	db := XTReadDB().Table("xt_drug_inventory").Where("status = 1")
 
 	if drugid > 0 {
 		db = db.Where("drug_id = ?", drugid)
@@ -1137,6 +1137,9 @@ func GetDamageByDrugId(drugid int64, warhousingorder string, drugtype int64) (dr
 	if drugtype > 0 {
 		db = db.Where("type = ?", drugtype)
 	}
+	if drugtype == 0 {
+		db = db.Where("type = 4")
+	}
 
 	err = db.Preload("XtBaseDrug", "status = 1").Find(&drug).Error
 	return drug, err

service/stock_service.go

@@ -5020,3 +5020,15 @@ func UpdatedStockFlowByGoodId(warehousing_id int64, good_id int64, flow models.V
 	err := XTWriteDB().Model(&flow).Where("warehousing_id = ? and good_id = ? and status = 1", warehousing_id, good_id).Updates(map[string]interface{}{"count": flow.Count}).Error
 	return err
 }
+
+func GetInventoryExportList(orgid int64) (info []*models.PatientWarehouseInfo, err error) {
+
+	db := XTReadDB().Table("xt_warehouse_info as x").Where("x.status = 1")
+	table := XTReadDB().Table("xt_good_information as t").Where("t.status = 1")
+	fmt.Println(table)
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+	err = db.Select("x.id,x.good_id,x.number,x.number,x.product_date,x.expiry_date,x.warehousing_unit,x.dealer,x.manufacturer,t.good_name,t.specification_name,t.packing_unit,t.remark").Joins("left join xt_good_information as t on t.id = x.good_id").Group("x.good_id,x.number").Scan(&info).Error
+	return info, err
+}