Browse Source

赠品调整

baishaojie 1 year ago
parent
commit
8c6333dddd
6 changed files with 140 additions and 27 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 18
      go.sum
  6. 132 1
      migration/v0002_alter_bigpartpurchase.sql

+ 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-20230908035432-2ede61f2f885
+	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 - 18
go.sum

@@ -722,24 +722,8 @@ 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-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/go_proto v0.0.0-20230825085328-1f76f8429489 h1:CgjGgnw6bAotTq9aiNjIcmfw4Ug9nucswh7PbEpDsRc=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20230825085328-1f76f8429489/go.mod h1:x47UOU+lOkZnrtAENAsOGd7mZ5I8D2JRkMKMqLLRlVw=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20230829060033-34af18a51a81 h1:U6DqW2iN4nX9v5VQ+M/l3gr+HsLboAY28MguowoNPUk=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20230829060033-34af18a51a81/go.mod h1:x47UOU+lOkZnrtAENAsOGd7mZ5I8D2JRkMKMqLLRlVw=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20230829060911-754bac0f1b86 h1:NWJMOu8/kFEmEpJZhz3G7iU1TbGHp/+TGg0mu3y8984=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20230829060911-754bac0f1b86/go.mod h1:x47UOU+lOkZnrtAENAsOGd7mZ5I8D2JRkMKMqLLRlVw=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20230829090029-dcc108270e61 h1:BrfiZlhc+cEhg3QXiN+d5zNdq+yHgxIMtZXtao+B978=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20230829090029-dcc108270e61/go.mod h1:x47UOU+lOkZnrtAENAsOGd7mZ5I8D2JRkMKMqLLRlVw=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20230831025441-c47bafa20bde h1:eKYSpeFr3feWA4uEAW+8K8H9rtwy3Sg2dqrcoMc4d/M=
-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/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=

+ 132 - 1
migration/v0002_alter_bigpartpurchase.sql

@@ -1220,4 +1220,135 @@ and (c.`partCode` LIKE CONCAT('%',?,'%')
 OR c.`partName` LIKE CONCAT('%',?,'%')
 OR c.`specification` LIKE CONCAT('%',?,'%')) and (bc.providerId = ? or ? = '')
 GROUP BY c.partCode)) tem
