11月8日库存管理

controllers/manager_center_api_controller.go

@@ -1496,7 +1496,7 @@ func (c *ManagerCenterApiController) CreateGoodInfo() {
 	min_unit := c.GetString("min_unit")
 	default_count_unit := c.GetString("default_count_unit")
 	is_user, _ := c.GetInt64("is_user")
-	fmt.Println("is_user23232332323232233323223232323", is_user)
+	number := c.GetString("number")
 	adminUserInfo := c.GetAdminUserInfo()
 
 	totals := service.FindGoodInfoByNameTwo(specification_name, adminUserInfo.CurrentOrgId, good_id, good_name)
@@ -1558,6 +1558,7 @@ func (c *ManagerCenterApiController) CreateGoodInfo() {
 		RegisterNumber:              register_number,
 		ProvincesCode:               provinces_code,
 		IsUser:                      is_user,
+		Number:                      number,
 	}
 	err, goodInfos := service.AddSigleGoodInfo(&goodInfo)
 	if err == nil {
@@ -1624,6 +1625,7 @@ func (c *ManagerCenterApiController) ModifyGoodInfo() {
 	total, _ := c.GetFloat("total")
 	register_number := c.GetString("register_number")
 	is_user, _ := c.GetInt64("is_user")
+	number := c.GetString("number")
 	adminUserInfo := c.GetAdminUserInfo()
 
 	goodInfo := models.GoodInfo{
@@ -1677,6 +1679,7 @@ func (c *ManagerCenterApiController) ModifyGoodInfo() {
 		Total:                       total,
 		RegisterNumber:              register_number,
 		IsUser:                      is_user,
+		Number:                      number,
 	}
 
 	totals := service.FindGoodInfoByNameOne(specification_name, adminUserInfo.CurrentOrgId, good_id, id, good_name)

models/good_models.go

@@ -84,6 +84,7 @@ type GoodInfo struct {
 	RegisterNumber              string               `gorm:"column:register_number" json:"register_number" form:"register_number"`
 	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"`
 }
 
 func (GoodInfo) TableName() string {

models/supply.models.go

@@ -36,6 +36,7 @@ type SpBaseDrug struct {
 	Number            string                 `gorm:"column:number" json:"number" form:"number"`
 	LastPrice         float64                `gorm:"column:last_price" json:"last_price" form:"last_price"`
 	DrugWarehouseInfo []*SpDrugWarehouseInfo `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug_warehouse_info"`
+	DrugStatus        string                 `gorm:"column:drug_status" json:"drug_status" form:"drug_status"`
 }
 
 func (SpBaseDrug) TableName() string {
@@ -52,7 +53,9 @@ type SpGoodInformation struct {
 	GoodName          string             `gorm:"column:good_name" json:"good_name" form:"good_name"`
 	PackingUnit       string             `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
 	BuyPrice          float64            `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
+	GoodStatus        string             `gorm:"column:good_status" json:"good_status" form:"good_status"`
 	GoodWarehouseInfo []*SpWarehouseInfo `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"good_warehouse_info"`
+	Number            string             `gorm:"column:number" json:"number" form:"number"`
 }
 
 func (SpGoodInformation) TableName() string {

service/stock_service.go

@@ -250,6 +250,7 @@ func ModifyGoodInfo(goodInfo *models.GoodInfo) (error, *models.GoodInfo) {
 		"register_number":                goodInfo.RegisterNumber,
 		"provinces_code":                 goodInfo.ProvincesCode,
 		"is_user":                        goodInfo.IsUser,
+		"number":                         goodInfo.Number,
 	}).Error
 
 	writeDb.Model(&models.WarehousingInfo{}).Where("good_id = ? AND org_id = ?", goodInfo.ID, goodInfo.OrgId).Updates(map[string]interface{}{"good_type_id": goodInfo.GoodTypeId})

service/supply_service.go

@@ -308,7 +308,7 @@ func SaveContacts(spcontacts models.SpSupplierContacts, tx *gorm.DB) error {
 
 func GetSupplyDrugList(orgid int64) (drug []*models.SpBaseDrug, err error) {
 
-	db := XTReadDB().Table("xt_base_drug as x").Where("x.status = 1")
+	db := XTReadDB().Table("xt_base_drug as x").Where("x.status = 1 AND find_in_set('停用',drug_status) = 0")
 
 	if orgid > 0 {
 		db = db.Where("x.org_id = ?", orgid)
@@ -320,7 +320,7 @@ func GetSupplyDrugList(orgid int64) (drug []*models.SpBaseDrug, err error) {
 
 func GetSupplyGoodList(orgid int64) (good []*models.SpGoodInformation, err error) {
 
-	db := XTReadDB().Table("xt_good_information as x").Where("x.status = 1")
+	db := XTReadDB().Table("xt_good_information as x").Where("x.status = 1 AND find_in_set('停用',good_status) = 0")
 
 	if orgid > 0 {
 		db = db.Where("x.org_id = ?", orgid)
@@ -382,7 +382,7 @@ func GetAllPurchaseOrderList(check_id int64, startime int64, endtime int64, keyw
 	if orgid > 0 {
 		db = db.Where("sgj_xt.xt_supplier_warehouse_info.user_org_id = ?", orgid)
 	}
-	err = db.Count(&total).Offset(offset).Limit(limit).Preload("SupplierWarehousingInfoOrder", "status= 1 and user_org_id = ?", orgid).Preload("SpSupplierWarehouseOut", "status = 1 and user_org_id =?", orgid).Find(&info).Error
+	err = db.Count(&total).Offset(offset).Limit(limit).Preload("SupplierWarehousingInfoOrder", "status= 1 and user_org_id = ?", orgid).Preload("SpSupplierWarehouseOut", "status = 1 and user_org_id =?", orgid).Order("ctime desc").Find(&info).Error
 	return info, total, err
 }
 
@@ -479,7 +479,7 @@ func GetAllGoodOderList(check_id int64, keyword string, page int64, limit int64,
 	if orgid > 0 {
 		db = db.Where("sgj_xt.xt_supplier_warehouse_out.user_org_id = ?", orgid)
 	}
-	err = db.Count(&total).Offset(offset).Limit(limit).Preload("SpSupplierWarehousingOutOrder", "status= 1 and user_org_id = ?", orgid).Preload("SpSupplierWarehousingCancelOrder", "status= 1 and user_org_id = ?", orgid).Find(&out).Error
+	err = db.Count(&total).Offset(offset).Limit(limit).Preload("SpSupplierWarehousingOutOrder", "status= 1 and user_org_id = ?", orgid).Preload("SpSupplierWarehousingCancelOrder", "status= 1 and user_org_id = ?", orgid).Order("ctime desc").Find(&out).Error
 	return out, total, err
 }
 
@@ -653,7 +653,7 @@ func GetAllGoodReturnOrderList(checkid int64, keyword string, page int64, limit
 	if orgid > 0 {
 		db = db.Where("sgj_xt.xt_supplier_warehouse_cancel.user_org_id = ?", orgid)
 	}
-	err = db.Count(&total).Offset(offset).Limit(limit).Preload("SpSupplierWarehousingCancelOrder", "status= 1 and user_org_id = ?", orgid).Find(&order).Error
+	err = db.Count(&total).Offset(offset).Limit(limit).Preload("SpSupplierWarehousingCancelOrder", "status= 1 and user_org_id = ?", orgid).Order("ctime desc").Find(&order).Error
 	return order, total, err
 }