工单

懒羊羊

2023-12-14 03bb7a267ef4daa31ee435b4e540df385053d198

工单

 jcdm-main/src/main/java/com/jcdm/main/bs/technologyRoute/controller/BsTechnologyRouteInfoController.java

@@ -93,6 +93,17 @@
    }

    /**
     * 修改工艺流程以及子工艺
     */
    @PreAuthorize("@ss.hasPermi('bs:technologyRouteAndChild:edit')")
    @Log(title = "工艺流程And子信息", businessType = BusinessType.UPDATE)
    @PutMapping("/technologyRouteAndChild")
    public AjaxResult technologyRouteAndChild(@RequestBody BsTechnologyRouteInfo bsTechnologyRouteInfo)
    {
        return toAjax(bsTechnologyRouteInfoService.updateBsTechnologyRouteAndChildInfo(bsTechnologyRouteInfo));
    }

    /**
     * 删除工艺流程
     */
    @PreAuthorize("@ss.hasPermi('bs:technologyRoute:remove')")

 jcdm-main/src/main/java/com/jcdm/main/bs/technologyRoute/service/IBsTechnologyRouteInfoService.java

@@ -59,4 +59,6 @@
     * @return 结果
     */
    public int deleteBsTechnologyRouteInfoById(Long id);

    public int updateBsTechnologyRouteAndChildInfo(BsTechnologyRouteInfo bsTechnologyRouteInfo);
}

 jcdm-main/src/main/java/com/jcdm/main/bs/technologyRoute/service/impl/BsTechnologyRouteInfoServiceImpl.java

@@ -2,6 +2,7 @@