-GROUP BY tem.partCode
+GROUP BY tem.partCode
+
+
+# select * from apisql  where sqlname = 'getBigStockLaidList'
+select t.*,t2.countnum partKind from
+    (SELECT
+         (CASE bpl.issync
+              WHEN 0 THEN '同步失败'
+              WHEN 1 THEN '同步成功'
+              WHEN 2 THEN '关闭同步'
+              WHEN 3 THEN '同步成功'
+             END
+             ) easStatus,
+         bpl.id,
+         bpl.laidCode,
+         bpl.pastureId,
+         bpl.empId,
+         bpl.storageTime,
+         bpl.purchaseId,
+         bpl.laidType,
+         bpl.creatDate,
+         bpl.issync,
+         bpl.msg,
+         big.purchase_type,
+         ifnull(bpl.ProofCode,'') ProofCode,
+         bpl.Proofyear,
+         p.`name` pastureName,
+         -- (SELECT COUNT(id) FROM partlaid pl WHERE pl.bigId = bpl.`id` ) partKind,
+         e.empname,
+         e.id employeId,
+         DATE_FORMAT(bpl.storageTime, '%Y-%m-%d') creatTime,
+         pv.`providerName`,sterilisation
+     FROM
+         bigpartlaid bpl
+             LEFT JOIN pasture p
+                       ON p.id = bpl.pastureId
+             LEFT JOIN emp e
+                       ON e.id = bpl.empId
+             INNER JOIN partlaid pl
+                        ON pl.bigId = bpl.id
+             left JOIN provider pv ON pl.`providerId` = pv.`id`
+             left join bigbuydetail big on bpl.purchaseId = big.buyeCode
+     WHERE (
+                 bpl.laidCode LIKE CONCAT('%', ?, '%')
+             OR ? = ''
+         )
+       AND (
+                 p.`name` LIKE CONCAT('%', ?, '%')
+             OR ? = '现代牧业'
+         )
+       AND (
+             (bpl.storageTime >= ? AND bpl.storageTime <= ?)
+             OR ? = ''
+         )
+       AND (
+                 bpl.laidType=?
+             OR ? = ''
+         )
+       AND (
+             if(?=1,bpl.issync IN(1,3),bpl.issync =?)
+             OR ? = ''
+         )
+       AND (
+         IF (	? = 1,bpl.ProofCode IS NOT NULL,	IF	( ? = 2, bpl.ProofCode IS NULL, bpl.id > 0 ) 	)
+         )
+       AND (
+                 big.purchase_type=?    -- 增加申购状态
+             OR ? = ''
+         )
+     GROUP BY bpl.`id`
+    )t
+        left join  (SELECT bigid,COUNT(bigid) countnum FROM partlaid pl group by bigid )t2 on  t.id =t2.bigid
+ORDER by t.storageTime DESC,t.id desc
+## laidCode,laidCode,pastureName,pastureName,startTime,stopTime,startTime,laidType,laidType,easStatus,easStatus,easStatus,sapStatus,sapStatus,purchase_type,purchase_type
+
+## select * from apisql  where sqlname = 'getBigbuydetailList'
+select t1.* from (
+SELECT
+ bbd.`id`,
+ bbd.arrivalStatu,
+ bbd.`buyeCode`,
+ if (bbd.providerName != "",bbd.providerName,p.`providerName`) as providerName,
+ bbd.`matchCode`,
+ bbd.note,
+ pa.name pastureName,
+ e.`empname`,
+ bbd.purchase_type,
+
+ DATE_FORMAT(bbd.buyerDate, '%Y-%m-%d')  buyerDate,
+ IF( bbd.statu = 0,
+     IF(bbd.arrivalStatu=0 AND DATEDIFF(NOW(),bbd.buyerDate)>7,3,
+        IF(bbd.arrivalStatu=1 AND DATEDIFF(NOW(),bbd.buyerDate)>7,5,
+           IF(bbd.arrivalStatu=2 AND DATEDIFF(bbd.DoneDate,bbd.buyerDate)>7,6,
+              bbd.arrivalStatu))
+         ),4) statu,
+ IF( bbd.statu = 0,
+     IF((bbd.arrivalStatu=0 AND DATEDIFF(NOW(),bbd.buyerDate)>7) OR bbd.arrivalStatu =3,DATEDIFF(NOW(),bbd.buyerDate)-7,
+        IF((bbd.arrivalStatu=1 AND DATEDIFF(NOW(),bbd.buyerDate)>7)OR bbd.arrivalStatu =5,DATEDIFF(NOW(),bbd.buyerDate)-7,
+           IF((bbd.arrivalStatu=2 AND DATEDIFF(bbd.DoneDate,bbd.buyerDate)>7) OR bbd.arrivalStatu =6,DATEDIFF(bbd.DoneDate,bbd.buyerDate)-7,
+              0))
+         ),0) extensionDays,
+ DATE_FORMAT(bbd.DoneDate, '%Y-%m-%d') DoneDate,if(sapStatus= 2,1,if(sapStatus = 1,0,-1) ) sapstatus,if(srmStatus= 2,1,if(srmStatus = 1,0,-1) ) srmstatus,sapNumber,srmError
+FROM
+ bigbuydetail bbd
+     LEFT JOIN provider p
+               ON p.id = bbd.`providerId`
+     LEFT JOIN emp e
+               ON e.id = bbd.`buyerPerson`
+     inner join pasture pa
+                on pa.id  = bbd.pastureId
+WHERE  (pa.name=? or ?='现代牧业')  and bbd.zeroCou>0 and  bbd.`enable`=0 AND  (
+         p.`providerName` = ?
+     OR ? = ''
+ )
+AND (
+     (bbd.`buyerDate` >= ? AND bbd.`buyerDate` <= ? )
+     OR ? = ''
+ )
+AND (
+         bbd.`buyeCode` LIKE CONCAT('%', ?, '%')
+     OR ? = ''
+ )
+AND (
+         bbd.`purchase_type` =?  -- 增加申购状态刷选
+     OR ? = ''
+ )
+)t1
+where
+        t1.statu = ?
+   OR ? = ''
+ORDER BY t1.`id` desc;
+## pastureName,pastureName,providerName,providerName,startTime,stopTime,startTime,buyeCode,buyeCode,purchase_type,purchase_type,statu,statu