From 2cd9e7158696f979e9e70a007a25b34ce4572efe Mon Sep 17 00:00:00 2001 From: "DESKTOP-4672LME\\Xu Tengfei" Date: Fri, 31 Dec 2021 12:37:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- services/erp/erp.go | 12 ++++++++++-- utils/k3cloud/service/PRD_MO.go | 6 +++--- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/services/erp/erp.go b/services/erp/erp.go index 3bf0233..0b16950 100644 --- a/services/erp/erp.go +++ b/services/erp/erp.go @@ -561,6 +561,7 @@ func GetOrderQty(PlantNr int, UserId string, allData *[]model.Article) (err erro Time = utils.WeekDayMondayZeroTs(Time) OrderId := "DD"+"_"+billNoOrigin+"_"+rowId + //fmt.Println(OrderId) Time = utils.WeekDayMondayZeroTs(Time) SalesOrder := model.SalesOrder{ PlantNr: PlantNr, @@ -679,6 +680,7 @@ func GetDuliQty(PlantNr int, UserId string, allData *[]model.Article) (err error // } //} + //fmt.Println("独立") for _, info := range dataList{ ArtId := info[0].(string) Qty := info[1].(float64) @@ -688,6 +690,7 @@ func GetDuliQty(PlantNr int, UserId string, allData *[]model.Article) (err error rowId := info[4].(string) OrderId := "DL"+"_"+billNoOrigin+"_"+rowId + //fmt.Println(OrderId) Time = utils.WeekDayMondayZeroTs(Time) SalesOrder := model.SalesOrder{ PlantNr: PlantNr, @@ -757,8 +760,9 @@ func GetZhaizhiWeekQty(PlantNr int, UserId string, allData *[]model.Article) (er // } // } //} - + //fmt.Println("在制") for _, info := range dataList{ + //fmt.Println(info) ArtId := info[0].(string) Qty := info[1].(float64) Time, _ := time.ParseInLocation("2006-01-02T15:04:05", utils.ValueToString(info[2], ""), utils.TimezoneLocation) @@ -766,6 +770,7 @@ func GetZhaizhiWeekQty(PlantNr int, UserId string, allData *[]model.Article) (er rowId := info[4].(string) OrderId := "ZZ"+"_"+billNoOrigin+"_"+rowId + //fmt.Println(OrderId) Time = utils.WeekDayMondayZeroTs(Time) SalesOrder := model.SalesOrder{ PlantNr: PlantNr, @@ -777,7 +782,10 @@ func GetZhaizhiWeekQty(PlantNr int, UserId string, allData *[]model.Article) (er PlanQty: Qty, ProductType: "ZZ", } - dao_SalesOrder.InsertOne(&SalesOrder) + err := dao_SalesOrder.InsertOne(&SalesOrder) + if err != nil { + fmt.Println(err) + } //if err != nil { // artInfo, err := dao_SalesOrder.SelectOne(OrderId) // if err != nil || artInfo == nil { diff --git a/utils/k3cloud/service/PRD_MO.go b/utils/k3cloud/service/PRD_MO.go index e06094d..3e89858 100644 --- a/utils/k3cloud/service/PRD_MO.go +++ b/utils/k3cloud/service/PRD_MO.go @@ -19,7 +19,7 @@ func PRD_MO_Init_Zhaizhi() *PRD_MO_Service { voucher := &PRD_MO_Service{ K3config: utils.K3Obj, FormID: "PRD_MO", - FieldKeys: "FMaterialId.FNumber,FNoStockInQty,FPlanFinishDate,FBillType.FNumber,FBillNo,FRowId", + FieldKeys: "FMaterialId.FNumber,FNoStockInQty,FPlanFinishDate,FBillNo,FRowId,FBillType.FNumber", FUseOrgKey: "FPrdOrgId=" + utils.K3Obj.FUseOrgId + " And FReqType = 1 And FStatus IN (1,2,3,4,5)", } return voucher @@ -29,7 +29,7 @@ func PRD_MO_Init_Weiwai() *PRD_MO_Service { voucher := &PRD_MO_Service{ K3config: utils.K3Obj, FormID: "PRD_MO", - FieldKeys: "FMaterialId.FNumber,FNoStockInQty,FBillType.FNumber,FBillNo,FRowId", + FieldKeys: "FMaterialId.FNumber,FNoStockInQty,FBillNo,FRowId,FBillType.FNumber", FUseOrgKey: "FEntrustOrgId=" + utils.K3Obj.FUseOrgId + " And FStatus IN (1,2,3,4,5)", } return voucher @@ -39,7 +39,7 @@ func PRD_MO_Init_Duli() *PRD_MO_Service { voucher := &PRD_MO_Service{ K3config: utils.K3Obj, FormID: "PRD_MO", - FieldKeys: "FMaterialId.FNumber,FNoStockInQty,FPlanFinishDate,FBillType.FNumber,FBillNo,FRowId", + FieldKeys: "FMaterialId.FNumber,FNoStockInQty,FPlanFinishDate,FBillNo,FRowId,FBillType.FNumber", FUseOrgKey: "FPrdOrgId=" + utils.K3Obj.FUseOrgId + " And FReqType = 2 And FStatus IN (1,2,3,4,5)", } return voucher