未选仓库的时候统计产品数量错误bug修复

yinbentan

2024-07-06 b243875e653a35649dc7090203d640cba9b814fd

 service/operation.go

@@ -91,6 +91,7 @@
         LocationID:         output.LocationID,
         OperationSource:    constvar.OperationSourceSaleDelivery,
         SalesDetailsNumber: output.SaleDetailsNumber,
         WarehouseId:        output.WarehouseID,
      }
      operations = append(operations, operation)
      autoCode = models.GetAutoCode(maxAutoIncr, codeStandard)
@@ -219,6 +220,7 @@
         BaseOperationType: constvar.BaseOperationTypeInternal,
         Details:           details,
         CheckedBy:         userInfo.Username,
         WarehouseId:       operation.WarehouseId,
      }).Error; err != nil {
         return err
      }
@@ -259,7 +261,7 @@
      }
   }
   if len(internalInputDetails) > 0 {
      opTypeId, err := GetTargetOperationTypeIdByOperation(originOperation, constvar.BaseOperationTypeIncoming)
      opTypeId, err := GetTargetOperationTypeIdByWarehouseId(originOperation.ToLocation.WarehouseId, constvar.BaseOperationTypeIncoming)
      if err != nil {
         return err
      }
@@ -271,8 +273,10 @@
         Comment:           "库存调拨入库",
         BaseOperationType: constvar.BaseOperationTypeIncoming,
         Details:           internalInputDetails,
         LocationID:        internalInputDetails[0].ToLocationID,
         LocationID:        originOperation.LocationID,
         ToLocationID:      originOperation.ToLocationID,
         OperationTypeName: "库存调拨入库",
         WarehouseId:       originOperation.ToLocation.WarehouseId,
      }
      if err := models.NewOperationSearch().SetOrm(tx).Create(operation); err != nil {
         return err
@@ -314,9 +318,11 @@
         Comment:           "库存调拨出库",
         BaseOperationType: constvar.BaseOperationTypeOutgoing,
         Details:           outputDetails,
         LocationID:        outputDetails[0].FromLocationID,
         LocationID:        originOperation.LocationID,
         ToLocationID:      originOperation.ToLocationID,
         OperationTypeName: "库存调拨出库",
         IsInternalOutput:  true,
         WarehouseId:       originOperation.WarehouseId,
      }
      if err := models.NewOperationSearch().SetOrm(tx).Create(operation); err != nil {
         return err
@@ -332,16 +338,16 @@
   var inputDetails []*models.OperationDetails
   var outputDetails []*models.OperationDetails
   for _, v := range listDetails {
      if locAmount, aok := mapLocAmount[strconv.Itoa(v.ToLocationID)+v.ProductId]; aok {
         if locAmount.Amount.Equal(v.Amount) {
      if _, aok := mapLocAmount[strconv.Itoa(v.FromLocationID)+v.ProductId]; aok {
         if v.StockAmount.Equal(v.Amount) { //盘点数量和剩余数量一致
            continue
         }
         if v.Amount.GreaterThan(locAmount.Amount) { //todo 改成stockAmount
         if v.Amount.GreaterThan(v.StockAmount) {
            inputDetails = append(inputDetails, &models.OperationDetails{
               ProductId:        v.ProductId,
               Amount:           v.Amount.Sub(locAmount.Amount),
               FromLocationID:   v.FromLocationID,
               ToLocationID:     v.ToLocationID,
               Amount:           v.Amount.Sub(v.StockAmount),
               FromLocationID:   0,
               ToLocationID:     v.FromLocationID,
               TotalGrossWeight: v.TotalGrossWeight,
               TotalNetWeight:   v.TotalNetWeight,
               AuxiliaryAmount:  v.AuxiliaryAmount,
@@ -353,9 +359,9 @@
         } else {
            outputDetails = append(outputDetails, &models.OperationDetails{
               ProductId:        v.ProductId,
               Amount:           locAmount.Amount.Sub(v.Amount),
               FromLocationID:   v.ToLocationID,
               ToLocationID:     v.FromLocationID,
               Amount:           v.StockAmount.Sub(v.Amount),
               FromLocationID:   v.FromLocationID,
               ToLocationID:     0,
               TotalGrossWeight: v.TotalGrossWeight,
               TotalNetWeight:   v.TotalNetWeight,
               AuxiliaryAmount:  v.AuxiliaryAmount,
@@ -390,6 +396,7 @@
         Details:           inputDetails,
         LocationID:        inputDetails[0].FromLocationID,
         OperationTypeName: "库存调整入库",
         WarehouseId:       originOperation.WarehouseId,
      }
      if err := models.NewOperationSearch().SetOrm(tx).Create(operation); err != nil {
         return err
@@ -410,6 +417,7 @@
         Details:           outputDetails,
         LocationID:        outputDetails[0].FromLocationID,
         OperationTypeName: "库存调整出库",
         WarehouseId:       originOperation.WarehouseId,
      }
      if err := models.NewOperationSearch().SetOrm(tx).Create(operation); err != nil {
         return err
@@ -420,11 +428,18 @@
}

func GetTargetOperationTypeIdByOperation(operation *models.Operation, baseOT constvar.BaseOperationType) (operationTypeId int, err error) {
   oT, err := models.NewOperationTypeSearch().SetID(uint(operation.OperationTypeId)).First()
   targetOT, err := models.NewOperationTypeSearch().SetBaseOperationType(baseOT).SetWarehouseId(operation.WarehouseId).First()
   if err != nil {
      return 0, err
   }
   targetOT, err := models.NewOperationTypeSearch().SetBaseOperationType(baseOT).SetWarehouseId(oT.WarehouseId).First()
   return targetOT.Id, nil
}

func GetTargetOperationTypeIdByWarehouseId(warehouseId int, baseOT constvar.BaseOperationType) (operationTypeId int, err error) {
   if warehouseId == 0 {
      return 0, errors.New("warehouseId miss")
   }
   targetOT, err := models.NewOperationTypeSearch().SetBaseOperationType(baseOT).SetWarehouseId(warehouseId).First()
   if err != nil {
      return 0, err
   }