|
|
@@ -193,65 +193,70 @@ func (s *OilSupplierCertService) IsSupplierCertCanSubmit(supplierId, supplierCer
|
|
|
filesvc := supplierfile.GetSupplierfileService(utils.DBE)
|
|
|
IsManufacturer := 0
|
|
|
mergerCertSkipField := paramSvc.GetBaseparameterMessage("GFGL", "paramset", "MergerCertSkipFieldName")
|
|
|
- for _, certSubItem := range certSubList {
|
|
|
- if certSubItem.GoodsLevel == supplier.GOODS_LEVEL_1 && supplierEntity.Grade == supplier.GOODS_LEVEL_2{
|
|
|
- panic("二级供应商不能准入一级物资！")
|
|
|
- }
|
|
|
- var needList []supplierfile.FileList
|
|
|
- if supplierTypeCode == "01" {
|
|
|
- if supplierEntity.OperType == "制造商" {
|
|
|
- IsManufacturer = 1
|
|
|
- } else if supplierEntity.OperType == "贸易商" || supplierEntity.OperType == "代理商"{
|
|
|
- IsManufacturer = 2
|
|
|
- if certSubItem.IsManufacturer == 1 {
|
|
|
- panic("非制造商准入范围不能为制造商,请手动修改！")
|
|
|
- }
|
|
|
+
|
|
|
+ var ids suppliercertsub.Ids
|
|
|
+ certsubService.GetIds(supplierCertId, supplierTypeCode, &ids)
|
|
|
+
|
|
|
+ gradeTotal := certsubService.GetCountGrade(supplierCertId)
|
|
|
+ if supplierEntity.Grade == "2" && gradeTotal > 0 {
|
|
|
+ //if certSubItem.GoodsLevel == supplier.GOODS_LEVEL_1 && supplierEntity.Grade == supplier.GOODS_LEVEL_2{
|
|
|
+ panic("二级供应商不能准入一级物资！")
|
|
|
+ }
|
|
|
+ var needList []supplierfile.FileList
|
|
|
+ if supplierTypeCode == "01" {
|
|
|
+ if supplierEntity.OperType == "制造商" {
|
|
|
+ IsManufacturer = 1
|
|
|
+ } else if supplierEntity.OperType == "贸易商" || supplierEntity.OperType == "代理商"{
|
|
|
+ IsManufacturer = 2
|
|
|
+ total := certsubService.GetCountIsManufacturer(supplierCertId)
|
|
|
+ if total > 0 {
|
|
|
+ panic("非制造商准入范围不能为制造商,请手动修改！")
|
|
|
}
|
|
|
- //需要的资质
|
|
|
- needList = filesvc.GetGoodsNeedFileList(strconv.Itoa(certSubItem.SubClassId), strconv.Itoa(IsManufacturer))
|
|
|
- } else if supplierTypeCode == "02" {
|
|
|
- needList = filesvc.GetBasicNeedFileList(strconv.Itoa(certSubItem.SubClassId))
|
|
|
- } else if supplierTypeCode == "03" {
|
|
|
- needList = filesvc.GetTechNeedFileList(strconv.Itoa(certSubItem.SubClassId))
|
|
|
}
|
|
|
+ //需要的资质
|
|
|
+ needList = filesvc.GetGoodsNeedFileListNew(ids.Id, strconv.Itoa(IsManufacturer))
|
|
|
+ } else if supplierTypeCode == "02" {
|
|
|
+ needList = filesvc.GetBasicNeedFileListNew(ids.Id)
|
|
|
+ } else if supplierTypeCode == "03" {
|
|
|
+ needList = filesvc.GetTechNeedFileListNew(ids.Id)
|
|
|
+ }
|
|
|
|
|
|
- if IsManufacturer == 1 { //制造商
|
|
|
- var needFile supplierfile.FileList
|
|
|
- // 质量管理体系认证证书
|
|
|
- CNPCrenkezhengshu := paramSvc.GetBaseparameterMessage("GFGL", "paramset", "CNPCrenkezhengshu")
|
|
|
- needFile.FileName = CNPCrenkezhengshu
|
|
|
- needList = append(needList, needFile)
|
|
|
- }
|
|
|
+ if IsManufacturer == 1 { //制造商
|
|
|
+ var needFile supplierfile.FileList
|
|
|
+ // 质量管理体系认证证书
|
|
|
+ CNPCrenkezhengshu := paramSvc.GetBaseparameterMessage("GFGL", "paramset", "CNPCrenkezhengshu")
|
|
|
+ needFile.FileName = CNPCrenkezhengshu
|
|
|
+ needList = append(needList, needFile)
|
|
|
+ }
|
|
|
|
|
|
- if supplierCertEntity.InStyle == "4" {
|
|
|
- var needFile supplierfile.FileList
|
|
|
- //战略合作协议扫描件
|
|
|
- needFile.FileName = paramSvc.GetBaseparameterMessage("GFGL", "paramset", "CooperationFile")
|
|
|
- needList = append(needList, needFile)
|
|
|
- }
|
|
|
+ if supplierCertEntity.InStyle == "4" {
|
|
|
+ var needFile supplierfile.FileList
|
|
|
+ //战略合作协议扫描件
|
|
|
+ needFile.FileName = paramSvc.GetBaseparameterMessage("GFGL", "paramset", "CooperationFile")
|
|
|
+ needList = append(needList, needFile)
|
|
|
+ }
|
|
|
|
|
|
- for _, needHeader := range needList {
|
|
|
- if ( supplierEntity.CredentialFlag == "1" || supplierEntity.CredentialFlag == "2") &&
|
|
|
- strings.Contains(mergerCertSkipField, needHeader.FileName+",") {
|
|
|
- //三证合一或五证合一的证件，不需要验证了
|
|
|
- continue
|
|
|
- }
|
|
|
- var fileist1 supplierfile.OilSupplierFile
|
|
|
- where1 := " SupplierId = '" + supplierId + "' and NeedFileType = '" + needHeader.FileName + "'"
|
|
|
- filesvc.GetEntityByWhere("OilSupplierFile", where1, &fileist1)
|
|
|
+ for _, needHeader := range needList {
|
|
|
+ if ( supplierEntity.CredentialFlag == "1" || supplierEntity.CredentialFlag == "2") &&
|
|
|
+ strings.Contains(mergerCertSkipField, needHeader.FileName+",") {
|
|
|
+ //三证合一或五证合一的证件，不需要验证了
|
|
|
+ continue
|
|
|
+ }
|
|
|
+ var fileist1 supplierfile.OilSupplierFile
|
|
|
+ where1 := " SupplierId = '" + supplierId + "' and NeedFileType = '" + needHeader.FileName + "'"
|
|
|
+ filesvc.GetEntityByWhere("OilSupplierFile", where1, &fileist1)
|
|
|
|
|
|
- var filelist2 suppliercertappendsub.OilAppendChangeDetail
|
|
|
- where2 := " SupplierId = '" + supplierId + "' and NeedFileType = '" +needHeader.FileName + "'"
|
|
|
- svc2 := suppliercertappendsub.GetOilSupplierCertAppendSubService (utils.DBE)
|
|
|
- svc2.GetEntityByWhere("OilAppendChangeDetail", where2, &filelist2)
|
|
|
+ var filelist2 suppliercertappendsub.OilAppendChangeDetail
|
|
|
+ where2 := " SupplierId = '" + supplierId + "' and NeedFileType = '" +needHeader.FileName + "'"
|
|
|
+ svc2 := suppliercertappendsub.GetOilSupplierCertAppendSubService (utils.DBE)
|
|
|
+ svc2.GetEntityByWhere("OilAppendChangeDetail", where2, &filelist2)
|
|
|
|
|
|
- if !strings.Contains(companyHasHeaders, needHeader.FileName+",") {
|
|
|
- panic("请上传" + needHeader.FileName + "!")
|
|
|
- } else {
|
|
|
- if filelist2.FileName == "" && fileist1.FileName == "" {
|
|
|
- //缺少的资质
|
|
|
- panic("请上传！" + needHeader.FileName + "!")
|
|
|
- }
|
|
|
+ if !strings.Contains(companyHasHeaders, needHeader.FileName+",") {
|
|
|
+ panic("请上传！" + needHeader.FileName + "!")
|
|
|
+ } else {
|
|
|
+ if filelist2.FileName == "" && fileist1.FileName == "" {
|
|
|
+ //缺少的资质
|
|
|
+ panic("请上传！" + needHeader.FileName + "!")
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -266,7 +271,7 @@ func (s *OilSupplierCertService) IsSupplierCertCanSubmit(supplierId, supplierCer
|
|
|
scenefileService := supplierscenefile.GetSupplierScenefileService(utils.DBE)
|
|
|
scenefileEntity := scenefileService.GetSceneFileList(strconv.Itoa(supplierEntity.Id))
|
|
|
if len(scenefileEntity.FileUrl) <= 0 {
|
|
|
- panic("请上传现场考察报告！")
|
|
|
+ panic("请上传! 现场考察报告！")
|
|
|
}
|
|
|
}
|
|
|
|
dubch