Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS

zhangqian

2023-12-18 ed3d45b189f102249eabd0cb5a0299bc66b0dea6

 controllers/operation.go

@@ -29,6 +29,7 @@
   "wms/proto/purchase_wms"
   "wms/proto/supplier"
   "wms/request"
   "wms/response"
   "wms/service"
   "wms/utils/http"
   "wms/utils/upload"
@@ -76,8 +77,19 @@
   }

   params.Status = constvar.OperationStatus_Ready
   params.Number = strconv.FormatInt(time.Now().Unix(), 10)
   //params.Number = strconv.FormatInt(time.Now().Unix(), 10)
   params.BaseOperationType = operationType.BaseOperationType

   var numberNum int64
   if err := mysqlx.GetDB().Model(&models.Operation{}).Where("number=?", params.Number).Count(&numberNum).Error; err != nil {
      util.ResponseFormat(c, code.RequestParamError, err.Error())
      return
   }
   if numberNum > 0 {
      util.ResponseFormat(c, code.RequestParamError, "单号已存在")
      return
   }

   if err := models.NewOperationSearch().Create(&params); err != nil {
      logx.Errorf("Operation create err: %v", err)
      util.ResponseFormat(c, code.SaveFail, "添加失败："+err.Error())
@@ -142,6 +154,10 @@
func (slf OperationController) CheckParams(params models.Operation) error {
   if params.SourceNumber == "" {
      return errors.New("请填入源单号")
   }

   if params.Number == "" {
      return errors.New("请填入单号")
   }

   if params.OperationTypeId == 0 && int(params.BaseOperationType) == 0 {
@@ -1163,7 +1179,7 @@
// @Tags      入库/出库
// @Summary   出入库明细
// @Produce   application/json
// @Param     object  body  request.OperationAllList true  "参数"
// @Param     object  body  request.OperationCondition true  "参数"
// @Success   200 {object} util.Response "成功"
// @Router    /api-wms/v1/operation/listByCondition [post]
func (slf OperationController) ListByCondition(c *gin.Context) {
@@ -1177,12 +1193,12 @@
      return
   }

   db := mysqlx.GetDB().Table("wms_operation").Select("wms_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.from_location_id,from_location.`name` AS from_location,wms_operation.to_location_id,to_location.`name` AS to_location,wms_operation.operation_date as date").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.from_location_id").InnerJoins("INNER JOIN wms_location AS to_location ON to_location.id = wms_operation.to_location_id")
   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.from_location_id,from_location.`name` AS from_location,wms_operation.to_location_id,to_location.`name` AS to_location,wms_operation.operation_date as date,wms_operation.`status`").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.from_location_id").InnerJoins("INNER JOIN wms_location AS to_location ON to_location.id = wms_operation.to_location_id")
   if params.Condition != "" {
      db = db.Where("wms_operation.number like ? or wms_operation.source_number like ? or from_location.`name` like ? or to_location.`name` like ?", "%"+params.Condition+"%", "%"+params.Condition+"%", "%"+params.Condition+"%", "%"+params.Condition+"%")
   }
   var (
      records = make([]*models.MoveHistory, 0)
      records = make([]*response.InventoryHistory, 0)
      total   int64
   )