spare: 特殊申购

apiserver/model/partpurchase.go

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

apiserver/routers/api/api.go

@@ -42,7 +42,7 @@ func NextService(p []map[string]interface{}, tx *sqlx.Tx, vendor int64) error {
 			isTransfer = true
 		} else if sqlname == "insertBigPartUse" {
 			pf := v["parammaps"].(map[string]interface{})
-			if pf["useType"].(float64) != 5 {
+			if pf["useType"].(float64) < 5 {
 				if _, ok := pf["oddCode"]; !ok {
 					return errors.New("oddCode 不能为空 ！！！")
 				}

apiserver/service/proof.go

@@ -244,12 +244,14 @@ func (s *Service) UseProof(p interface{}, tx *sqlx.Tx) error {
 		bp.ProofCode, _ = data["ProofCode"].(string)
 		bp.DepartmentID, _ = strconv.Atoi(data["departmentId"].(string))
 
-		if _, ok := data["oddCode"]; !ok {
-			return errors.New(fmt.Sprintf("查询出库单 OddCode 出错！！！"))
-		}
-		bp.OddCode = data["oddCode"].(string)
-		if bp.OddCode == "" {
-			return errors.New(fmt.Sprintf("查询出库单 OddCode 出错！！！"))
+		if data["useType"] != "6" {
+			if _, ok := data["oddCode"]; !ok {
+				return errors.New(fmt.Sprintf("查询出库单 OddCode 出错！！！"))
+			}
+			bp.OddCode = data["oddCode"].(string)
+			if bp.OddCode == "" {
+				return errors.New(fmt.Sprintf("查询出库单 OddCode 出错！！！"))
+			}
 		}
 	}
 
@@ -279,8 +281,13 @@ func (s *Service) UseProof(p interface{}, tx *sqlx.Tx) error {
 	//	log.Error(e)
 	//	return errors.New("查询部门信息出错！！！")
 	//}
-	if e := s.d.DB.Raw(` select * from Department where id = (select  departmentId from   bigpartapply where applyCode = ? ) `, bp.OddCode).
-		First(dp).Error; e != nil {
+
+	departmentSqlStr := fmt.Sprintf("select * from Department where id = (select  departmentId from   bigpartapply where applyCode = '%s' )", bp.OddCode)
+	if bp.UseType == 6 {
+		departmentSqlStr = fmt.Sprintf("select * from Department where id = %d", bp.DepartmentID)
+	}
+
+	if e := s.d.DB.Raw(departmentSqlStr).First(dp).Error; e != nil {
 		log.Error(e)
 		return errors.New("查询部门信息出错！！！")
 	}

apiserver/service/purchase.go

@@ -16,17 +16,18 @@ func CreateSpecialtyPurchase(ctx context.Context, req *modernPb.SparePartsRequis
 			int64(req.PastureId), int64(req.DepartmentId), int64(req.EmployeId),
 			int64(req.ProviderId), req.PurchaseType, req.OrderNumber, req.CreateTime,
 		)
+
 		if err := tx.Model(new(model.BigPartPurchase)).Create(newBigPartPurchase).Error; err != nil {
 			return xerr.WithStack(err)
 		}
 
 		partPurchaseList := make([]*model.PartPurchase, 0)
 		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),
-				v.PartCode, v.PartName, v.Specification, v.Unit, v.Purpose, v.Price, v.ContractId, float64(v.StorageAmount)))
+				int64(v.ContractId), v.PartCode, v.PartName, v.Specification, v.Unit, v.Purpose, v.Price,
+				float64(v.StorageAmount)))
 		}
 
 		if len(partPurchaseList) > 0 {
@@ -34,7 +35,6 @@ func CreateSpecialtyPurchase(ctx context.Context, req *modernPb.SparePartsRequis
 				return xerr.WithStack(err)
 			}
 		}
-
 		return nil
 	})
 }

go.mod

