11月8日库存管理

controllers/manager_center_api_controller.go

@@ -1497,6 +1497,7 @@ func (c *ManagerCenterApiController) CreateGoodInfo() {
 	default_count_unit := c.GetString("default_count_unit")
 	is_user, _ := c.GetInt64("is_user")
 	number := c.GetString("number")
+	is_warehouse, _ := c.GetInt64("is_warehouse")
 	adminUserInfo := c.GetAdminUserInfo()
 
 	totals := service.FindGoodInfoByNameTwo(specification_name, adminUserInfo.CurrentOrgId, good_id, good_name)
@@ -1559,6 +1560,7 @@ func (c *ManagerCenterApiController) CreateGoodInfo() {
 		ProvincesCode:               provinces_code,
 		IsUser:                      is_user,
 		Number:                      number,
+		IsWarehouse:                 is_warehouse,
 	}
 	err, goodInfos := service.AddSigleGoodInfo(&goodInfo)
 	if err == nil {
@@ -1626,6 +1628,7 @@ func (c *ManagerCenterApiController) ModifyGoodInfo() {
 	register_number := c.GetString("register_number")
 	is_user, _ := c.GetInt64("is_user")
 	number := c.GetString("number")
+	is_warehouse, _ := c.GetInt64("is_warehouse")
 	adminUserInfo := c.GetAdminUserInfo()
 
 	goodInfo := models.GoodInfo{
@@ -1680,6 +1683,7 @@ func (c *ManagerCenterApiController) ModifyGoodInfo() {
 		RegisterNumber:              register_number,
 		IsUser:                      is_user,
 		Number:                      number,
+		IsWarehouse:                 is_warehouse,
 	}
 
 	totals := service.FindGoodInfoByNameOne(specification_name, adminUserInfo.CurrentOrgId, good_id, id, good_name)

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -4752,6 +4752,7 @@ func (c *DialysisAPIController) CreateOtherStockOutInfo() {
 			})
 			return
 		}
+
 	}
 
 	//出库逻辑

models/good_models.go

@@ -85,6 +85,7 @@ type GoodInfo struct {
 	GoodSotckInfo               []*GoodSotckInfo     `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"good_stock_in"`
 	IsUser                      int64                `gorm:"column:is_user" json:"is_user" form:"is_user"`
 	Number                      string               `gorm:"column:number" json:"number" form:"number"`
+	IsWarehouse                 int64                `gorm:"column:is_warehouse" json:"is_warehouse" form:"is_warehouse"`
 }
 
 func (GoodInfo) TableName() string {

service/mobile_dialysis_service.go

@@ -3433,7 +3433,7 @@ func GetHisProjectConfig(orgid int64) (models.XtHisProjectConfig, error) {
 
 func GetHisPrescriptionProject(org_id int64, patient_id int64, record_date int64) (project []*models.HisPrescriptionProject, err error) {
 	err = readDb.Model(&models.HisPrescriptionProject{}).Preload("GoodInfo", func(db *gorm.DB) *gorm.DB {
-		return db.Preload("GoodsType", "status = 1").Where("status = 1 and is_user = 2")
+		return db.Preload("GoodsType", "status = 1").Where("status = 1 and is_warehouse = 1")
 	}).Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND type = 3", org_id, record_date, patient_id).Find(&project).Error
 
 	return

service/stock_service.go

@@ -196,7 +196,6 @@ func FindAllGoodInfoTotal(orgId int64) (total int64) {
 }
 
 func AddSigleGoodInfo(goodInfo *models.GoodInfo) (error, *models.GoodInfo) {
-	fmt.Println("goodino232323232323232323", goodInfo.IsUse)
 	err := writeDb.Create(&goodInfo).Error
 	return err, goodInfo
 
@@ -251,6 +250,7 @@ func ModifyGoodInfo(goodInfo *models.GoodInfo) (error, *models.GoodInfo) {
 		"provinces_code":                 goodInfo.ProvincesCode,
 		"is_user":                        goodInfo.IsUser,
 		"number":                         goodInfo.Number,
+		"is_warehouse":                   goodInfo.IsWarehouse,
 	}).Error
 
 	writeDb.Model(&models.WarehousingInfo{}).Where("good_id = ? AND org_id = ?", goodInfo.ID, goodInfo.OrgId).Updates(map[string]interface{}{"good_type_id": goodInfo.GoodTypeId})
@@ -364,7 +364,7 @@ func FindAllGoodTypeOne(org_id int64) (goodType []*models.GoodsType, err error)
 }
 
 func FindAllGoodInfo(org_id int64) (goodInfo []*models.GoodInfo, err error) {
-	err = XTReadDB().Model(&models.GoodInfo{}).Where("org_id = ? AND status = 1 and is_user = 2", org_id).Find(&goodInfo).Error
+	err = XTReadDB().Model(&models.GoodInfo{}).Where("org_id = ? AND status = 1 and is_warehouse = 1", org_id).Find(&goodInfo).Error
 	return goodInfo, err
 }