Selly-Modules
/
natsio
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge pull request 'fix-holiday-product-merge-dev' (#133) from fix-holiday-product-merge-dev into develop 

Reviewed-on: #133
This commit is contained in:
phuanbui 2023-01-17 07:18:52 +00:00
parent e6bb5bdf0c d94c6c8430
commit eb242f5b52
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/warehouse.go
View File

@ -183,9 +183,9 @@ func (w Warehouse) UpdateORDeliveryStatus(p model.WarehouseORUpdateDeliveryStatu
return nil return nil
} }
// UpdatePendingInActiveProductByWarehouseIDs ... // UpdateStatusWarehousePendingInactive ...
func (w Warehouse) UpdatePendingInActiveProductByWarehouseIDs(p model.UpdatePendingInActiveProductRequest) error { func (w Warehouse) UpdateStatusWarehousePendingInactive(p model.UpdateStatusWarehousePendingInactiveRequest) error {
msg, err := natsio.GetServer().Request(subject.Warehouse.UpdatePendingInActiveProductByWarehouseIDs, toBytes(p)) msg, err := natsio.GetServer().Request(subject.Warehouse.UpdateStatusWarehousePendingInactive, toBytes(p))
if err != nil { if err != nil {
return err return err
} }
@ -195,7 +195,7 @@ func (w Warehouse) UpdatePendingInActiveProductByWarehouseIDs(p model.UpdatePend
} }
if err = json.Unmarshal(msg.Data, &r); err != nil { if err = json.Unmarshal(msg.Data, &r); err != nil {
return fmt.Errorf("nats: update_pending_in_active_product_by_warehouse_ids %v", err) return fmt.Errorf("nats: update_status_warehouse_pending_inactive %v", err)
} }
if r.Error != "" { if r.Error != "" {
return errors.New(r.Error) return errors.New(r.Error)

12
model/warehouse_request.go
View File

@ -115,7 +115,13 @@ type WarehouseORUpdateDeliveryStatus struct {
DeliveryStatus string `json:"deliveryStatus"` DeliveryStatus string `json:"deliveryStatus"`
} }
// UpdatePendingInActiveProductRequest ... // UpdateStatusWarehousePendingInactiveRequest ...
type UpdatePendingInActiveProductRequest struct { type UpdateStatusWarehousePendingInactiveRequest struct {
WarehouseIDs []string `json:"warehouseIDs"` Warehouses []UpdateStatusWarehousePendingInactive `json:"warehouses"`
}
// UpdateStatusWarehousePendingInactive ...
type UpdateStatusWarehousePendingInactive struct {
WarehouseID string `json:"warehouse"`
Status string `json:"status"`
} }

4
subject/warehouse.go
View File

@ -30,7 +30,7 @@ var Warehouse = struct {
UpdateIsClosedSupplier string UpdateIsClosedSupplier string
GetWarehouses string GetWarehouses string
UpdateORDeliveryStatus string UpdateORDeliveryStatus string
UpdatePendingInActiveProductByWarehouseIDs string UpdateStatusWarehousePendingInactive string
}{ }{
SyncWarehouseIntoServiceSupplier: getWarehouseValue("sync_warehouse_into_service_supplier"), SyncWarehouseIntoServiceSupplier: getWarehouseValue("sync_warehouse_into_service_supplier"),
CreateWarehouseIntoServiceSupplier: getWarehouseValue("create_warehouse_into_service_supplier"), CreateWarehouseIntoServiceSupplier: getWarehouseValue("create_warehouse_into_service_supplier"),
@ -53,5 +53,5 @@ var Warehouse = struct {
UpdateIsClosedSupplier: getWarehouseValue("update_is_closed_supplier"), UpdateIsClosedSupplier: getWarehouseValue("update_is_closed_supplier"),
GetWarehouses: getWarehouseValue("get_warehouses"), GetWarehouses: getWarehouseValue("get_warehouses"),
UpdateORDeliveryStatus: getWarehouseValue("update_or_delivery_status"), UpdateORDeliveryStatus: getWarehouseValue("update_or_delivery_status"),
UpdatePendingInActiveProductByWarehouseIDs: getWarehouseValue("update_pending_active_product_by_warehouse_ids"), UpdateStatusWarehousePendingInactive: getWarehouseValue("update_pending_active_product_by_warehouse_ids"),
} }