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

controllers/supply_order_api_contorller.go

@@ -454,14 +454,15 @@ func (this *SupplyOrderApiController) DelSupply() {
 	supply := models.SpSupplierName{
 		ID: suid,
 	}
-	err := service.DelSupply(supply, orgId)
+	shiwu, err := service.DelSupply(supply, orgId)
 	if err != nil {
 		utils.ErrorLog(err.Error())
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
 	this.ServeSuccessJSON(map[string]interface{}{
-		"list": "删除成功",
+		"list":  "删除成功",
+		"shiwu": shiwu,
 	})
 	return
 }

models/supply.models.go

@@ -2,16 +2,16 @@ package models
 
 //供应商联系人
 type SpSupplierContacts struct {
-	ID           int64  `gorm:"column:id" json:"id" from:"id"`
-	Name         string `gorm:"column:name" json:"name" from:"name"`
-	Phone        string `gorm:"column:phone" json:"phone" from:"phone"`
-	Address      string `gorm:"column:address" json:"address" from:"address"`
-	IsFirst      int64  `gorm:"column:is_first" json:"is_first" from:"is_first"`
-	SupplierCode string `gorm:"column:supplier_code" json:"supplier_code" from:"supplier_code"`
-	UserOrgId    int64  `gorm:"column:user_org_id" json:"user_org_id" from:"user_org_id"`
-	Status       int64  `gorm:"column:status" json:"status" from:"status"`
-	Ctime        int64  `gorm:"column:ctime" json:"ctime" from:"ctime"`
-	Mtime        int64  `gorm:"column:mtime" json:"mtime" from:"mtime"`
+	ID           int64  `gorm:"column:id" json:"id" form:"id"`
+	Name         string `gorm:"column:name" json:"name" form:"name"`
+	Phone        string `gorm:"column:phone" json:"phone" form:"phone"`
+	Address      string `gorm:"column:address" json:"address" form:"address"`
+	IsFirst      int64  `gorm:"column:is_first" json:"is_first" form:"is_first"`
+	SupplierCode string `gorm:"column:supplier_code" json:"supplier_code" form:"supplier_code"`
+	UserOrgId    int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status       int64  `gorm:"column:status" json:"status" form:"status"`
+	Ctime        int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime        int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
 }
 
 func (SpSupplierContacts) TableName() string {

service/supply_service.go

@@ -21,7 +21,7 @@ func GetSupplyList(ctype int64, page int64, limit int64, keyword string, orgid i
 	if len(keyword) > 0 {
 		keyword = "%" + keyword + "%" //联系人
 		db = db.Joins("left join xt_supplier_contacts on xt_supplier_contacts.supplier_code = xt_supplier_name.supplier_code")
-		db = db.Where("xt_supplier_contacts.name like ? or xt_supplier_name.supplier_code like ? or xt_supplier_name.supplier_name like ? ", keyword, keyword, keyword).Group("xt_supplier_name.id")
+		db = db.Where("xt_supplier_contacts.status = 1 and xt_supplier_contacts.user_org_id = ? and xt_supplier_contacts.name like ? or xt_supplier_name.supplier_code like ? or xt_supplier_name.supplier_name like ? ", orgid, keyword, keyword, keyword).Group("xt_supplier_name.id")
 	}
 	if ctype > 0 {
 		db = db.Where("xt_supplier_name.supplier_type = ?", ctype)
@@ -169,30 +169,32 @@ func GetSupplyAndContactOne(id, orgId int64) (supply models.SpSupplierName, cont
 }
 
 //删除供应商及联系人
-func DelSupply(supply models.SpSupplierName, orgId int64) error {
+func DelSupply(supply models.SpSupplierName, orgId int64) (shiwu string, err error) {
 	tx := XTWriteDB().Begin()
 	defer func() {
 		if err != nil {
+			shiwu = "失败"
 			tx.Rollback()
 		} else {
+			shiwu = "成功"
 			tx.Commit()
 		}
 	}()
 	//删除供应商
-	err := tx.Model(&supply).Update("status", 0).Error
+	err = tx.Model(&supply).Update("status", 0).Error
 	if err != nil {
-		return err
+		return shiwu, err
 	}
 	var spcode models.SpSupplierName
 	//获取供应商编号
 	err = tx.Model(&models.SpSupplierName{}).Select("supplier_code").Where("user_org_id = ? and id = ?", orgId, supply.ID).First(&spcode).Error
 	if err != nil {
-		return err
+		return shiwu, err
 	}
 	//删除联系人
 	err = tx.Model(&models.SpSupplierContacts{}).Where("supplier_code = ? and user_org_id = ?", spcode.SupplierCode, orgId).Update("status", 0).Error
 
-	return err
+	return shiwu, err
 }
 
 //保存供应商和联系人

service/warhouse_service.go

@@ -526,6 +526,7 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 			WarehouseInfoId:         warehouse.ID,
 			Count:                   deliver_number,
 			AdviceId:                advice.ID,
+			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
 		}
 
 		drugflow := models.DrugFlow{
@@ -552,6 +553,7 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 			SystemTime:              advice.AdviceDate,
 			WarehousingDetailId:     warehouse.ID,
 			AdviceId:                advice.ID,
+			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
 		}
 
 		CreateDrugFlowOne(drugflow)
@@ -674,6 +676,7 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 			Count:                   stock_number,
 			CountUnit:               drup.MinUnit,
 			AdviceId:                advice.ID,
+			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
 		}
 
 		drugflow := models.DrugFlow{
@@ -700,6 +703,7 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 			SystemTime:              advice.AdviceDate,
 			WarehousingDetailId:     warehouse.ID,
 			AdviceId:                advice.ID,
+			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
 		}
 
 		CreateDrugFlowOne(drugflow)
@@ -2344,6 +2348,7 @@ func NewHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout
 			WarehouseInfoId:         warehouse.ID,
 			Count:                   deliver_number,
 			AdviceId:                advice.ID,
+			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
 		}
 
 		drugflow := models.DrugFlow{
@@ -2468,6 +2473,7 @@ func NewHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout
 			Count:                   stock_number,
 			CountUnit:               drup.MinUnit,
 			AdviceId:                advice.ID,
+			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
 		}
 
 		drugflow := models.DrugFlow{
@@ -2494,6 +2500,7 @@ func NewHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout
 			SystemTime:              advice.RecordDate,
 			WarehousingDetailId:     warehouse.ID,
 			AdviceId:                advice.ID,
+			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
 		}
 
 		CreateDrugFlowOne(drugflow)
@@ -2549,6 +2556,7 @@ func NewHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout
 			BatchNumber:       warehouse.BatchNumber,
 			MaxUnit:           warehouse.MaxUnit,
 			WarehousingInfoId: warehouse.WarehousingInfoId,
+			SupplyWarehouseId: warehouse.SupplyWarehouseId,
 		}
 		errThree := UpDateDrugWarehouseInfoByStock(&info)
 		if errThree != nil {