liujiandao
2024-04-15 439b8cf9619e6deb6b42182d0f43cc1252fc9d2a
controllers/operation.go
@@ -538,9 +538,6 @@
               return err
            }
         }
         if operation.Source != "" {
            go UpdatePurchaseStatus(operation.Source, operation.SourceNumber)
         }
      }
@@ -582,9 +579,6 @@
               return errors.New("当前仓库没有该产品,请先入库")
            }
         }
         if operation.Source != "" {
            go UpdateOutStatus(operation.Source, operation.SourceNumber, 4)
         }
      }
      if operation.BaseOperationType == constvar.BaseOperationTypeInternal {
@@ -624,6 +618,17 @@
   if err != nil {
      util.ResponseFormat(c, code.RequestError, err.Error())
      return
   }
   //修改其他系统订单状态
   if operation.BaseOperationType == constvar.BaseOperationTypeIncoming {
      if operation.Source != "" {
         go UpdatePurchaseStatus(operation.Source, operation.SourceNumber)
         go UpdateOutsourceOrder(operation.Source, operation.SourceNumber, operation.Id, listDetails)
      }
   } else if operation.BaseOperationType == constvar.BaseOperationTypeOutgoing {
      if operation.Source != "" {
         go UpdateOutStatus(operation.Source, operation.SourceNumber, 4)
      }
   }
   util.ResponseFormat(c, code.Success, "操作成功")
@@ -724,6 +729,28 @@
      _, err = cl.UpdatePurchaseStatus(context.Background(), &purchase_wms.UpdatePurchaseStatusRequest{Number: number})
      if err != nil {
         logx.Errorf("grpc dial UpdatePurchaseStatus service error: %v", err)
      }
   }
}
func UpdateOutsourceOrder(source, number string, operationId int, details []*models.OperationDetails) {
   if source == "APS_OUTSOURCING_RECEIVE" {
      products := make([]*inventory_order.OperationProduct, 0)
      for _, detail := range details {
         if operationId == detail.OperationID {
            var op inventory_order.OperationProduct
            op.ProductNumber = detail.ProductId
            op.Amount = detail.Amount.IntPart()
            products = append(products, &op)
         }
      }
      cl := inventory_order.NewInventoryOrderServiceClient(init_client.ApsConn)
      _, err := cl.UpdateOutsourceOrder(context.Background(), &inventory_order.UpdateOutsourceOrderRequest{
         OutsourceNumber: number,
         Products:        products,
      })
      if err != nil {
         logx.Errorf("grpc dial UpdateOutsourceOrder service error: %v", err)
      }
   }
}
@@ -1076,7 +1103,10 @@
   }
   db := mysqlx.GetDB().Table("wms_operation").
      Select("wms_operation.id as operation_id,wms_operation.number,wms_operation.base_operation_type,material.id AS product_id,material.`name` AS product_name,wms_operation_details.amount,material.unit,wms_operation_details.from_location_id,from_location.`name` AS from_location,wms_operation_details.to_location_id,to_location.`name` AS to_location,wms_operation.operation_date as date,wms_operation.`status`").
      Select("wms_operation.id as operation_id,wms_operation.number,wms_operation.base_operation_type,material.id AS product_id," +
         "material.`name` AS product_name,wms_operation_details.amount,material.unit,wms_operation_details.from_location_id," +
         "from_location.`name` AS from_location,wms_operation_details.to_location_id,to_location.`name` AS to_location," +
         "wms_operation.operation_date as date,wms_operation.`status`,material.weight").
      InnerJoins("inner join wms_operation_details ON wms_operation_details.operation_id = wms_operation.id").
      InnerJoins("INNER JOIN material ON material.id = wms_operation_details.product_id").
      InnerJoins("INNER JOIN wms_location AS from_location ON from_location.id = wms_operation_details.from_location_id").
@@ -1100,3 +1130,21 @@
   }
   util.ResponseFormatListWithPage(c, code.Success, records, int(total), params.Page, params.PageSize)
}
// GetPersonnelList
// @Tags      入库/出库
// @Summary   获取人员列表
// @Produce   application/json
// @Param     object  body  request.OperationCondition true  "参数"
// @Success   200 {object} util.ResponseList{data=[]inventory_order.WorkerInfo} "成功"
// @Router    /api-wms/v1/operation/getPersonnelList [get]
func (slf OperationController) GetPersonnelList(c *gin.Context) {
   cli := inventory_order.NewInventoryOrderServiceClient(init_client.ApsConn)
   list, err := cli.GetWorkerList(context.Background(), &inventory_order.GetWorkerListRequest{})
   if err != nil {
      util.ResponseFormat(c, code.RequestParamError, "内部错误")
      logx.Error("grpc调用失败, GetPersonnelList err : " + err.Error())
      return
   }
   util.ResponseFormat(c, code.Success, list.List)
}