11月8日库存管理

controllers/stock_in_api_controller.go

@@ -690,6 +690,10 @@ func (c *StockManagerApiController) EditWarehouse() {
 				}
 
 				service.UpdateWarehouseInfoByGoodId(goodinfo, item.ID)
+				flowStock := models.VmStockFlow{
+					Count: item.WarehousingCount,
+				}
+				service.UpdatedStockFlowByGoodId(item.WarehousingId, item.GoodId, flowStock)
 				//改变库存
 				good, _ := service.GetLastInfoMationById(info.GoodId)
 				warhouseCount := strconv.FormatInt(total, 10)

models/dialysis.go

@@ -862,7 +862,7 @@ type XtDialysisOrders struct {
 	FinishCreator  int64  `gorm:"column:finish_creator" json:"finish_creator" form:"finish_creator"`
 	FinishModifier int64  `gorm:"column:finish_modifier" json:"finish_modifier" form:"finish_modifier"`
 	SchedualType   int64  `gorm:"column:schedual_type" json:"schedual_type" form:"schedual_type"`
-	Number         int64  `gorm:"column:number" json:"number" form:"number"`
+	Number         string `gorm:"column:number" json:"number" form:"number"`
 	UserName       int64  `gorm:"column:user_name" json:"user_name" form:"user_name"`
 	WashpipeNurse  int64  `gorm:"column:washpipe_nurse" json:"washpipe_nurse" form:"washpipe_nurse"`
 	ModeId         int64  `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`

service/patient_service.go

@@ -947,7 +947,7 @@ func GetPatientDialysisRecord(orgID, patientID int64, page, limit, start, end, m
 		}).
 		Joins("JOIN xt_schedule as s ON s.patient_id=? and FROM_UNIXTIME(s.schedule_date, '%Y-%m-%d')=FROM_UNIXTIME(do.dialysis_date, '%Y-%m-%d')", patientID).
 		Joins("JOIN xt_device_zone as dz ON dz.org_id = ? and dz.id=s.partition_id", orgID).
-		Where("do.patient_id=? and do.user_org_id=? and do.stage = 2 and do.status=1", patientID, orgID).Group("s.schedule_date")
+		Where("do.patient_id=? and do.user_org_id=?  and do.status=1", patientID, orgID).Group("s.schedule_date")
 
 	if start != 0 {
 		db = db.Where("do.dialysis_date>=?", start)

service/self_drug_service.go

@@ -903,7 +903,7 @@ func GetDrugDamageList(startime int64, endtime int64, orgId int64, keyword strin
 }
 
 func GetDrugDamageByOrgId(orgid int64) (list []*models.XtDrugInventory, err error) {
-	err = XTReadDB().Model(&list).Where("user_org_id = ? and inventory_type = 11 and status = 1", orgid).Find(&list).Error
+	err = XTReadDB().Model(&list).Where("user_org_id = ? and type = 4 and status = 1", orgid).Find(&list).Error
 	return list, err
 }
 

service/stock_service.go

@@ -3835,7 +3835,7 @@ func GetCancelStockOrderPrintOne(idstr []string, orgid int64) (info []*models.Ca
 
 func GetCancelOutTotalCount(startime int64, endtime int64, orgid int64) (info []*models.VmCancelStockInfo, err error) {
 
-	db := XTReadDB().Table("xt_cancel_stock_info as x").Where("x.status = 1")
+	db := readDb2.Table("xt_cancel_stock_info as x").Where("x.status = 1")
 
 	if startime > 0 {
 		db = db.Where("x.ctime >=?", startime)
@@ -4987,3 +4987,9 @@ func UpdateWarehouseInfoByGoodIdOne(info models.WarehousingInfo, id int64) error
 	err := XTWriteDB().Model(&info).Where("id =? and status = 1", id).Updates(map[string]interface{}{"warehousing_count": info.WarehousingCount, "stock_count": info.StockCount, "price": info.Price, "number": info.Number, "product_date": info.ProductDate, "expiry_date": info.ExpiryDate, "license_number": info.LicenseNumber, "manufacturer": info.Manufacturer, "dealer": info.Dealer, "remark": info.Remark}).Error
 	return err
 }
+
+func UpdatedStockFlowByGoodId(warehousing_id int64, good_id int64, flow models.VmStockFlow) error {
+
+	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
+}