后:增项准入范围状态;中石油编号不单独更新

src/dashoo.cn/backend/api/controllers/oilsupplier/annualaudit.go

@@ -1072,8 +1072,8 @@ func (this *AnnualAuditController) CommonAuditEntity() {
 func (this *AnnualAuditController) UpdateIsStorage() {
 	id := this.Ctx.Input.Param(":id")
 	status := this.GetString("Status")
-	PACNumber := this.GetString("PACNumber")
-	SupplierId := this.GetString("SupplierId")
+	//PACNumber := this.GetString("PACNumber")
+	//SupplierId := this.GetString("SupplierId")
 	var errinfo ErrorInfo
 	if id == "" {
 		errinfo.Message = "操作失败！请求信息不完整"
@@ -1106,12 +1106,12 @@ func (this *AnnualAuditController) UpdateIsStorage() {
 	annualSrv := annualaudit.GetOilAnnualAuditService(utils.DBE)
 	annualSrv.GetEntityById(id, &annualEntity)
 
-	var supplierEntity supplier.OilSupplier
-	srv := supplier.GetOilSupplierService(utils.DBE)
-	srv.GetEntityById(SupplierId, &supplierEntity)
-	supplierEntity.PACNumber = PACNumber
-	srvCols := []string{"PACNumber"}
-	srv.UpdateEntityByIdCols(SupplierId, &supplierEntity, srvCols)
+	//var supplierEntity supplier.OilSupplier
+	//srv := supplier.GetOilSupplierService(utils.DBE)
+	//srv.GetEntityById(SupplierId, &supplierEntity)
+	//supplierEntity.PACNumber = PACNumber
+	//srvCols := []string{"PACNumber"}
+	//srv.UpdateEntityByIdCols(SupplierId, &supplierEntity, srvCols)
 
 	AuditRemark := ""
 	fmt.Println("审批入库传入状态：", status)

src/dashoo.cn/backend/api/controllers/oilsupplier/suppliercertappend.go

@@ -1071,8 +1071,8 @@ func (this *OilSupplierCertAppendController) AppendConcentrateAuditEntity() {
 func (this *OilSupplierCertAppendController) UpdateIsStorage() {
 	id := this.Ctx.Input.Param(":id")
 	status := this.GetString("Status")
-	PACNumber := this.GetString("PACNumber")
-	SupplierId := this.GetString("SupplierId")
+	//PACNumber := this.GetString("PACNumber")
+	//SupplierId := this.GetString("SupplierId")
 	var errinfo ErrorInfo
 	if id == "" {
 		errinfo.Message = "操作失败！请求信息不完整"
@@ -1105,12 +1105,12 @@ func (this *OilSupplierCertAppendController) UpdateIsStorage() {
 	certAppendSrv := suppliercertappend.GetOilSupplierCertAppendService(utils.DBE)
 	certAppendSrv.GetEntityById(id, &supplierCertAppendEntity)
 
-	var supplierEntity supplier.OilSupplier
-	srv := supplier.GetOilSupplierService(utils.DBE)
-	srv.GetEntityById(SupplierId, &supplierEntity)
-	supplierEntity.PACNumber = PACNumber
-	srvCols := []string{"PACNumber"}
-	srv.UpdateEntityByIdCols(SupplierId, &supplierEntity, srvCols)
+	//var supplierEntity supplier.OilSupplier
+	//srv := supplier.GetOilSupplierService(utils.DBE)
+	//srv.GetEntityById(SupplierId, &supplierEntity)
+	//supplierEntity.PACNumber = PACNumber
+	//srvCols := []string{"PACNumber"}
+	//srv.UpdateEntityByIdCols(SupplierId, &supplierEntity, srvCols)
 
 	AuditRemark := ""
 	fmt.Println("审批入库传入状态：", status)

src/dashoo.cn/backend/api/controllers/oilsupplier/suppliercertappendsub.go

@@ -178,7 +178,7 @@ func (this *OilSupplierCertAppendSubController) AddAppendSub() {
 	json.Unmarshal(jsonblob, &model)
 	model.CreateBy = this.User.Realname
 	model.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
-	model.CertSubStatus="1"
+	model.CertSubStatus = "-1"
 	svc := suppliercertsub.GetOilSupplierCertSubService(utils.DBE)
 	var submodel suppliercertsub.OilSupplierCertSub
 	where_certsub := " SupplierCertId = "+ utils.ToStr(model.SupplierCertId) + " and SupplierTypeCode = 02"
@@ -292,7 +292,7 @@ func (this *OilSupplierCertAppendSubController) AddTechBus() {
 			datamain.Code = dataother.CheckList[n].Code
 			datamain.Name = dataother.CheckList[n].Name
 			datamain.Remark = dataother.Remark
-			datamain.CertSubStatus="1"
+			datamain.CertSubStatus = "-1"
 			datamain.IsDelete = 0
 			datamain.CreateBy = this.User.Realname
 			datamain.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -381,7 +381,7 @@ func (this *OilSupplierCertAppendSubController) AddGoodsBus() {
 			datamain.Code = dataother.CheckList[n].Code
 			datamain.Name = dataother.CheckList[n].Name
 			datamain.GoodsLevel = dataother.CheckList[n].GoodsLevel
-			datamain.CertSubStatus="1"
+			datamain.CertSubStatus = "-1"
 			datamain.Remark = dataother.Remark
 			datamain.IsDelete = 0
 			datamain.CreateBy = this.User.Realname