dubch 5 ani în urmă
părinte
comite
8afb0c795b

+ 5 - 0
src/dashoo.cn/backend/api/business/oilsupplier/goodsaptitude/oilgoodsaptitude.go

@@ -296,6 +296,11 @@ type GoodsBusiness1 struct {
 	GoodsLevel		  string
 }
 
+type GoodsBusiness2 struct {
+	Code              string
+	Name              string
+}
+
 type Ids struct {
 	Id              int
 }

+ 2 - 2
src/dashoo.cn/backend/api/controllers/oilsupplier/basisbuild.go

@@ -1697,7 +1697,7 @@ func (this *OilBasisBuildController) DeleteUpdate() {
 	var err error
 	go func() {
 		svc := goodsaptitude.GetOilGoodsAptitudeService(utils.DBE)
-		var list1 []goodsaptitude.GoodsBusiness1
+		var list1 []goodsaptitude.GoodsBusiness2
 		svc.GetEntitysByWhere(OilBasisBuildName, "1=1", &list1)
 		for _,item := range list1{
 			var subDelete suppliercertsub.OilSupplierCertSub1
@@ -1706,7 +1706,7 @@ func (this *OilBasisBuildController) DeleteUpdate() {
 			err = svc.UpdateEntityBywheretbl(OilSupplierCertSubName, &subDelete, cols, "SupplierTypeCode = '02' and Name = '" + item.Name + "'")
 		}
 		var list []goodsaptitude.Ids
-		svc.DeleteTableBySelect(OilSupplierCertSubName, OilTechnologyServiceClassName, "a.SupplierTypeCode='02' AND b.Id IS NULL", &list, "Name")
+		svc.DeleteTableBySelect(OilSupplierCertSubName, OilBasisBuildName, "a.SupplierTypeCode='02' AND b.Id IS NULL", &list, "Name")
 		for _,id := range list{
 			err = svc.DeleteTable(OilSupplierCertSubName, "Id = " + strconv.Itoa(id.Id))
 		}

+ 0 - 7
src/dashoo.cn/backend/api/controllers/oilsupplier/goodsaptitude.go

@@ -2238,13 +2238,6 @@ func (this *OilGoodsAptitudeController) GetDelCertSubList() {
 	where = where + " and a.Type in (1, 3)"
 	svc := goodsaptitude.GetOilGoodsAptitudeService(utils.DBE)
 	var list []suppliercertsub.OilSupplierCertSub1
-	var co supplier.OilSupplierContrast
-	svc.GetEntityById(SupplierId, &co)
-	//total := svc.GetMyPagingEntitiesWithOrderBytbl(TmpOilSupplierCertSubName, page.CurrentPage, page.Size, orderby, asc, &list, where)
-	//total := svc.GetMyPagingEntitiesWithOrderBytbl(OilSupplierCertSubName, page.CurrentPage, page.Size, orderby, asc, &list, where)
-	if co.IsDelete == 1 {
-		where += " and a.IsQuestion = 1"
-	}
 	total := svc.GetPagingTmpSubEntities(page.CurrentPage, page.Size, orderby, asc, &list, where)
 	a := 0
 	for _, item := range list {