jcdm-main/src/main/java/com/jcdm/main/bs/technologyRoute/service/impl/BsTechnologyRouteInfoServiceImpl.java
@@ -8,6 +8,7 @@ import com.jcdm.main.bs.technologyRoute.service.IBsTechnologyRouteInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.jcdm.main.bs.domain.BsTechnologyRouteChildInfo; import static org.apache.commons.lang3.SystemUtils.getUserName; @@ -107,10 +108,10 @@ public int updateBsTechnologyRouteAndChildInfo(BsTechnologyRouteInfo bsTechnologyRouteInfo) { int i = this.updateBsTechnologyRouteInfo(bsTechnologyRouteInfo); com.jcdm.main.bs.domain.BsTechnologyRouteChildInfo bsTechnologyRouteChildInfo = new com.jcdm.main.bs.domain.BsTechnologyRouteChildInfo(); bsTechnologyRouteChildInfo.setRouteCode(bsTechnologyRouteInfo.getRouteCode()); bsTechnologyRouteChildInfo.setId(bsTechnologyRouteInfo.getId()); List<BsTechnologyRouteChildInfo> bsTechnologyRouteChildInfos = bsTechnologyRouteChildInfoMapper.selectBsTechnologyRouteChildInfoList(bsTechnologyRouteChildInfo); for (com.jcdm.main.bs.domain.BsTechnologyRouteChildInfo technologyRouteChildInfo : bsTechnologyRouteChildInfos) { technologyRouteChildInfo.setSpareField4(bsTechnologyRouteInfo.getRouteName()); technologyRouteChildInfo.setRouteCode(bsTechnologyRouteInfo.getRouteCode()); int i1 = bsTechnologyRouteChildInfoMapper.updateBsTechnologyRouteChildByCodeInfo(technologyRouteChildInfo); } return i; jcdm-main/src/main/java/com/jcdm/main/bs/technologyRouteChild/domain/BsTechnologyRouteChildInfo.java
@@ -75,7 +75,7 @@ private String spareField4; /** 工艺流程ID */ private String routeId; private Long routeId; public void setId(Long id) { @@ -222,11 +222,11 @@ return spareField4; } public String getRouteId() { public Long getRouteId() { return routeId; } public void setRouteId(String routeId) { public void setRouteId(Long routeId) { this.routeId = routeId; }
@@ -39,6 +39,7 @@ <if test="processesName != null and processesName != ''"> and processes_name like concat('%', #{processesName}, '%')</if> <if test="keyProcessesFlag != null and keyProcessesFlag != ''"> and key_processes_flag = #{keyProcessesFlag}</if> <if test="routeCode != null and routeCode != ''"> and route_code = #{routeCode}</if> <if test="routeId != null and routeId != ''"> and route_Id = #{routeId}</if> </where> </select> @@ -147,7 +148,7 @@ <if test="routeId != null">route_id = #{routeId},</if> </trim> where route_code = #{routeCode} where route_id = #{routeId} </update> <delete id="deleteBsTechnologyRouteChildInfoById" parameterType="Long"> jcdm-ui/src/views/main/bs/lineInfo/index.vue
@@ -110,7 +110,7 @@ </el-table-column> <el-table-column label="更新时间" align="center" prop="updateTime" width="170"> </el-table-column> <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column width="200" label="操作" align="center" class-name="small-padding fixed-width"> <template slot-scope="scope"> <el-button size="mini" jcdm-ui/src/views/main/bs/processes/index.vue
@@ -96,29 +96,8 @@ </el-table-column> <el-table-column label="备注" align="center" prop="remarks"> </el-table-column> <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column width="200" label="操作" align="center" class-name="small-padding fixed-width"> <template slot-scope="scope"> <!-- <el-button--> <!-- type="success"--> <!-- plain--> <!-- icon="el-icon-edit"--> <!-- size="mini"--> <!-- style="width: 72px"--> <!-- :disabled="single"--> <!-- @click="handleUpdate"--> <!-- v-hasPermi="['om:' +--> <!-- '']"--> <!-- >修改</el-button>--> <!-- <el-button--> <!-- type="danger"--> <!-- plain--> <!-- icon="el-icon-delete"--> <!-- size="mini"--> <!-- style="width: 72px"--> <!-- :disabled="multiple"--> <!-- @click="handleDelete"--> <!-- v-hasPermi="['om:workReport:remove']"--> <!-- >删除</el-button>--> <el-button size="mini" type="success" jcdm-ui/src/views/main/bs/technologyRoute/index.vue
@@ -108,7 +108,7 @@ <el-table border v-loading="loading" :data="technologyRouteList" @selection-change="handleSelectionChange" v-if="technologyRouteList.length > 0"> <el-table-column type="selection" width="55" align="center" /> <el-table-column label="工艺流程编码" width="130" align="center"> <el-table-column :show-overflow-tooltip='true' label="工艺流程编码" width="130" align="center"> <template slot-scope="scope"> <router-link :to="{path: '/main/route-data/index/', query: {routeCode: scope.row.routeCode,routeId: scope.row.id} }" class="link-type"> <span>{{ scope.row.routeCode }}</span> jcdm-ui/src/views/main/bs/technologyRouteChild/index.vue
@@ -318,7 +318,6 @@ created() { let routeCode = this.$route.query.routeCode; let routeId = this.$route.query.routeId; alert(routeId) this.queryParams.routeCode = routeCode this.queryRouteCode = routeCode this.queryRouteId = routeId
