Browse Source

partPurchase: 修改合同类型

Yi 1 year ago
parent
commit
2e009d88b5
5 changed files with 8 additions and 8 deletions
  1. 3 5
      apiserver/model/partpurchase.go
  2. 2 2
      apiserver/service/purchase.go
  3. BIN
      cmd/eq
  4. 1 1
      go.mod
  5. 2 0
      go.sum

+ 3 - 5
apiserver/model/partpurchase.go

@@ -1,7 +1,5 @@
 package model
 
-import "fmt"
-
 type PartPurchase struct {
 	Id            int64   `gorm:"column:id"`
 	BigId         int64   `gorm:"column:bigId"`
@@ -26,8 +24,8 @@ func (p *PartPurchase) TableName() string {
 }
 
 func NewPartPurchase(
-	bigId, pastureId, partId, brandId, amount, contractId int64,
-	partCode, partName, specification, unit, purpose, price string,
+	bigId, pastureId, partId, brandId, amount int64,
+	contractId, partCode, partName, specification, unit, purpose, price string,
 	storageAmount float64,
 ) *PartPurchase {
 	return &PartPurchase{
@@ -45,6 +43,6 @@ func NewPartPurchase(
 		BrandId:       brandId,
 		StorageAmount: storageAmount,
 		Price:         price,
-		ContractId:    fmt.Sprintf("%d", contractId),
+		ContractId:    contractId,
 	}
 }

+ 2 - 2
apiserver/service/purchase.go

@@ -38,8 +38,8 @@ func CreateSpecialtyPurchase(ctx context.Context, req *modernPb.SparePartsRequis
 		for _, v := range req.SpotList {
 			amount, _ := strconv.Atoi(v.Amount)
 			partPurchaseList = append(partPurchaseList, model.NewPartPurchase(
-				newBigPartPurchase.Id, int64(req.PastureId), int64(v.PartId), int64(v.BrandId), int64(amount),
-				int64(v.ContractId), v.PartCode, v.PartName, v.Specification, v.Unit, v.Purpose, v.Price,
+				newBigPartPurchase.Id, int64(req.PastureId), v.PartId, int64(v.BrandId), int64(amount),
+				v.ContractId, v.PartCode, v.PartName, v.Specification, v.Unit, v.Purpose, v.Price,
 				float64(v.StorageAmount)))
 		}
 

BIN
cmd/eq


+ 1 - 1
go.mod

@@ -9,7 +9,7 @@ replace (
 )
 
 require (
-	gitee.com/xuyiping_admin/go_proto v0.0.0-20230901024021-0130ae3343d8
+	gitee.com/xuyiping_admin/go_proto v0.0.0-20230911015439-26760b6ed829
 	gitee.com/xuyiping_admin/pkg v0.0.0-20230816061144-c1f079802584
 	github.com/360EntSecGroup-Skylar/excelize v1.4.1
 	github.com/Anderson-Lu/gofasion v0.0.0-20190530065914-6a05b679ee48

+ 2 - 0
go.sum

@@ -738,6 +738,8 @@ gitee.com/xuyiping_admin/go_proto v0.0.0-20230831025441-c47bafa20bde h1:eKYSpeFr
 gitee.com/xuyiping_admin/go_proto v0.0.0-20230831025441-c47bafa20bde/go.mod h1:x47UOU+lOkZnrtAENAsOGd7mZ5I8D2JRkMKMqLLRlVw=
 gitee.com/xuyiping_admin/go_proto v0.0.0-20230901024021-0130ae3343d8 h1:sIa0CmbUXFlW/fV1iiibCo67DQQTsYYk5OHXxTkAdcM=
 gitee.com/xuyiping_admin/go_proto v0.0.0-20230901024021-0130ae3343d8/go.mod h1:x47UOU+lOkZnrtAENAsOGd7mZ5I8D2JRkMKMqLLRlVw=
+gitee.com/xuyiping_admin/go_proto v0.0.0-20230911015439-26760b6ed829 h1:PSGdFkvEgiVn6CYvEwYm0PBbORAOhqKoOL7LzxZf5zY=
+gitee.com/xuyiping_admin/go_proto v0.0.0-20230911015439-26760b6ed829/go.mod h1:x47UOU+lOkZnrtAENAsOGd7mZ5I8D2JRkMKMqLLRlVw=
 gitee.com/xuyiping_admin/pkg v0.0.0-20230816061144-c1f079802584 h1:5RE5yrMMvnDITrnoX821mFl7dNYfsFA1osDobUV/TDo=
 gitee.com/xuyiping_admin/pkg v0.0.0-20230816061144-c1f079802584/go.mod h1:VQ7WztVDQRlXE1dUu/Yqo3ZdhKsfv7IGJtV+vqNqJVw=
 github.com/360EntSecGroup-Skylar/excelize v1.4.1 h1:l55mJb6rkkaUzOpSsgEeKYtS6/0gHwBYyfo5Jcjv/Ks=