diff --git a/services/base/implments/Article.service.impl.go b/services/base/implments/Article.service.impl.go index fa46ebe..82512c6 100644 --- a/services/base/implments/Article.service.impl.go +++ b/services/base/implments/Article.service.impl.go @@ -351,10 +351,6 @@ func (impl *ArticleServiceImplement) ImportArticle(_list [][]interface{}, taskVa _info.Descr2 = utils.ValueToString(v[14], "") isUp = true } - if _info.ArtId != utils.GetMaterialgroupMap(utils.ValueToInt(v[7], 0)) { - _info.ArtId = utils.GetMaterialgroupMap(utils.ValueToInt(v[7], 0)) - isUp = true - } if isUp { _ = dao.UpdateOne(_info) } @@ -362,7 +358,7 @@ func (impl *ArticleServiceImplement) ImportArticle(_list [][]interface{}, taskVa } data = append(data, model.Article{ PlantNr: model.PlantNr, - ArtId: utils.GetMaterialgroupMap(utils.ValueToInt(v[7], 0)), + ArtId: utils.ValueToString(v[3], ""), Descr1: utils.ValueToString(v[2], ""), Descr2: utils.ValueToString(v[14], ""), ArtSpec1: utils.ValueToString(v[9], ""), diff --git a/services/erp/erp.go b/services/erp/erp.go index 2f570fc..0ab5f0d 100644 --- a/services/erp/erp.go +++ b/services/erp/erp.go @@ -459,7 +459,7 @@ func GetOrderQty(PlantNr int, UserId string, allData *[]model.Article) (err erro billMap := make(map[string]map[int]float64) finalBillQtyMap := make(map[string]float64) - for index1, _ := range dataList { + for index1, v := range dataList { billNoOrigin := dataList[index1][3].(string) Qty := dataList[index1][1].(float64) if utils.ValueToString(dataList[index1][4], "") == "CONSIGNMENT" { @@ -481,7 +481,7 @@ func GetOrderQty(PlantNr int, UserId string, allData *[]model.Article) (err erro changeMap[number] = Qty } } - billMap[billNoOrigin] = changeMap + billMap[billNoOrigin+"["+utils.ValueToString(v[6], "")+"]"+"["+utils.ValueToString(v[0], "")+"]"] = changeMap } type Bill struct { @@ -536,9 +536,9 @@ func GetOrderQty(PlantNr int, UserId string, allData *[]model.Article) (err erro Qty := info[1].(float64) billNoOrigin := info[3].(string) - _, isIn2 := finalBillQtyMap[billNoOrigin] + _, isIn2 := finalBillQtyMap[billNoOrigin+"["+utils.ValueToString(info[6], "")+"]"+"["+utils.ValueToString(info[0], "")+"]"] if isIn2 { - Qty = finalBillQtyMap[billNoOrigin] + Qty = finalBillQtyMap[billNoOrigin+"["+utils.ValueToString(info[6], "")+"]"+"["+utils.ValueToString(info[0], "")+"]"] } Time, _ := time.ParseInLocation("2006-01-02T15:04:05", utils.ValueToString(info[2], ""), utils.TimezoneLocation) diff --git a/task/importArticle/main.go b/task/importArticle/main.go index 69ce3e7..14a4bae 100644 --- a/task/importArticle/main.go +++ b/task/importArticle/main.go @@ -12,8 +12,8 @@ func main() { return } task.ImportMaterial() - task.ImportMaterialGroupSearch() - task.ImportArticle(taskVal) + ids := task.ImportMaterialGroupSearch() + task.ImportArticle(taskVal, ids) fmt.Println("OK") return } diff --git a/task/k3cloud.go b/task/k3cloud.go index 6adbbf5..ecf9259 100644 --- a/task/k3cloud.go +++ b/task/k3cloud.go @@ -66,7 +66,9 @@ func oneTask(_date time.Time) { //go func() { //ImportMaterial() //ImportMaterialGroupSearch() - //ImportArticle() + //val := make(map[string]string) + //val["ResourceId"] = "0105" + //ImportArticle(val) //ImportBomList() //ImportCustomer() //ImportSaleOrder() @@ -79,8 +81,12 @@ func oneTask(_date time.Time) { } //物料 -func ImportArticle(taskVal map[string]string) { - response := utilService.BdMAterialServiceInit().MaterialSearch("", "") +func ImportArticle(taskVal map[string]string, ids string) { + fiterString := "" + if ids != "" { + fiterString = "FMaterialGroup IN(" + ids + ")" + } + response := utilService.BdMAterialServiceInit().MaterialSearch(fiterString, "") //将数据发送到servvice serviceOfArticle.ImportArticle(response, taskVal) } @@ -104,11 +110,12 @@ func ImportSaleOrder() { } //物料分组 -func ImportMaterialGroupSearch() { +func ImportMaterialGroupSearch() string { response := utilService.MaterialGroupInit().MaterialGroupSearch("", "") //将数据放入到map中 utils.ClearMaterialgroupMap() levelMap := make(map[int]int) + ids := "" for _, v := range response { //判断层级是第几级 pid := utils.ValueToInt(v[1], 0) @@ -130,12 +137,24 @@ func ImportMaterialGroupSearch() { switch fNumber[len(fNumber)-1 : len(fNumber)] { case "F": utils.AppendMaterialgroupMap(id, "FINISHED") + if ids != "" { + ids += "," + } + ids += utils.ValueToString(id, "") break case "R": utils.AppendMaterialgroupMap(id, "MATERIALS") + if ids != "" { + ids += "," + } + ids += utils.ValueToString(id, "") break case "S": utils.AppendMaterialgroupMap(id, "SEMI_FINISHED") + if ids != "" { + ids += "," + } + ids += utils.ValueToString(id, "") break default: utils.AppendMaterialgroupMap(id, "") @@ -143,9 +162,15 @@ func ImportMaterialGroupSearch() { } } else { utils.AppendMaterialgroupMap(id, utils.GetMaterialgroupMap(pid)) + if utils.GetMaterialgroupMap(pid) != "" { + if ids != "" { + ids += "," + } + ids += utils.ValueToString(id, "") + } } } - return + return ids } //客户物料对应表 diff --git a/utils/k3cloud/service/bd_material.go b/utils/k3cloud/service/bd_material.go index 2e090cb..f1b7341 100644 --- a/utils/k3cloud/service/bd_material.go +++ b/utils/k3cloud/service/bd_material.go @@ -12,16 +12,27 @@ type BdMAterialService struct { FUseOrgKey string } +//材质字段改为F_PAHE_Material1 func BdMAterialServiceInit() *BdMAterialService { cust := &BdMAterialService{ K3config: utils.K3Obj, FormID: "BD_MATERIAL", - FieldKeys: "FMasterId,FAccuLeadTime,FName,FNumber,FSpecification,FBaseUnitId,FDocumentStatus,FMaterialGroup,F_RDPB_Material,F_RDPB_bigcode,F_RDPB_middlecode,F_RDPB_smallcode,F_QCCQ_Programcode,F_QCCQ_Programcode.FCode,F_QCCQ_Programcode.FName,FBaseUnitId.FNumber,FPlanerID.FName,FPlanerID.FNumber,FPlanerID", + FieldKeys: "FMasterId,FAccuLeadTime,FName,FNumber,FSpecification,FBaseUnitId,FDocumentStatus,FMaterialGroup,F_PAHE_Material1,F_RDPB_bigcode,F_RDPB_middlecode,F_RDPB_smallcode,F_QCCQ_Programcode,F_QCCQ_Programcode.FCode,F_QCCQ_Programcode.FName,FBaseUnitId.FNumber,FPlanerID.FName,FPlanerID.FNumber,FPlanerID", FUseOrgKey: "FUseOrgId1=" + utils.K3Obj.FUseOrgId, } return cust } +//func BdMAterialServiceInit() *BdMAterialService { +// cust := &BdMAterialService{ +// K3config: utils.K3Obj, +// FormID: "BD_MATERIAL", +// FieldKeys: "FMasterId,FAccuLeadTime,FName,FNumber,FSpecification,FBaseUnitId,FDocumentStatus,FMaterialGroup,F_RDPB_Material,F_RDPB_bigcode,F_RDPB_middlecode,F_RDPB_smallcode,F_QCCQ_Programcode,F_QCCQ_Programcode.FCode,F_QCCQ_Programcode.FName,FBaseUnitId.FNumber,FPlanerID.FName,FPlanerID.FNumber,FPlanerID", +// FUseOrgKey: "FUseOrgId1=" + utils.K3Obj.FUseOrgId, +// } +// return cust +//} + func (_this *BdMAterialService) MaterialSearch(FilterString, OrderString string) [][]interface{} { var data [][]interface{} if FilterString != "" { @@ -36,7 +47,7 @@ func (_this *BdMAterialService) MaterialSearch(FilterString, OrderString string) OrderString: OrderString, TopRowCount: 0, StartRow: 0, - Limit: 1000, + Limit: 2000, } for true { diff --git a/utils/k3cloud/service/sal_saleorder.go b/utils/k3cloud/service/sal_saleorder.go index 0856176..7d4e2d1 100644 --- a/utils/k3cloud/service/sal_saleorder.go +++ b/utils/k3cloud/service/sal_saleorder.go @@ -17,7 +17,7 @@ func SaleOrderInit() *SaleOrderService { K3config: utils.K3Obj, FormID: "SAL_SaleOrder", FieldKeys: "FSaleOrgId,FBillNo,FDate,FCustId,FMaterialId,FQty,FDeliveryDate,FCloseStatus,FCancelStatus,FSignStatus,FDocumentStatus", - FUseOrgKey: "FSaleOrgId=" + utils.K3Obj.FUseOrgId + " or FStockOrgId = "+ utils.K3Obj.FUseOrgId2, + FUseOrgKey: "FSaleOrgId=" + utils.K3Obj.FUseOrgId + " or FStockOrgId = " + utils.K3Obj.FUseOrgId2, } return cust } @@ -26,8 +26,8 @@ func SaleOrderInit_Dingdanxuqiu() *SaleOrderService { cust := &SaleOrderService{ K3config: utils.K3Obj, FormID: "SAL_SaleOrder", - FieldKeys: "FMaterialId.FNumber,FDeliRemainQty,FDeliveryDate,FBillNo,FBusinessType,FQty,FTransJoinQty", - FUseOrgKey: "(FStockOrgId=" + utils.K3Obj.FUseOrgId + " or FStockOrgId = " + utils.K3Obj.FUseOrgId2 +")", + FieldKeys: "FMaterialId.FNumber,FDeliRemainQty,FDeliveryDate,FBillNo,FBusinessType,FQty,FTransJoinQty,FRowId", + FUseOrgKey: "(FStockOrgId=" + utils.K3Obj.FUseOrgId + " or FStockOrgId = " + utils.K3Obj.FUseOrgId2 + ")", } return cust } diff --git a/utils/k3cloud/struct/PLN_PLANORDER/request.go b/utils/k3cloud/struct/PLN_PLANORDER/request.go index 6021e4f..a64fbb2 100644 --- a/utils/k3cloud/struct/PLN_PLANORDER/request.go +++ b/utils/k3cloud/struct/PLN_PLANORDER/request.go @@ -7,12 +7,12 @@ type FAuxPropID struct { } type FSubEntity struct { - FEntryID int `json:"FEntryId"` + FEntryID int `json:"FEntryId"` FReleaseBillType _struct.FNumber `json:"FReleaseBillType"` - FYieldRate int `json:"FYieldRate"` - FMrpNote string `json:"FMrpNote"` - FBaseYieldQty int `json:"FBaseYieldQty"` - FIsSkip2 bool `json:"FIsSkip2"` + FYieldRate int `json:"FYieldRate"` + FMrpNote string `json:"FMrpNote"` + FBaseYieldQty int `json:"FBaseYieldQty"` + FIsSkip2 bool `json:"FIsSkip2"` } type FAuxPropIDChild struct { @@ -30,75 +30,75 @@ type FSrcTransLocID struct { } type FEntity struct { - FEntryID int `json:"FEntryID"` - FMaterialIDChild _struct.FNumber `json:"FMaterialIdChild"` - FAuxPropIDChild FAuxPropIDChild `json:"FAuxPropIdChild"` - FMaterialTypeChild string `json:"FMaterialTypeChild"` - FSupplyType string `json:"FSupplyType"` - FDosageType string `json:"FDosageType"` - FUseRate int `json:"FUseRate"` - FDemandDateChild string `json:"FDemandDateChild"` - FUnitIDChild _struct.FNumber `json:"FUnitIDChild"` - FNumerator int `json:"FNumerator"` - FDenominator int `json:"FDenominator"` - FSTDQty int `json:"FSTDQty"` - FNeedQty int `json:"FNeedQty"` - FMustQty int `json:"FMustQty"` - FFixScrap int `json:"FFixScrap"` - FScrapRate int `json:"FScrapRate"` - FChildSupplyOrgID _struct.FNumber `json:"FChildSupplyOrgId"` - FIssueOrgID _struct.FNumber `json:"FIssueOrgId"` - FIsGetScrap string `json:"FIsGetScrap"` - FIsKitting string `json:"FIsKitting"` - FBOMIDChild _struct.FNumber `json:"FBOMIdChild"` - FOptQueue string `json:"FOptQueue"` - FOwnerTypeIDChild string `json:"FOwnerTypeIdChild"` - FMTONoChild string `json:"FMTONoChild"` - FOwnerIDChild _struct.FNumber `json:"FOwnerIdChild"` - FOperID int `json:"FOperId"` - FLotNoChild _struct.FNumber `json:"FLotNoChild"` - FPositionNo string `json:"FPositionNo"` - FOffSetTime int `json:"FOffSetTime"` - FOffSetTimeType string `json:"FOffSetTimeType"` - FProcessID _struct.FNumber `json:"FProcessId"` - FDescriptionChild string `json:"FDescriptionChild"` - FIssueType string `json:"FIssueType"` - FBKFLTime string `json:"FBKFLTime"` - FStockID _struct.FNumber `json:"FStockId"` - FStockLocID FStockLocID `json:"FStockLocId"` - FSrcTransOrgID _struct.FNumber `json:"FSrcTransOrgId"` - FSrcTransStockID _struct.FNumber `json:"FSrcTransStockId"` - FSrcTransLocID FSrcTransLocID `json:"FSrcTransLocId"` - FReserveType string `json:"FReserveType"` - FProjectNoChild string `json:"FProjectNoChild"` - FPriority int `json:"FPriority"` - FBaseNumerator int `json:"FBaseNumerator"` - FBASEDENOMINATOR int `json:"FBASEDENOMINATOR"` - FWorkCalIDChild _struct.FNumber `json:"FWorkCalIdChild"` - FBOMEntryID int `json:"FBOMEntryID"` - FReplacePolicy string `json:"FReplacePolicy"` - FReplaceType string `json:"FReplaceType"` - FBaseUnitIDChild _struct.FNumber `json:"FBaseUnitIdChild"` - FIsKeyItem string `json:"FIsKeyItem"` - FReplacePriority int `json:"FReplacePriority"` - FBaseNeedQty int `json:"FBaseNeedQty"` - FReplaceGroup int `json:"FReplaceGroup"` - FBaseMustQty1 int `json:"FBaseMustQty1"` - FBaseStdQty int `json:"FBaseStdQty"` - FOverType string `json:"FOverType"` - FSupplyGroup int `json:"FSupplyGroup"` - FSMID _struct.FNumber `json:"FSMId"` - FSMEntryID int `json:"FSMEntryId"` - FBaseFixScrapQTY int `json:"FBaseFixScrapQTY"` - FISSkip string `json:"FISSkip"` - FISMinIssueQty string `json:"FISMinIssueQty"` - FSUPPLYMODE string `json:"FSUPPLYMODE"` - FChildExtendControl int `json:"FChildExtendControl"` - FIsManual string `json:"FIsManual"` - FPATHENTRYID string `json:"FPATHENTRYID"` - FUPDATERID _struct.FNumber `json:"FUPDATERID"` - FUPDateDate string `json:"FUPDateDate"` - FIsMrpRun string `json:"FIsMrpRun"` + FEntryID int `json:"FEntryID"` + FMaterialIDChild _struct.FNumber `json:"FMaterialIdChild"` + FAuxPropIDChild FAuxPropIDChild `json:"FAuxPropIdChild"` + FMaterialTypeChild string `json:"FMaterialTypeChild"` + FSupplyType string `json:"FSupplyType"` + FDosageType string `json:"FDosageType"` + FUseRate int `json:"FUseRate"` + FDemandDateChild string `json:"FDemandDateChild"` + FUnitIDChild _struct.FNumber `json:"FUnitIDChild"` + FNumerator int `json:"FNumerator"` + FDenominator int `json:"FDenominator"` + FSTDQty int `json:"FSTDQty"` + FNeedQty int `json:"FNeedQty"` + FMustQty int `json:"FMustQty"` + FFixScrap int `json:"FFixScrap"` + FScrapRate int `json:"FScrapRate"` + FChildSupplyOrgID _struct.FNumber `json:"FChildSupplyOrgId"` + FIssueOrgID _struct.FNumber `json:"FIssueOrgId"` + FIsGetScrap string `json:"FIsGetScrap"` + FIsKitting string `json:"FIsKitting"` + FBOMIDChild _struct.FNumber `json:"FBOMIdChild"` + FOptQueue string `json:"FOptQueue"` + FOwnerTypeIDChild string `json:"FOwnerTypeIdChild"` + FMTONoChild string `json:"FMTONoChild"` + FOwnerIDChild _struct.FNumber `json:"FOwnerIdChild"` + FOperID int `json:"FOperId"` + FLotNoChild _struct.FNumber `json:"FLotNoChild"` + FPositionNo string `json:"FPositionNo"` + FOffSetTime int `json:"FOffSetTime"` + FOffSetTimeType string `json:"FOffSetTimeType"` + FProcessID _struct.FNumber `json:"FProcessId"` + FDescriptionChild string `json:"FDescriptionChild"` + FIssueType string `json:"FIssueType"` + FBKFLTime string `json:"FBKFLTime"` + FStockID _struct.FNumber `json:"FStockId"` + FStockLocID FStockLocID `json:"FStockLocId"` + FSrcTransOrgID _struct.FNumber `json:"FSrcTransOrgId"` + FSrcTransStockID _struct.FNumber `json:"FSrcTransStockId"` + FSrcTransLocID FSrcTransLocID `json:"FSrcTransLocId"` + FReserveType string `json:"FReserveType"` + FProjectNoChild string `json:"FProjectNoChild"` + FPriority int `json:"FPriority"` + FBaseNumerator int `json:"FBaseNumerator"` + FBASEDENOMINATOR int `json:"FBASEDENOMINATOR"` + FWorkCalIDChild _struct.FNumber `json:"FWorkCalIdChild"` + FBOMEntryID int `json:"FBOMEntryID"` + FReplacePolicy string `json:"FReplacePolicy"` + FReplaceType string `json:"FReplaceType"` + FBaseUnitIDChild _struct.FNumber `json:"FBaseUnitIdChild"` + FIsKeyItem string `json:"FIsKeyItem"` + FReplacePriority int `json:"FReplacePriority"` + FBaseNeedQty int `json:"FBaseNeedQty"` + FReplaceGroup int `json:"FReplaceGroup"` + FBaseMustQty1 int `json:"FBaseMustQty1"` + FBaseStdQty int `json:"FBaseStdQty"` + FOverType string `json:"FOverType"` + FSupplyGroup int `json:"FSupplyGroup"` + FSMID _struct.FNumber `json:"FSMId"` + FSMEntryID int `json:"FSMEntryId"` + FBaseFixScrapQTY int `json:"FBaseFixScrapQTY"` + FISSkip string `json:"FISSkip"` + FISMinIssueQty string `json:"FISMinIssueQty"` + FSUPPLYMODE string `json:"FSUPPLYMODE"` + FChildExtendControl int `json:"FChildExtendControl"` + FIsManual string `json:"FIsManual"` + FPATHENTRYID string `json:"FPATHENTRYID"` + FUPDATERID _struct.FNumber `json:"FUPDATERID"` + FUPDateDate string `json:"FUPDateDate"` + FIsMrpRun string `json:"FIsMrpRun"` } type FAuxPropIDCoby struct { @@ -106,85 +106,84 @@ type FAuxPropIDCoby struct { } type FEntityCoby struct { - FEntryID int `json:"FEntryID"` - FCopyType string `json:"FCopyType"` - FMaterialIDCoby _struct.FNumber `json:"FMaterialIdCoby"` - FAuxPropIDCoby FAuxPropIDCoby `json:"FAuxPropIdCoby"` - FUnitIDCoby _struct.FNumber `json:"FUnitIDCoby"` - FBOMIDCopy _struct.FNumber `json:"FBOMIDCopy"` - FDemandQtyCoby int `json:"FDemandQtyCoby"` - FDemandDateCoby string `json:"FDemandDateCoby"` - FOrderQtyCoby int `json:"FOrderQtyCoby"` - FFirmQtyCoby int `json:"FFirmQtyCoby"` - FFirmStartDateCoby string `json:"FFirmStartDateCoby"` - FFirmFinishDateCoby string `json:"FFirmFinishDateCoby"` - FBaseUnitIDCoby _struct.FNumber `json:"FBaseUnitIDCoby"` - FBaseDemandQtyCoby int `json:"FBaseDemandQtyCoby"` - FBaseOrderQtyCoby int `json:"FBaseOrderQtyCoby"` - FBaseFirmQtyCoby int `json:"FBaseFirmQtyCoby"` - FOutPutOptQueue string `json:"FOutPutOptQueue"` - FISBACKFLUSH string `json:"FISBACKFLUSH"` - FCobyEntryID int `json:"FCobyEntryId"` - FKeyBaseQty int `json:"FKeyBaseQty"` - FCobyBaseQty int `json:"FCobyBaseQty"` - FCopyBaseYieldQty int `json:"FCopyBaseYieldQty"` + FEntryID int `json:"FEntryID"` + FCopyType string `json:"FCopyType"` + FMaterialIDCoby _struct.FNumber `json:"FMaterialIdCoby"` + FAuxPropIDCoby FAuxPropIDCoby `json:"FAuxPropIdCoby"` + FUnitIDCoby _struct.FNumber `json:"FUnitIDCoby"` + FBOMIDCopy _struct.FNumber `json:"FBOMIDCopy"` + FDemandQtyCoby int `json:"FDemandQtyCoby"` + FDemandDateCoby string `json:"FDemandDateCoby"` + FOrderQtyCoby int `json:"FOrderQtyCoby"` + FFirmQtyCoby int `json:"FFirmQtyCoby"` + FFirmStartDateCoby string `json:"FFirmStartDateCoby"` + FFirmFinishDateCoby string `json:"FFirmFinishDateCoby"` + FBaseUnitIDCoby _struct.FNumber `json:"FBaseUnitIDCoby"` + FBaseDemandQtyCoby int `json:"FBaseDemandQtyCoby"` + FBaseOrderQtyCoby int `json:"FBaseOrderQtyCoby"` + FBaseFirmQtyCoby int `json:"FBaseFirmQtyCoby"` + FOutPutOptQueue string `json:"FOutPutOptQueue"` + FISBACKFLUSH string `json:"FISBACKFLUSH"` + FCobyEntryID int `json:"FCobyEntryId"` + FKeyBaseQty int `json:"FKeyBaseQty"` + FCobyBaseQty int `json:"FCobyBaseQty"` + FCopyBaseYieldQty int `json:"FCopyBaseYieldQty"` } type PLN_PLANORDER_SAVE struct { - FID int `json:"FID"` - FBillTypeID _struct.FNumber `json:"FBillTypeID"` - FBillNo string `json:"FBillNo"` - FSupplyOrgID _struct.FNumber `json:"FSupplyOrgId"` - FDemandOrgID _struct.FNumber `json:"FDemandOrgId"` - FMaterialID _struct.FNumber `json:"FMaterialId"` - FAuxPropID FAuxPropID `json:"FAuxPropId"` - FReleaseType string `json:"FReleaseType"` - FSupplyMaterialID _struct.FNumber `json:"FSupplyMaterialId"` - FBomID _struct.FNumber `json:"FBomId"` - FUnitID _struct.FNumber `json:"FUnitId"` - FSugQty int `json:"FSugQty"` - FPlanStartDate string `json:"FPlanStartDate"` - FPlanFinishDate string `json:"FPlanFinishDate"` - FPurDeptID _struct.FNumber `json:"FPurDeptId"` - FFirmQty int `json:"FFirmQty"` - FFirmStartDate string `json:"FFirmStartDate"` - FFirmFinishDate string `json:"FFirmFinishDate"` - FPrdDeptID _struct.FNumber `json:"FPrdDeptId"` - FPlanerID _struct.FNumber `json:"FPlanerId"` - FSupplierID _struct.FNumber `json:"FSupplierId"` - FInStockOrgID _struct.FNumber `json:"FInStockOrgId"` - FOwnerTypeID string `json:"FOwnerTypeId"` - FOwnerID _struct.FNumber `json:"FOwnerId"` - FComputerNo string `json:"FComputerNo"` - FDemandQty int `json:"FDemandQty"` - FOrderQty int `json:"FOrderQty"` - FDemandDate string `json:"FDemandDate"` - FMtoNo string `json:"FMtoNo"` - FDataSource string `json:"FDataSource"` - FProjectNo string `json:"FProjectNo"` - FReleaseStatus string `json:"FReleaseStatus"` - FSaleOrderNo string `json:"FSaleOrderNo"` - FSaleOrderEntrySeq int `json:"FSaleOrderEntrySeq"` - FDescription string `json:"FDescription"` - FModifierID _struct.FNumber `json:"FModifierId"` - FModifyDate string `json:"FModifyDate"` - FApproveDate string `json:"FApproveDate"` - FApproverID _struct.FNumber `json:"FApproverId"` - FBaseUnitID _struct.FNumber `json:"FBaseUnitId"` - FBaseOrderQty int `json:"FBaseOrderQty"` - FBaseSugQty int `json:"FBaseSugQty"` - FBaseDemandQty int `json:"FBaseDemandQty"` - FBaseFirmQty int `json:"FBaseFirmQty"` - FBeforeClose string `json:"FBeforeClose"` - FComputeID string `json:"FComputeId"` - FDemandType string `json:"FDemandType"` - FSaleOrderID int `json:"FSaleOrderId"` - FSaleOrderEntryID int `json:"FSaleOrderEntryId"` - FEntrustOrgID _struct.FNumber `json:"FEntrustOrgId"` - FBuyerID _struct.FNumber `json:"FBuyerId"` - FIsMRP bool `json:"FIsMRP"` - FSubEntity FSubEntity `json:"FSubEntity"` - FEntity []FEntity `json:"FEntity"` - FEntityCoby []FEntityCoby `json:"FEntityCoby"` - - F_RDPB_MPSVNO string `json:"F_RDPB_MPSVNO"` + FID int `json:"FID"` + FBillTypeID _struct.FNumber `json:"FBillTypeID"` + FBillNo string `json:"FBillNo"` + FSupplyOrgID _struct.FNumber `json:"FSupplyOrgId"` + FDemandOrgID _struct.FNumber `json:"FDemandOrgId"` + FMaterialID _struct.FNumber `json:"FMaterialId"` + FAuxPropID FAuxPropID `json:"FAuxPropId"` + FReleaseType string `json:"FReleaseType"` + FSupplyMaterialID _struct.FNumber `json:"FSupplyMaterialId"` + FBomID _struct.FNumber `json:"FBomId"` + FUnitID _struct.FNumber `json:"FUnitId"` + FSugQty int `json:"FSugQty"` + FPlanStartDate string `json:"FPlanStartDate"` + FPlanFinishDate string `json:"FPlanFinishDate"` + FPurDeptID _struct.FNumber `json:"FPurDeptId"` + FFirmQty int `json:"FFirmQty"` + FFirmStartDate string `json:"FFirmStartDate"` + FFirmFinishDate string `json:"FFirmFinishDate"` + FPrdDeptID _struct.FNumber `json:"FPrdDeptId"` + FPlanerID _struct.FNumber `json:"FPlanerId"` + FSupplierID _struct.FNumber `json:"FSupplierId"` + FInStockOrgID _struct.FNumber `json:"FInStockOrgId"` + FOwnerTypeID string `json:"FOwnerTypeId"` + FOwnerID _struct.FNumber `json:"FOwnerId"` + FComputerNo string `json:"FComputerNo"` + FDemandQty int `json:"FDemandQty"` + FOrderQty int `json:"FOrderQty"` + FDemandDate string `json:"FDemandDate"` + FMtoNo string `json:"FMtoNo"` + FDataSource string `json:"FDataSource"` + FProjectNo string `json:"FProjectNo"` + FReleaseStatus string `json:"FReleaseStatus"` + FSaleOrderNo string `json:"FSaleOrderNo"` + FSaleOrderEntrySeq int `json:"FSaleOrderEntrySeq"` + FDescription string `json:"FDescription"` + FModifierID _struct.FNumber `json:"FModifierId"` + FModifyDate string `json:"FModifyDate"` + FApproveDate string `json:"FApproveDate"` + FApproverID _struct.FNumber `json:"FApproverId"` + FBaseUnitID _struct.FNumber `json:"FBaseUnitId"` + FBaseOrderQty int `json:"FBaseOrderQty"` + FBaseSugQty int `json:"FBaseSugQty"` + FBaseDemandQty int `json:"FBaseDemandQty"` + FBaseFirmQty int `json:"FBaseFirmQty"` + FBeforeClose string `json:"FBeforeClose"` + FComputeID string `json:"FComputeId"` + FDemandType string `json:"FDemandType"` + FSaleOrderID int `json:"FSaleOrderId"` + FSaleOrderEntryID int `json:"FSaleOrderEntryId"` + FEntrustOrgID _struct.FNumber `json:"FEntrustOrgId"` + FBuyerID _struct.FNumber `json:"FBuyerId"` + FIsMRP bool `json:"FIsMRP"` + FSubEntity FSubEntity `json:"FSubEntity"` + FEntity []FEntity `json:"FEntity"` + FEntityCoby []FEntityCoby `json:"FEntityCoby"` + F_RDPB_MPSVNO string `json:"F_RDPB_MPSVNO"` } diff --git a/utils/k3cloud/struct/pln_forecast/request.go b/utils/k3cloud/struct/pln_forecast/request.go index 6788825..2b444f9 100644 --- a/utils/k3cloud/struct/pln_forecast/request.go +++ b/utils/k3cloud/struct/pln_forecast/request.go @@ -3,27 +3,27 @@ package pln_forecast import _struct "leit.com/LAPP_CHEERSSON_BACKEND/utils/k3cloud/struct" type PlnForecastSave struct { - FID int `json:"FID"` - FForeOrgID _struct.FNumber `json:"FForeOrgId"` + FID int `json:"FID"` + FForeOrgID _struct.FNumber `json:"FForeOrgId"` FBillTypeID _struct.FNumber `json:"FBillTypeID"` - FDate string `json:"FDate"` - FEntity []FEntity `json:"FEntity"` + FDate string `json:"FDate"` + FEntity []FEntity `json:"FEntity"` } type FEntity struct { FSupplyOrgID _struct.FNumber `json:"FSupplyOrgId"` - FCustID _struct.FNumber `json:"FCustID"` - FMaterialID _struct.FNumber `json:"FMaterialID"` - FUnitID _struct.FNumber `json:"FUnitID"` - FQty float64 `json:"FQty"` - FStartDate string `json:"FStartDate"` - FEndDate string `json:"FEndDate"` - FBaseUnitID _struct.FNumber `json:"FBaseUnitID"` - FBaseQty float64 `json:"FBaseQty"` - FAVERATYPE string `json:"FAVERATYPE"` - FAveraCycle int `json:"FAveraCycle"` - FStockOrgID _struct.FNumber `json:"FStockOrgId"` - FOwnerTypeID string `json:"FOwnerTypeId"` - FOwnerID _struct.FNumber `json:"FOwnerId"` - FReserveType string `json:"FReserveType"` - FIsMRP bool `json:"FIsMRP"` + FCustID _struct.FNumber `json:"FCustID"` + FMaterialID _struct.FNumber `json:"FMaterialID"` + FUnitID _struct.FNumber `json:"FUnitID"` + FQty float64 `json:"FQty"` + FStartDate string `json:"FStartDate"` + FEndDate string `json:"FEndDate"` + FBaseUnitID _struct.FNumber `json:"FBaseUnitID"` + FBaseQty float64 `json:"FBaseQty"` + FAVERATYPE string `json:"FAVERATYPE"` + FAveraCycle int `json:"FAveraCycle"` + FStockOrgID _struct.FNumber `json:"FStockOrgId"` + FOwnerTypeID string `json:"FOwnerTypeId"` + FOwnerID _struct.FNumber `json:"FOwnerId"` + FReserveType string `json:"FReserveType"` + FIsMRP bool `json:"FIsMRP"` }