import java.util.List;
import com.jcdm.common.utils.DateUtils;
import com.jcdm.main.bs.domain.BsTechnologyRouteChildInfo;
import com.jcdm.main.bs.technologyRoute.domain.BsTechnologyRouteInfo;
import com.jcdm.main.bs.technologyRoute.mapper.BsTechnologyRouteInfoMapper;
import com.jcdm.main.bs.technologyRoute.service.IBsTechnologyRouteInfoService;
@@ -21,6 +22,10 @@
{
    @Autowired
    private BsTechnologyRouteInfoMapper bsTechnologyRouteInfoMapper;


    @Autowired
    private com.jcdm.main.bs.mapper.BsTechnologyRouteChildInfoMapper bsTechnologyRouteChildInfoMapper;

    /**
     * 查询工艺流程
@@ -97,4 +102,17 @@
    {
        return bsTechnologyRouteInfoMapper.deleteBsTechnologyRouteInfoById(id);
    }

    @Override
    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());
        List<BsTechnologyRouteChildInfo> bsTechnologyRouteChildInfos = bsTechnologyRouteChildInfoMapper.selectBsTechnologyRouteChildInfoList(bsTechnologyRouteChildInfo);
        for (com.jcdm.main.bs.domain.BsTechnologyRouteChildInfo technologyRouteChildInfo : bsTechnologyRouteChildInfos) {
            technologyRouteChildInfo.setSpareField4(bsTechnologyRouteInfo.getRouteName());
            int i1 = bsTechnologyRouteChildInfoMapper.updateBsTechnologyRouteChildByCodeInfo(technologyRouteChildInfo);
        }
        return i;
    }
}

 jcdm-main/src/main/java/com/jcdm/main/bs/technologyRouteChild/domain/BsTechnologyRouteChildInfo.java

@@ -74,6 +74,9 @@
    /** 预留字段4 */
    private String spareField4;

    /** 工艺流程ID */
    private String routeId;

    public void setId(Long id) 
    {
        this.id = id;
@@ -219,6 +222,14 @@
        return spareField4;
    }

    public String getRouteId() {
        return routeId;
    }

    public void setRouteId(String routeId) {
        this.routeId = routeId;
    }

    @Override
    public String toString() {
        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

 jcdm-main/src/main/java/com/jcdm/main/bs/technologyRouteChild/mapper/BsTechnologyRouteChildInfoMapper.java

@@ -43,6 +43,9 @@
     */
    public int updateBsTechnologyRouteChildInfo(BsTechnologyRouteChildInfo bsTechnologyRouteChildInfo);

    public int updateBsTechnologyRouteChildByCodeInfo(BsTechnologyRouteChildInfo bsTechnologyRouteChildInfo);


    /**
     * 删除工艺路线子信息
     * 

 jcdm-main/src/main/resources/mapper/bs/technologyRouteChild/BsTechnologyRouteChildInfoMapper.xml

@@ -24,10 +24,12 @@
        <result property="spareField2"    column="spare_field_2"    />
        <result property="spareField3"    column="spare_field_3"    />
        <result property="spareField4"    column="spare_field_4"    />
        <result property="routeId"    column="route_id"    />

    </resultMap>

    <sql id="selectBsTechnologyRouteChildInfoVo">
        select id, processes_code, processes_name, step_no, next_process, next_process_bond, key_processes_flag, preparation_time, wait_time, create_user, create_time, update_user, update_time, remark, route_code, spare_field_1, spare_field_2, spare_field_3, spare_field_4 from bs_technology_route_child_info
        select route_id, id, processes_code, processes_name, step_no, next_process, next_process_bond, key_processes_flag, preparation_time, wait_time, create_user, create_time, update_user, update_time, remark, route_code, spare_field_1, spare_field_2, spare_field_3, spare_field_4 from bs_technology_route_child_info
    </sql>

    <select id="selectBsTechnologyRouteChildInfoList" parameterType="BsTechnologyRouteChildInfo" resultMap="BsTechnologyRouteChildInfoResult">
@@ -68,7 +70,8 @@
            <if test="spareField2 != null">spare_field_2,</if>
            <if test="spareField3 != null">spare_field_3,</if>
            <if test="spareField4 != null">spare_field_4,</if>
         </trim>
            <if test="routeId != null">route_id,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="id != null">#{id},</if>
            <if test="processesCode != null and processesCode != ''">#{processesCode},</if>
@@ -89,7 +92,8 @@
            <if test="spareField2 != null">#{spareField2},</if>
            <if test="spareField3 != null">#{spareField3},</if>
            <if test="spareField4 != null">#{spareField4},</if>
         </trim>
            <if test="routeId != null">#{routeId},</if>
        </trim>
    </insert>

    <update id="updateBsTechnologyRouteChildInfo" parameterType="BsTechnologyRouteChildInfo">
@@ -113,10 +117,39 @@
            <if test="spareField2 != null">spare_field_2 = #{spareField2},</if>
            <if test="spareField3 != null">spare_field_3 = #{spareField3},</if>
            <if test="spareField4 != null">spare_field_4 = #{spareField4},</if>
            <if test="routeId != null">route_id = #{routeId},</if>

        </trim>
        where id = #{id}
    </update>

    <update id="updateBsTechnologyRouteChildByCodeInfo" parameterType="BsTechnologyRouteChildInfo">
        update bs_technology_route_child_info
        <trim prefix="SET" suffixOverrides=",">
            <if test="processesCode != null and processesCode != ''">processes_code = #{processesCode},</if>
            <if test="processesName != null">processes_name = #{processesName},</if>
            <if test="stepNo != null">step_no = #{stepNo},</if>
            <if test="nextProcess != null">next_process = #{nextProcess},</if>
            <if test="nextProcessBond != null">next_process_bond = #{nextProcessBond},</if>
            <if test="keyProcessesFlag != null">key_processes_flag = #{keyProcessesFlag},</if>
            <if test="preparationTime != null">preparation_time = #{preparationTime},</if>
            <if test="waitTime != null">wait_time = #{waitTime},</if>
            <if test="createUser != null">create_user = #{createUser},</if>
            <if test="createTime != null">create_time = #{createTime},</if>
            <if test="updateUser != null">update_user = #{updateUser},</if>
            <if test="updateTime != null">update_time = #{updateTime},</if>
            <if test="remark != null">remark = #{remark},</if>
            <if test="routeCode != null">route_code = #{routeCode},</if>
            <if test="spareField1 != null">spare_field_1 = #{spareField1},</if>
            <if test="spareField2 != null">spare_field_2 = #{spareField2},</if>
            <if test="spareField3 != null">spare_field_3 = #{spareField3},</if>
            <if test="spareField4 != null">spare_field_4 = #{spareField4},</if>
            <if test="routeId != null">route_id = #{routeId},</if>

        </trim>
        where route_code = #{routeCode}
    </update>

    <delete id="deleteBsTechnologyRouteChildInfoById" parameterType="Long">
        delete from bs_technology_route_child_info where id = #{id}
    </delete>

 jcdm-ui/src/api/main/bs/technologyRoute/technologyRoute.js

@@ -35,6 +35,14 @@
  })
}

export function updateTechnologyRouteAndChild(data) {
  return request({
    url: '/bs/technologyRoute/technologyRouteAndChild',
    method: 'put',
    data: data
  })
}

// 删除工艺流程
export function delTechnologyRoute(id) {
  return request({

 jcdm-ui/src/views/main/bs/technologyRoute/index.vue

@@ -110,7 +110,7 @@
        <el-table-column type="selection" width="55" align="center" />
        <el-table-column label="工艺流程编码" width="130" align="center">
          <template slot-scope="scope">
            <router-link :to="{path: '/main/route-data/index/', query: {routeCode: scope.row.routeCode} }" class="link-type">
            <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>
            </router-link>
          </template>
@@ -140,7 +140,7 @@
        </el-table-column>
        <el-table-column label="更改时间" width="160" align="center" prop="updateTime">
        </el-table-column>
        <el-table-column label="操作" width="130" align="center" class-name="small-padding fixed-width">
        <el-table-column fixed="right" label="操作" width="200" align="center" class-name="small-padding fixed-width">
          <template slot-scope="scope">
            <el-button
              size="mini"
@@ -220,7 +220,7 @@
</template>

<script>
import { listTechnologyRoute, getTechnologyRoute, delTechnologyRoute, addTechnologyRoute, updateTechnologyRoute } from "@/api/main/bs/technologyRoute/technologyRoute";
import { updateTechnologyRouteAndChild, listTechnologyRoute, getTechnologyRoute, delTechnologyRoute, addTechnologyRoute, updateTechnologyRoute } from "@/api/main/bs/technologyRoute/technologyRoute";

export default {
  name: "TechnologyRoute",
@@ -354,7 +354,8 @@
      this.$refs["form"].validate(valid => {
        if (valid) {
          if (this.form.id != null) {
            updateTechnologyRoute(this.form).then(response => {
            // updateTechnologyRoute(this.form).then(response => {
            updateTechnologyRouteAndChild(this.form).then(response => {
              this.$modal.msgSuccess("修改成功");
              this.open = false;
              this.getList();

 jcdm-ui/src/views/main/bs/technologyRouteChild/index.vue

@@ -144,7 +144,7 @@
        </el-table-column>
        <el-table-column width="130" :show-overflow-tooltip='true' label="工艺流程编码" align="center" prop="routeCode">
        </el-table-column>
        <el-table-column width="100" 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"
@@ -284,6 +284,7 @@
      // 弹出层标题
      title: "",
      queryRouteCode: "",
      queryRouteId: "",
      // 是否显示弹出层
      open: false,
      // 查询参数
@@ -308,9 +309,6 @@
        id: [
          { required: true, message: "主键id不能为空", trigger: "blur" }
        ],
        processesName: [
          { required: true, message: "工序名称不能为空", trigger: "blur" }
        ],
        stepNo: [
          { required: true, message: "加工工序不能为空", trigger: "blur" }
        ],
@@ -319,8 +317,11 @@
  },
  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
    this.getList();
    this.headerInformation();
    this.getProcesses();
@@ -373,6 +374,7 @@
        updateUser: null,
        updateTime: null,
        remark: null,
        routeId: null,
        routeCode: null,
        spareField1: null,
        spareField2: null,
@@ -416,6 +418,7 @@
    /** 提交按钮 */
    submitForm() {
      this.form.routeCode = this.queryRouteCode;
      this.form.routeId =  this.queryRouteId;
      this.$refs["form"].validate(valid => {
        if (valid) {
          if (this.form.id != null) {

 jcdm-ui/src/views/main/om/productionOrde/index.vue

@@ -142,7 +142,7 @@
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>

      <el-table border @row-click="handleRowClick" v-loading="loading" :data="productionOrdeList" @selection-change="handleSelectionChange">
      <el-table border v-loading="loading" :data="productionOrdeList" @selection-change="handleSelectionChange">
        <el-table-column type="selection" width="55" align="center" />
        <el-table-column label="生产工单号" width="160" align="center">
          <template slot-scope="scope">
@@ -205,60 +205,32 @@
        <el-table-column fixed="right" width="500" label="操作" align="center" class-name="small-padding fixed-width">
          <template slot-scope="scope">
            <!--  工单状态（1创建、2已发布、3生产中、4已冻结、5已完工、6已关闭） -->
            <el-button type="success"  style="width: 72px" plain @click="handleCommand('3',scope.row.id)" v-if="scope.row.orderStatus === '1'" size="mini">开始</el-button>
            <el-button style="width: 72px"  plain @click="handleCommand('4',scope.row.id)" v-if="scope.row.orderStatus === '2'|| scope.row.orderStatus === '3'" type="warning" size="mini">冻结</el-button>
            <el-button style="width: 72px" plain @click="handleCommand('3',scope.row.id)" v-if="scope.row.orderStatus === '4'" type="warning" size="mini">解冻</el-button>
            <el-button style="width: 72px" plain @click="handleCommand('6',scope.row.id)" v-if="scope.row.orderStatus === '1'" type="danger" size="mini">关闭</el-button>
            <el-button style="width: 72px" plain @click="handleCommand('1',scope.row.id)" v-if="scope.row.orderStatus === '6' " type="success" size="mini">启用</el-button>
            <el-button style="width: 72px" @click="handleCommand('5',scope.row.id)" v-if="scope.row.orderStatus === '3' || scope.row.orderStatus === '1'" type="success" size="mini">完成</el-button>
            <el-button style="width: 72px" v-if="scope.row.orderStatus === '5'" type="success" size="mini">已完工</el-button>
            <el-button type="success" :disabled="scope.row.orderStatus !== '1'"  style="width: 72px" plain @click="handleCommand('3',scope.row.id)" size="mini">开始</el-button>
            <el-button style="width: 72px" :disabled="scope.row.orderStatus !== '2' && scope.row.orderStatus !== '3'" v-if="scope.row.orderStatus !== '2'&&  scope.row.orderStatus !== '4'" plain @click="handleCommand('4',scope.row.id)" type="warning" size="mini">冻结</el-button>
            <el-button style="width: 72px" :disabled="scope.row.orderStatus !== '4'" v-if="scope.row.orderStatus === '4'" plain @click="handleCommand('3',scope.row.id)" type="warning" size="mini">解冻</el-button>
            <el-button style="width: 72px" :disabled="scope.row.orderStatus !== '1'" plain @click="handleCommand('6',scope.row.id)" v-if="scope.row.orderStatus === '1'||scope.row.orderStatus === '3'||scope.row.orderStatus === '4'||scope.row.orderStatus === '5'" type="danger" size="mini">关闭</el-button>
            <el-button style="width: 72px" :disabled="scope.row.orderStatus !== '6'" plain @click="handleCommand('1',scope.row.id)" v-if="scope.row.orderStatus === '6' " type="success" size="mini">启用</el-button>

            <el-button
              :disabled="scope.row.orderStatus !== '1'"
              size="mini"
              type="success"
              style="width: 72px"
              v-if="scope.row.orderStatus === '1'"
              icon="el-icon-edit"
              @click="handleUpdate(scope.row)"
              v-hasPermi="['om:productionOrde:edit']"
            >修改</el-button>
            <el-button
              :disabled="scope.row.orderStatus !== '1'"
              size="mini"
              type="warning"
              style="width: 72px"
              v-if="scope.row.orderStatus === '1'"
              icon="el-icon-delete"
              @click="handleDelete(scope.row)"
              v-hasPermi="['om:productionOrde:remove']"
            >删除</el-button>
            <!--  工单状态（1创建、2已发布、3生产中、4已冻结、5已完工、6已关闭） -->
<!--            <el-button type="success" :disabled="isDisabled1" style="width: 72px" plain @click="handleCommandStart('3',scope.row.id)" size="mini">开始</el-button>-->
<!--            <el-button style="width: 72px" :disabled="isDisabled2" plain @click="handleCommandDonejie('4',scope.row.id)" v-if="scope.row.orderStatus === '1'|| scope.row.orderStatus === '3'|| scope.row.orderStatus === '5'" type="warning" size="mini">冻结</el-button>-->
<!--            <el-button style="width: 72px" :disabled="isDisabled3" plain @click="handleCommandJieDong('3',scope.row.id)" v-if="scope.row.orderStatus === '4'" type="warning" size="mini">解冻</el-button>-->
<!--            <el-button style="width: 72px" :disabled="isDisabled4" plain @click="handleCommand('6',scope.row.id)" v-if="scope.row.orderStatus === '3' || scope.row.orderStatus === '1'|| scope.row.orderStatus === '4'|| scope.row.orderStatus === '5'" type="danger" size="mini">关闭</el-button>-->
<!--            <el-button style="width: 72px" :disabled="isDisabled5" plain @click="handleCommand('1',scope.row.id)" v-if="scope.row.orderStatus === '6' " type="success" size="mini">启用</el-button>-->
<!--            <el-button-->
<!--              size="mini"-->
<!--              type="success"-->
<!--              :disabled="isDisabled8"-->
<!--              style="width: 72px"-->
<!--              v-if="scope.row.orderStatus === '3' || scope.row.orderStatus === '1'|| scope.row.orderStatus === '4'|| scope.row.orderStatus === '5'"-->
<!--              icon="el-icon-edit"-->
<!--              @click="handleUpdate(scope.row)"-->
<!--              v-hasPermi="['om:productionOrde:edit']"-->
<!--            >修改</el-button>-->
<!--            <el-button-->
<!--              size="mini"-->
<!--              type="warning"-->
<!--              :disabled="isDisabled9"-->
<!--              style="width: 72px"-->
<!--              v-if="scope.row.orderStatus === '3'|| scope.row.orderStatus === '1'|| scope.row.orderStatus === '4'|| scope.row.orderStatus === '5'"-->
<!--              icon="el-icon-delete"-->
<!--              @click="handleDelete(scope.row)"-->
<!--              v-hasPermi="['om:productionOrde:remove']"-->
<!--            >删除</el-button>-->
<!--            <el-button style="width: 72px" :disabled="isDisabled6" v-if="scope.row.orderStatus === '1'|| scope.row.orderStatus === '3'|| scope.row.orderStatus === '4'" @click="handleCommandFinish('5',scope.row.id)"  type="success" size="mini">完成</el-button>-->
<!--            <el-button style="width: 72px" :disabled="isDisabled7" v-if="scope.row.orderStatus === '5'" type="success" size="mini">已完工</el-button>-->
            <el-button style="width: 72px" :disabled="scope.row.orderStatus === '4'||scope.row.orderStatus === '6'" v-if="scope.row.orderStatus !== '5'" @click="handleCommand('5',scope.row.id)" type="success" size="mini">完成</el-button>
            <el-button style="width: 72px" :disabled="scope.row.orderStatus === '5'" v-if="scope.row.orderStatus === '5'" type="success" size="mini">已完工</el-button>
          </template>
        </el-table-column>
      </el-table>
@@ -296,7 +268,7 @@
          <el-input v-model="form.productName" disabled placeholder="请输入产品名称" />
        </el-form-item>
        <el-form-item label="车间编号" prop="workshopCode">
          <el-select style="width: 93%" @change="handleSelectChange(form.processesCode)" v-model="form.processesCode" placeholder="请选择车间编号">
          <el-select style="width: 93%" @change="handleSelectChange(form.processesCode)" v-model="form.workshopCode" placeholder="请选择车间编号">
            <el-option
              v-for="item in options"
              :key="item.workshopCode"
@@ -398,17 +370,6 @@
  data() {
    return {
      titleName: '',

      isDisabled1: false,
      isDisabled2: false,
      isDisabled3: false,
      isDisabled4: false,
      isDisabled5: false,
      isDisabled6: false,
      isDisabled7: false,
      isDisabled8: false,
      isDisabled9: false,

      options: [],
      lineOptions: [],
      showFlag:false,
@@ -472,47 +433,6 @@
    this.initWorkshop();
  },
  methods: {
    //完成
    handleCommandFinish(status,id){
      this.updateOrderState(status,id)
      this.isDisabled1 = true;
      this.isDisabled4 = true;
      this.isDisabled8 = true;
      this.isDisabled9 = true;
      this.isDisabled6 = true;
      this.isDisabled7 = true;
      this.isDisabled2 = true;
    },
    //解冻
    handleCommandJieDong(status,id){
      this.updateOrderState(status,id)
      this.isDisabled1 = true;
      this.isDisabled4 = true;
      this.isDisabled8 = true;
      this.isDisabled9 = true;
      this.isDisabled6 = false;
      this.isDisabled2 = false;
    },
    //冻结
    handleCommandDonejie(status,id){
      this.updateOrderState(status,id)
      this.isDisabled1 = true;
      this.isDisabled4 = true;
      this.isDisabled8 = true;
      this.isDisabled9 = true;
      this.isDisabled6 = true;
      this.isDisabled2 = true;

    },
    //开始
    handleCommandStart(status,id){
      this.updateOrderState(status,id)
      this.isDisabled1 = true;
      this.isDisabled4 = true;
      this.isDisabled8 = true;
      this.isDisabled9 = true;
      this.isDisabled2 = false;
    },
    initWorkshop(){
      listWorkshop(this.queryParams).then(response => {
        this.options = response.rows;
@@ -547,15 +467,7 @@
      this.advancedShowSearch = (this.advancedShowSearch) ? this.advancedShowSearch = false : this.advancedShowSearch = true;
    },
    handleCommand(status,id) {
      this.updateStatusParameter.id = id;
      this.updateStatusParameter.orderStatus = status;
      updateProductionOrde(this.updateStatusParameter).then(response => {
        this.$modal.msgSuccess("修改成功");
        this.open = false;
        this.getList();
      });
    },
    updateOrderState(status,id){
      console.log(status)
      this.updateStatusParameter.id = id;
      this.updateStatusParameter.orderStatus = status;
      updateProductionOrde(this.updateStatusParameter).then(response => {
@@ -649,6 +561,7 @@
      this.reset();
      const id = row.id || this.ids
      getProductionOrde(id).then(response => {
        console.log(response.data)
        this.form = response.data;
        this.open = true;
        this.titleName = "修改生产工单";