带入库

src/dashoo.cn/backend/api/business/oilsupplier/oilactivity/oilactivity.go

@@ -17,4 +17,6 @@ type OilActivity struct {
 const (
 	// 业务--注册
 	REGISTER string = "REGISTER"
+	// 入库
+	STORAGE string = "STORAGE"
 )

src/dashoo.cn/backend/api/business/todolist/todolist.go

@@ -24,4 +24,5 @@ const (
 	ANNUALAUDIT string = "3" // 年审
 	INFOCHANGE  string = "4" // 信息变更
 	REGISTER    string = "5" // 注册
+	STORAGE string = "7" // 入库
 )

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

@@ -1,12 +1,17 @@
 package oilsupplier
 
 import (
+	"dashoo.cn/backend/api/business/auditsetting"
 	"dashoo.cn/backend/api/business/oilsupplier/annualaudit"
+	"dashoo.cn/backend/api/business/oilsupplier/oilactivity"
 	"dashoo.cn/backend/api/business/oilsupplier/paymentbankinfo"
 	"dashoo.cn/backend/api/business/oilsupplier/suppliercertappend"
 	"dashoo.cn/backend/api/business/oilsupplier/suppliercertsub"
 	"dashoo.cn/backend/api/business/oilsupplier/supplierfile"
 	"dashoo.cn/backend/api/business/register"
+	"dashoo.cn/backend/api/business/workflow"
+	"dashoo.cn/business2/parameter"
+	"dashoo.cn/business2/userRole"
 	"encoding/json"
 	"strconv"
 	"strings"
@@ -375,6 +380,58 @@ func (this *PaymentInfoController) ReceiveMoneyBillList() {
 
 	for _, payItem := range paymentInfos {
 		if payItem.PayType == "1" { //准入
+
+			var cert suppliercert.OilSupplierCert
+			svc.GetEntityById(payItem.SupplierCertId,&cert)
+
+			svcActiviti := workflow.GetActivitiService(utils.DBE)
+			businessKey := strconv.Itoa(payItem.SupplierCertId)
+			result := "1"
+
+			userIds := ""
+			var userlist []userRole.Base_User
+			var setting auditsetting.Base_OilAuditSetting
+			usvc := userRole.GetUserService(utils.DBE)
+			where := "AuditStepCode='" + workflow.PROF_REGULATION + "'"
+			svc.GetEntity(&setting, where)
+			ids := usvc.GetUserIdsByRoleId(strconv.Itoa(setting.RoleId))
+			tempstr := strings.Join(ids, ",")
+			uids := strings.Replace(tempstr, "uid_", "", -1)
+			uids = strings.Trim(uids, ",")
+			paramSvc := baseparameter.GetBaseparameterService(utils.DBE)
+			topid := paramSvc.GetBaseparameterMessage("", "paramset", "CENT_AUDIT")
+			if uids != "" {
+				where := "Id in (" + uids + ")" + " and UnitId=" + topid
+				paramSvc.GetEntities(&userlist, where)
+			}
+
+			for _, tmpUser := range userlist {
+				userIds += strconv.Itoa(tmpUser.Id) + "," //strconv.FormatInt(tmpUser.Id, 10) + ","
+			}
+			userIds = strings.Trim(userIds, ",")
+			processInstanceId := svcActiviti.StartProcess2(workflow.OIL_SUPPLIER_INSTORE, businessKey, userIds, result, cert.SupplierTypeCode, payItem.SupplierName)
+			//var ActiComplete workflow.ActiCompleteVM
+			//ActiComplete.ProcessKey = workflow.OIL_SUPPLIER_INSTORE
+			//ActiComplete.BusinessKey = businessKey
+			//ActiComplete.UserNames = userIds
+			//ActiComplete.UserId = this.User.Id
+			//ActiComplete.Result = "1"
+			//ActiComplete.Remarks = ""
+			//ActiComplete.CallbackUrl = ""
+			//
+			//res := svcActiviti.TaskComplete(ActiComplete)
+			//fmt.Println(res)
+
+			var activity oilactivity.OilActivity
+			activity.EntityId = payItem.SupplierCertId
+			activity.ActType = oilactivity.STORAGE
+			activity.WorkflowId = processInstanceId
+			activity.BusinessKey = businessKey
+			activity.ProcessKey = workflow.OIL_SUPPLIER_INSTORE
+			activity.CreateOn = time.Now()
+
+			svc.InsertEntityBytbl(OilActivityName, &activity)
+
 			var certentity suppliercert.OilSupplierCert
 			certentity.Status = suppliercert.STOREING_STATUS
 			certentity.Step = 5

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

@@ -4,6 +4,7 @@ import (
 	"dashoo.cn/backend/api/business/audithistory"
 	"dashoo.cn/backend/api/business/codecsequence"
 	msg2 "dashoo.cn/backend/api/business/msg"
+	"dashoo.cn/backend/api/business/oilsupplier/oilactivity"
 	"dashoo.cn/backend/api/business/oilsupplier/oilcostmanage"
 	"dashoo.cn/backend/api/business/oilsupplier/supplier"
 	"dashoo.cn/backend/api/business/oilsupplier/suppliercertsub"
@@ -497,6 +498,23 @@ func (this *OilSupplierCertController) UpdateStorage() {
 		}
 		err = svc.UpdateEntityBytbl(OilSupplierCertName, id, &model, cols)
 	} else {
+
+		var activity oilactivity.OilActivity
+		where := "EntityId=" +  id + " and ActType='" + oilactivity.STORAGE + "'"
+		svc.GetEntity(&activity, where)
+
+		svcActiviti := workflow.GetActivitiService(utils.DBE)
+		var ActiComplete workflow.ActiCompleteVM
+		ActiComplete.ProcessKey = activity.ProcessKey
+		ActiComplete.BusinessKey = activity.BusinessKey
+		ActiComplete.UserId = this.User.Id
+		ActiComplete.Remarks =""
+		ActiComplete.Result = "1"
+
+		receiveVal := svcActiviti.TaskComplete(ActiComplete)
+
+		fmt.Println(receiveVal)
+
 		model.Status = suppliercert.STORE_STATUS
 		model.Step = 7
 		model.StorageOn = time.Now()
@@ -934,6 +952,59 @@ func (this *OilSupplierCertController) AuditEntityFir() {
 				usvc.GetEntities(&userlist, where)
 			}
 		} else if supplierCertEntity.InStyle == "2" || supplierCertEntity.InStyle == "4" || supplierCertEntity.InStyle == "6" {
+
+			svcActiviti := workflow.GetActivitiService(utils.DBE)
+			businessKey := strconv.Itoa(supplierCertEntity.Id)
+			result := "1"
+
+
+			userIds := ""
+			var userlist []userRole.Base_User
+			var setting auditsetting.Base_OilAuditSetting
+			usvc := userRole.GetUserService(utils.DBE)
+			where := "AuditStepCode='" + workflow.PROF_REGULATION + "'"
+			certSrv.GetEntity(&setting, where)
+			ids := usvc.GetUserIdsByRoleId(strconv.Itoa(setting.RoleId))
+			tempstr := strings.Join(ids, ",")
+			uids := strings.Replace(tempstr, "uid_", "", -1)
+			uids = strings.Trim(uids, ",")
+			paramSvc := baseparameter.GetBaseparameterService(utils.DBE)
+			topid := paramSvc.GetBaseparameterMessage("", "paramset", "CENT_AUDIT")
+			if uids != "" {
+				where := "Id in (" + uids + ")" + " and UnitId=" + topid
+				paramSvc.GetEntities(&userlist, where)
+			}
+
+			for _, tmpUser := range userlist {
+				userIds += strconv.Itoa(tmpUser.Id) + "," //strconv.FormatInt(tmpUser.Id, 10) + ","
+			}
+			userIds = strings.Trim(userIds, ",")
+
+			processInstanceId := svcActiviti.StartProcess2(workflow.OIL_SUPPLIER_INSTORE, businessKey, userIds, result, supplierCertEntity.SupplierTypeCode, supplierEntity.SupplierName)
+
+			//var ActiComplete workflow.ActiCompleteVM
+			//ActiComplete.ProcessKey = workflow.OIL_SUPPLIER_INSTORE
+			//ActiComplete.BusinessKey = businessKey
+			//ActiComplete.UserNames = userIds
+			//ActiComplete.UserId = this.User.Id
+			//ActiComplete.Result = "1"
+			//ActiComplete.Remarks = ""
+			//ActiComplete.CallbackUrl = ""
+			//
+			//res := svcActiviti.TaskComplete(ActiComplete)
+			//fmt.Println(res)
+
+			var activity oilactivity.OilActivity
+			activity.EntityId = supplierCertEntity.Id
+			activity.ActType = oilactivity.STORAGE
+			activity.WorkflowId = processInstanceId
+			activity.BusinessKey = businessKey
+			activity.ProcessKey = workflow.OIL_SUPPLIER_INSTORE
+			activity.CreateOn = time.Now()
+
+			certSrv.InsertEntityBytbl(OilActivityName, &activity)
+
+
 			status = suppliercert.STOREING_STATUS
 			step = 3
 		}  else {
@@ -1047,8 +1118,62 @@ func (this *OilSupplierCertController) AuditEntityFir() {
 					var sup []suppliercertsub.OilSupplierCertSub
 					total := paysvc.GetPagingEntitiesWithOrder(1,10,"Id",true,&sup,wheresup)
 
-					if supplierCertEntity.SupplierTypeCode == "01" && total <= 50 {
-						status = suppliercert.STOREING_STATUS
+					if supplierCertEntity.SupplierTypeCode == "01" && total <= 50{
+ 						status = suppliercert.STOREING_STATUS
+
+
+						svcActiviti := workflow.GetActivitiService(utils.DBE)
+						businessKey := strconv.Itoa(supplierCertEntity.Id)
+						result := "1"
+
+						userIds := ""
+						var userlist []userRole.Base_User
+						var setting auditsetting.Base_OilAuditSetting
+						usvc := userRole.GetUserService(utils.DBE)
+						where := "AuditStepCode='" + workflow.PROF_REGULATION + "'"
+						paysvc.GetEntity(&setting, where)
+						ids := usvc.GetUserIdsByRoleId(strconv.Itoa(setting.RoleId))
+						tempstr := strings.Join(ids, ",")
+						uids := strings.Replace(tempstr, "uid_", "", -1)
+						uids = strings.Trim(uids, ",")
+						paramSvc := baseparameter.GetBaseparameterService(utils.DBE)
+						topid := paramSvc.GetBaseparameterMessage("", "paramset", "CENT_AUDIT")
+						if uids != "" {
+							where := "Id in (" + uids + ")" + " and UnitId=" + topid
+							paramSvc.GetEntities(&userlist, where)
+						}
+
+						for _, tmpUser := range userlist {
+							userIds += strconv.Itoa(tmpUser.Id) + "," //strconv.FormatInt(tmpUser.Id, 10) + ","
+						}
+						userIds = strings.Trim(userIds, ",")
+
+						processInstanceId := svcActiviti.StartProcess2(workflow.OIL_SUPPLIER_INSTORE, businessKey, userIds, result, supplierCertEntity.SupplierTypeCode, supplierEntity.SupplierName)
+
+						//var ActiComplete workflow.ActiCompleteVM
+						//ActiComplete.ProcessKey = workflow.OIL_SUPPLIER_INSTORE
+						//ActiComplete.BusinessKey = businessKey
+						//ActiComplete.UserNames = userIds
+						//ActiComplete.UserId = this.User.Id
+						//ActiComplete.Result = "1"
+						//ActiComplete.Remarks = ""
+						//ActiComplete.CallbackUrl = ""
+						//
+						//res := svcActiviti.TaskComplete(ActiComplete)
+						//fmt.Println(res)
+
+						var activity oilactivity.OilActivity
+						activity.EntityId = supplierCertEntity.Id
+						activity.ActType = oilactivity.STORAGE
+						activity.WorkflowId = processInstanceId
+						activity.BusinessKey = businessKey
+						activity.ProcessKey = workflow.OIL_SUPPLIER_INSTORE
+						activity.CreateOn = time.Now()
+
+						paysvc.InsertEntityBytbl(OilActivityName, &activity)
+
+
+
 					} else {
 						paysvc.InsertEntity(&payinfo)
 						//发短信
@@ -1067,6 +1192,58 @@ func (this *OilSupplierCertController) AuditEntityFir() {
 					}
 					certSrv.UpdateEntityByIdCols(certId, supplierCertEntity, cols)
 				} else {
+
+					svcActiviti := workflow.GetActivitiService(utils.DBE)
+					businessKey := strconv.Itoa(supplierCertEntity.Id)
+					result := "1"
+
+					userIds := ""
+					var userlist []userRole.Base_User
+					var setting auditsetting.Base_OilAuditSetting
+					usvc := userRole.GetUserService(utils.DBE)
+					where := "AuditStepCode='" + workflow.PROF_REGULATION + "'"
+					certSrv.GetEntity(&setting, where)
+					ids := usvc.GetUserIdsByRoleId(strconv.Itoa(setting.RoleId))
+					tempstr := strings.Join(ids, ",")
+					uids := strings.Replace(tempstr, "uid_", "", -1)
+					uids = strings.Trim(uids, ",")
+					paramSvc := baseparameter.GetBaseparameterService(utils.DBE)
+					topid := paramSvc.GetBaseparameterMessage("", "paramset", "CENT_AUDIT")
+					if uids != "" {
+						where := "Id in (" + uids + ")" + " and UnitId=" + topid
+						paramSvc.GetEntities(&userlist, where)
+					}
+
+					for _, tmpUser := range userlist {
+						userIds += strconv.Itoa(tmpUser.Id) + "," //strconv.FormatInt(tmpUser.Id, 10) + ","
+					}
+					userIds = strings.Trim(userIds, ",")
+					processInstanceId := svcActiviti.StartProcess2(workflow.OIL_SUPPLIER_INSTORE, businessKey, userIds, result, supplierCertEntity.SupplierTypeCode, supplierEntity.SupplierName)
+
+					//var ActiComplete workflow.ActiCompleteVM
+					//ActiComplete.ProcessKey = workflow.OIL_SUPPLIER_INSTORE
+					//ActiComplete.BusinessKey = businessKey
+					//ActiComplete.UserNames = userIds
+					//ActiComplete.UserId = this.User.Id
+					//ActiComplete.Result = "1"
+					//ActiComplete.Remarks = ""
+					//ActiComplete.CallbackUrl = ""
+					//
+					//res := svcActiviti.TaskComplete(ActiComplete)
+					//fmt.Println(res)
+
+					var activity oilactivity.OilActivity
+					activity.EntityId = supplierCertEntity.Id
+					activity.ActType = oilactivity.STORAGE
+					activity.WorkflowId = processInstanceId
+					activity.BusinessKey = businessKey
+					activity.ProcessKey = workflow.OIL_SUPPLIER_INSTORE
+					activity.CreateOn = time.Now()
+
+					certSrv.InsertEntityBytbl(OilActivityName, &activity)
+
+
+
 					supplierCertEntity.Status = suppliercert.STOREING_STATUS
 					supplierCertEntity.Step = step
 					cols := []string{
@@ -1077,7 +1254,58 @@ func (this *OilSupplierCertController) AuditEntityFir() {
 				}
 			} else if supplierCertEntity.Status == suppliercert.PROF_AUDIT_STATUS && supplierCertEntity.InStyle == "3" {
 				//if supplierCertEntity.InStyle == "3" {
-					supplierCertEntity.Status = suppliercert.STOREING_STATUS
+
+				svcActiviti := workflow.GetActivitiService(utils.DBE)
+				businessKey := strconv.Itoa(supplierCertEntity.Id)
+				result := "1"
+
+				userIds := ""
+				var userlist []userRole.Base_User
+				var setting auditsetting.Base_OilAuditSetting
+				usvc := userRole.GetUserService(utils.DBE)
+				where := "AuditStepCode='" + workflow.PROF_REGULATION + "'"
+				certSrv.GetEntity(&setting, where)
+				ids := usvc.GetUserIdsByRoleId(strconv.Itoa(setting.RoleId))
+				tempstr := strings.Join(ids, ",")
+				uids := strings.Replace(tempstr, "uid_", "", -1)
+				uids = strings.Trim(uids, ",")
+				paramSvc := baseparameter.GetBaseparameterService(utils.DBE)
+				topid := paramSvc.GetBaseparameterMessage("", "paramset", "CENT_AUDIT")
+				if uids != "" {
+					where := "Id in (" + uids + ")" + " and UnitId=" + topid
+					paramSvc.GetEntities(&userlist, where)
+				}
+
+				for _, tmpUser := range userlist {
+					userIds += strconv.Itoa(tmpUser.Id) + "," //strconv.FormatInt(tmpUser.Id, 10) + ","
+				}
+				userIds = strings.Trim(userIds, ",")
+				processInstanceId := svcActiviti.StartProcess2(workflow.OIL_SUPPLIER_INSTORE, businessKey, userIds, result, supplierCertEntity.SupplierTypeCode, supplierEntity.SupplierName)
+
+				//var ActiComplete workflow.ActiCompleteVM
+				//ActiComplete.ProcessKey = workflow.OIL_SUPPLIER_INSTORE
+				//ActiComplete.BusinessKey = businessKey
+				//ActiComplete.UserNames = userIds
+				//ActiComplete.UserId = this.User.Id
+				//ActiComplete.Result = "1"
+				//ActiComplete.Remarks = ""
+				//ActiComplete.CallbackUrl = ""
+				//
+				//res := svcActiviti.TaskComplete(ActiComplete)
+				//fmt.Println(res)
+
+				var activity oilactivity.OilActivity
+				activity.EntityId = supplierCertEntity.Id
+				activity.ActType = oilactivity.STORAGE
+				activity.WorkflowId = processInstanceId
+				activity.BusinessKey = businessKey
+				activity.ProcessKey = workflow.OIL_SUPPLIER_INSTORE
+				activity.CreateOn = time.Now()
+
+				certSrv.InsertEntityBytbl(OilActivityName, &activity)
+
+
+				supplierCertEntity.Status = suppliercert.STOREING_STATUS
 					supplierCertEntity.Step = 3
 					cols := []string{
 						"Status",

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

@@ -76,6 +76,9 @@ func (this *TodoListController) GetMyTaskEntityList() {
 				todo.UserName = this.User.Realname
 				todo.CreateTime = item.CreateTime
 				todo.TaskName = item.TaskName
+				if wfName == workflow.OIL_SUPPLIER_INSTORE {
+					todo.Type = todolist.STORAGE
+				}
 				todolists = append(todolists, todo)
 			}
 

src/dashoo.cn/frontend_web/src/pages/index.vue

@@ -51,6 +51,7 @@
               <span v-if="scope.row.Type=='3'" style="color:#E6A23C">年审-{{scope.row.TaskName}}</span>
               <span v-if="scope.row.Type=='4'" style="color:#E6A23C">信息变更-{{scope.row.TaskName}}</span>
               <span v-if="scope.row.Type=='5'" style="color:#E6A23C">企业注册-待审批</span>
+              <span v-if="scope.row.Type=='7'" style="color:#E6A23C">准入-{{scope.row.TaskName}}</span>
             </template>
           </el-table-column>
 
@@ -485,6 +486,15 @@
           this.$router.push('/oilsupplier/infochangech/' + val.Id + '/auditoperation?InfoStatus='+ val.Status+'&SupId='+val.SupplierId)
         } else if (val.Type === '5') {
           this.initDataregister(val.Id)
+        } else if (val.Type === '7') {
+          if (val.SupplierTypeCode === '01') {
+            SupplierType = 'goodsedit'
+          } else if (val.SupplierTypeCode === '02') {
+            SupplierType = 'basisedit'
+          } else {
+            SupplierType = 'techedit'
+          }
+          this.$router.push('oilsupplier/supplierstorage/' + val.Id + '/' + SupplierType + '?certid=' + val.CertId)
         }
       },
       bigImg (url) {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstorage/_opera/basisedit.vue

@@ -11,19 +11,19 @@
           <i class="icon icon-table2"></i> 信息
         </span>
         <span style="float: right;">
-          <el-button plain icon="el-icon-right" size="mini" style="margin-right: 5px" @click="nextTab">下一步</el-button>
-          <el-popover>
-            <el-steps :active="formData.Step" direction="vertical" align-center finish-status="success">
-              <el-step title="填信息"></el-step>
-              <el-step title="待审批"></el-step>
-              <el-step title="已审批"></el-step>
-              <el-step title="待交费"></el-step>
-              <el-step title="已交费"></el-step>
-              <el-step title="待入库"></el-step>
-              <el-step title="完成"></el-step>
-            </el-steps>
-            <!-- <el-button slot="reference" plain size="mini" style="margin-right: 5px">查看进度</el-button> -->
-          </el-popover>
+          <!--<el-button plain icon="el-icon-right" size="mini" style="margin-right: 5px" @click="nextTab">下一步</el-button>-->
+          <!--<el-popover>-->
+            <!--<el-steps :active="formData.Step" direction="vertical" align-center finish-status="success">-->
+              <!--<el-step title="填信息"></el-step>-->
+              <!--<el-step title="待审批"></el-step>-->
+              <!--<el-step title="已审批"></el-step>-->
+              <!--<el-step title="待交费"></el-step>-->
+              <!--<el-step title="已交费"></el-step>-->
+              <!--<el-step title="待入库"></el-step>-->
+              <!--<el-step title="完成"></el-step>-->
+            <!--</el-steps>-->
+            <!--&lt;!&ndash; <el-button slot="reference" plain size="mini" style="margin-right: 5px">查看进度</el-button> &ndash;&gt;-->
+          <!--</el-popover>-->
           <el-button type="primary" size="mini" style="margin-right: 5px" v-if="this,formData.Status == '7'" @click="createWZAccessCardNo">生成准入编码</el-button>
           <el-button type="primary" size="mini" style="margin-right: 5px" v-if="this,formData.Status == '7'" @click="saveAccessCardNo">保存准入编码</el-button>
           <el-button type="primary" size="mini" style="margin-right: 5px" v-if="this.formData.Status == '7'" @click="confirm">确认入库</el-button>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstorage/_opera/techedit.vue

@@ -11,19 +11,19 @@
           <i class="icon icon-table2"></i> 信息
         </span>
         <span style="float: right;">
-          <el-button plain icon="el-icon-right" size="mini" style="margin-right: 5px" @click="nextTab">下一步</el-button>
-          <el-popover>
-            <el-steps :active="formData.Step" direction="vertical" align-center finish-status="success">
-              <el-step title="填信息"></el-step>
-              <el-step title="待审批"></el-step>
-              <el-step title="已审批"></el-step>
-              <el-step title="待交费"></el-step>
-              <el-step title="已交费"></el-step>
-              <el-step title="待入库"></el-step>
-              <el-step title="完成"></el-step>
-            </el-steps>
-            <!-- <el-button slot="reference" plain size="mini" style="margin-right: 5px">查看进度</el-button> -->
-          </el-popover>
+          <!--<el-button plain icon="el-icon-right" size="mini" style="margin-right: 5px" @click="nextTab">下一步</el-button>-->
+          <!--<el-popover>-->
+            <!--<el-steps :active="formData.Step" direction="vertical" align-center finish-status="success">-->
+              <!--<el-step title="填信息"></el-step>-->
+              <!--<el-step title="待审批"></el-step>-->
+              <!--<el-step title="已审批"></el-step>-->
+              <!--<el-step title="待交费"></el-step>-->
+              <!--<el-step title="已交费"></el-step>-->
+              <!--<el-step title="待入库"></el-step>-->
+              <!--<el-step title="完成"></el-step>-->
+            <!--</el-steps>-->
+            <!--&lt;!&ndash; <el-button slot="reference" plain size="mini" style="margin-right: 5px">查看进度</el-button> &ndash;&gt;-->
+          <!--</el-popover>-->
           <el-button type="primary" size="mini" style="margin-right: 5px" v-if="this,formData.Status == '7'" @click="createJFAccessCardNo">生成准入编码</el-button>
           <el-button type="primary" size="mini" style="margin-right: 5px" v-if="this,formData.Status == '7'" @click="saveAccessCardNo">保存准入编码</el-button>
           <el-button type="primary" size="mini" style="margin-right: 5px" v-if="this,formData.Status == '7'" @click="confirm">确认入库</el-button>