@@ -9,7 +9,7 @@ replace (
 )
 
 require (
-	gitee.com/xuyiping_admin/go_proto v0.0.0-20230816092635-d2c3502b7f65
+	gitee.com/xuyiping_admin/go_proto v0.0.0-20230824091456-5b5769cf09b1
 	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

@@ -722,10 +722,10 @@ dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7
 gioui.org v0.0.0-20210308172011-57750fc8a0a6/go.mod h1:RSH6KIUZ0p2xy5zHDxgAM4zumjgTw83q2ge/PI+yyw8=
 git.sr.ht/~sbinet/gg v0.3.1/go.mod h1:KGYtlADtqsqANL9ueOFkWymvzUvLMQllU5Ixo+8v3pc=
 gitee.com/xuyiping_admin/go_proto v0.0.0-20230802054950-77dee3d12065/go.mod h1:cxbPefIf1o+cyQwvFaM3ndaoUeaK5aWzPV/eZQGJPgE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20230816022843-769561c518e8 h1:UQb1zzWYYzoen6Ugu9mTJ4hQ25nR5aXD/Zz+hf5ZPhY=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20230816022843-769561c518e8/go.mod h1:x47UOU+lOkZnrtAENAsOGd7mZ5I8D2JRkMKMqLLRlVw=
 gitee.com/xuyiping_admin/go_proto v0.0.0-20230816092635-d2c3502b7f65 h1:STeBqVwmANWrRS27URKuEmMQgrhESB1K+klZdqj9iyA=
 gitee.com/xuyiping_admin/go_proto v0.0.0-20230816092635-d2c3502b7f65/go.mod h1:x47UOU+lOkZnrtAENAsOGd7mZ5I8D2JRkMKMqLLRlVw=
+gitee.com/xuyiping_admin/go_proto v0.0.0-20230824091456-5b5769cf09b1 h1:6y6BnNp3ubnxTAEiC9rPJU0MDzSOQmQHi8Hxn069RY4=
+gitee.com/xuyiping_admin/go_proto v0.0.0-20230824091456-5b5769cf09b1/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=

migration/v0002_alter_bigpartpurchase.sql

@@ -170,3 +170,66 @@ ORDER BY bpp.id DESC
 ## loginId,loginId,menu,loginpastureId,loginId,menu,loginpastureId,logindeptId,loginId,loginId,menu,loginpastureId,loginId,menu,orderNumber ,orderNumber ,pastureName,pastureName,departmentId ,departmentId,startTime,stopTime,startTime,stuteSH,stuteSH,stuteSH,empName,empName,purchase_type
 
 
+## 合同管理增加两个字段
+
+ALTER TABLE `contract`
+    ADD COLUMN lifeCycle varchar(255) NOT NULL DEFAULT '' COMMENT '使用周期',
+    ADD COLUMN ContractVarianceItem varchar(255) NOT NULL DEFAULT '' COMMENT '合同差异性';
+
+
+INSERT INTO contract(
+    bigId,
+    pastureId,
+    pastureName,
+    partId,
+    partName,
+    partCode,
+    specification,
+    price,
+    brandId,
+    brand,
+    planAmount,
+    remark,
+    unit,
+    enable,
+    changeId,
+    taxcode,
+    lifeCycle,   ## 这次新增的字段
+    contractVarianceItem  ## 这次新增的字段
+)VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,0,if(?='',null,?),?,?,?);
+
+## bigId,pastureId,pastureName,partId,partName,partCode,specification,price,brandId,brand,planAmount,remark,unit,contractId,contractId,taxcode,lifeCycle,contractVarianceItem
+
+## SELECT * FROM apisql WHERE sqlname = "getcontratListBybigV2"
+
+SELECT
+    CONCAT('uploads/thumbnail/',ep.`picpath`,'/',ep.`newpicname`) picpath,
+    CONCAT('uploads/image/',ep.`picpath`,'/',ep.`newpicname`) srcpath,
+    b.`brandName`,c.lifeCycle,c.contractVarianceItem,
+    c.id,c.bigId,c.pastureId,c.pastureName,c.partId,c.partName,c.partCode,c.specification,
+    TRIM(TRAILING '.' FROM (TRIM(TRAILING '0' FROM c.price))) price,c.brandId,c.brand,c.inventoryType,c.planAmount,c.remark,c.enable,c.unit,c.isZeroStock
+FROM
+    contract c
+        INNER JOIN bigcontract bc
+                   ON bc.id = c.`bigId`
+        LEFT JOIN brand b
+                  ON b.id = c.`brandId`
+        LEFT JOIN parts ps
+                  ON ps.id = c.`partId`
+        LEFT JOIN eq_pic ep
+                  ON ep.id = ps.picpath
+WHERE bc.`pastureId`=? AND bc.`providerId` = ? AND bc.`stopTime`=? AND bc.`flag` =? AND bc.isZeroStock = ?
+  AND bc.statue =? and c.enable = 1
+  AND (
+            c.partCode LIKE CONCAT("%", ?, "%")
+        OR ? = ''
+    )
+  AND (
+            c.partName LIKE CONCAT("%", ?, "%")
+        OR ? = ''
+    )
+  AND (
+            c.specification LIKE CONCAT("%", ?, "%")
+        OR ? = ''
+    )
+ORDER BY c.partCode