赠品调整

apiserver/service/job.go

@@ -22,7 +22,7 @@ func SapJobInit() {
 		//AutoSapReturnOrderJob()
 		//AutoSrmReturnOrderJob()
 	})
-	//c.Start()
+	c.Start()
 
 	//pastureList := make([]*model.Pasture, 0)
 	//s.d.DB.Table("pasture").Find(&pastureList)
@@ -107,7 +107,6 @@ func SapJobInit() {
 	c1.AddFunc("0 20 23 * * ?", func() {
 		AutoContractToASP()
 	})
-
 	//c1.Start()
 }
 

apiserver/service/purchase.go

@@ -99,15 +99,15 @@ func SpecialtyToProcure(id int64) error {
 		var allAmount int64 = 0
 		for _, v := range newPartPurchase {
 			contractId, _ := strconv.Atoi(v.ContractId)
-			newContract := &model.Contract{}
-			if err := tx.Model(new(model.Contract)).Where("id = ?", contractId).First(newContract).Error; err != nil {
-				fmt.Println("newContract", err)
-			}
-
-			bigContract := &model.BigContract{}
-			if err := tx.Model(new(model.BigContract)).Where("id = ?", newContract.BigID).First(bigContract).Error; err != nil {
-				fmt.Println("CreateSpecialtyPurchase", err)
-			}
+			//newContract := &model.Contract{}
+			//if err := tx.Model(new(model.Contract)).Where("id = ?", contractId).First(newContract).Error; err != nil {
+			//	fmt.Println("newContract", err)
+			//}
+			//
+			//bigContract := &model.BigContract{}
+			//if err := tx.Model(new(model.BigContract)).Where("id = ?", newContract.BigID).First(bigContract).Error; err != nil {
+			//	fmt.Println("CreateSpecialtyPurchase", err)
+			//}
 
 			department := &model.Department{}
 			if err := tx.Model(new(model.Department)).Where("pastureId = ?", newBigPartPurchase.PastureId).
@@ -117,7 +117,7 @@ func SpecialtyToProcure(id int64) error {
 
 			price, _ := strconv.ParseFloat(v.Price, 64)
 			buyDetailList = append(buyDetailList, model.NewBuyDetail(int64(newBigBuyDetail.ID), int64(newBigBuyDetail.PastureID),
-				v.Amount, int64(contractId), v.BrandId, newContract.PartCode, bigContract.ContractCode, v.Purpose, department.Name, price))
+				v.Amount, int64(contractId), v.BrandId, v.PartCode, "", v.Purpose, department.Name, price))
 			allAmount += v.Amount
 		}
 

cmd/conf/app.ini

@@ -120,4 +120,5 @@ MinimumReadSize = 0
 Host = 1.13.1.127
 User = lims
 Password = 123456
-Name = lims
+Name = lims
+

cmd/main.go

@@ -37,8 +37,8 @@ import (
 // @BasePath /
 func main() {
 	var path string
-	path = "./"
-	//path = "D:/catering/eam-go/cmd/"
+	//path = "./"
+	path = "D:/catering/eam-go/cmd/"
 	flag.Parse()
 	setting.Setup(path)
 	dao.Setup()

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-20230908035432-2ede61f2f885
 	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

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-20230908035432-2ede61f2f885 h1:LApt8AcbQHSzHJuloZgZpxJni+Dyx7Hw99hZdU2mQDE=
+gitee.com/xuyiping_admin/go_proto v0.0.0-20230908035432-2ede61f2f885/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=