工单界面新增按钮

hdy

2025-03-12 a646fa956a1d41ea33a55712693f1b175f85ecd1

工单界面新增按钮

 billion-main/src/main/java/com/billion/main/api/service/impl/WorkOrdersInfoServiceImpl.java

@@ -46,6 +46,7 @@
            omProductionOrderInfo.setBodyStatus("0");
            omProductionOrderInfo.setHeadStatus("0");
            omProductionOrderInfo.setPreStatus("0");
            omProductionOrderInfo.setDelFlag("0");
            omProductionOrderInfo.setWorkOrderNo(workOrdersInfo.getOrderNumber());
            omProductionOrderInfo.setSalesOrderCode(workOrdersInfo.getBatchNumber());
            omProductionOrderInfo.setProductCode(workOrdersInfo.getMaterialNumber());

 billion-main/src/main/java/com/billion/main/om/service/impl/OmProductionOrderInfoServiceImpl.java

@@ -3,17 +3,15 @@
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.billion.common.core.domain.entity.SysUser;
import com.billion.common.core.domain.model.LoginUser;
import com.billion.common.exception.ServiceException;
import com.billion.common.utils.SecurityUtils;
import com.billion.common.utils.DateUtils;
import com.billion.main.om.domain.OmProductionOrderInfo;
import com.billion.main.om.mapper.OmProductionOrderInfoMapper;
import com.billion.main.om.service.IOmProductionOrderInfoService;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.*;
import java.util.List;

/**
 * 生产工单Service业务层处理
@@ -129,20 +127,16 @@
    @Override
    public int updateOmProductionOrderInfo(OmProductionOrderInfo omProductionOrderInfo)
    {
        Collection<Long> omProductionOrderInfoIds = Collections.emptyList();
        List<OmProductionOrderInfo> checkList = this.list(new LambdaQueryWrapper<OmProductionOrderInfo>()
                .eq(OmProductionOrderInfo::getWorkOrderNo, omProductionOrderInfo.getWorkOrderNo())
                        .notIn(OmProductionOrderInfo::getId, omProductionOrderInfoIds));
//                .stream().filter(x -> !x.getId().equals(omProductionOrderInfo.getId()))
//                .collect(Collectors.toList());
        if (CollUtil.isNotEmpty(checkList)){
            throw new ServiceException("已存在工单编号为"+omProductionOrderInfo.getWorkOrderNo()+"的数据");
        }
        LoginUser loginUser = SecurityUtils.getLoginUser();
        SysUser user = loginUser.getUser();
        omProductionOrderInfo.setUpdateTime(new Date());
        omProductionOrderInfo.setUpdateBy(user.getUserName());
        return OmProductionOrderInfoMapper.updateOmProductionOrderInfo(omProductionOrderInfo);
//        Collection<Long> omProductionOrderInfoIds = Collections.emptyList();
//        List<OmProductionOrderInfo> checkList = this.list(new LambdaQueryWrapper<OmProductionOrderInfo>()
//                .eq(OmProductionOrderInfo::getWorkOrderNo, omProductionOrderInfo.getWorkOrderNo())
//                        .notIn(OmProductionOrderInfo::getId, omProductionOrderInfoIds));
//        if (CollUtil.isNotEmpty(checkList)){
//            throw new ServiceException("已存在工单编号为"+omProductionOrderInfo.getWorkOrderNo()+"的数据");
//        }
//        return OmProductionOrderInfoMapper.updateOmProductionOrderInfo(omProductionOrderInfo);
        omProductionOrderInfo.setUpdateTime(DateUtils.getNowDate());
        return  OmProductionOrderInfoMapper.updateOmProductionOrderInfo(omProductionOrderInfo);
    }

    /**

 billion-main/src/main/resources/mapper/om/OmProductionOrderInfoMapper.xml

@@ -20,6 +20,16 @@
        <result property="updateBy"    column="update_by"    />
        <result property="remarks"    column="remarks"    />
        <result property="delFlag"    column="del_flag"    />
        <result property="engineType"    column="engine_type"    />
        <result property="engineName"    column="engine_name"    />
        <result property="flag"    column="flag"    />
        <result property="bodyQty"    column="body_qty"    />
        <result property="headQty"    column="head_qty"    />
        <result property="preQty"    column="pre_qty"    />
        <result property="bodyStatus"    column="body_status"    />
        <result property="headStatus"    column="head_status"    />
        <result property="preStatus"    column="pre_status"    />

    </resultMap>

    <sql id="selectOmProductionOrderInfoVo">
@@ -133,7 +143,6 @@
            <if test="workOrderNo != null and workOrderNo != ''">work_order_no,</if>
            <if test="salesOrderCode != null and salesOrderCode != ''">sales_order_code,</if>
            <if test="productCode != null and productCode != ''">product_code,</if>
            <if test="lineCode != null and lineCode != ''">line_code,</if>
            <if test="planQty != null">plan_qty,</if>
            <if test="planStartTime != null">plan_start_time,</if>
            <if test="planEndTime != null">plan_end_time,</if>
@@ -149,7 +158,6 @@
            <if test="workOrderNo != null and workOrderNo != ''">#{workOrderNo},</if>
            <if test="salesOrderCode != null and salesOrderCode != ''">#{salesOrderCode},</if>
            <if test="productCode != null and productCode != ''">#{productCode},</if>
            <if test="lineCode != null and lineCode != ''">#{lineCode},</if>
            <if test="planQty != null">#{planQty},</if>
            <if test="planStartTime != null">#{planStartTime},</if>
            <if test="planEndTime != null">#{planEndTime},</if>
@@ -160,6 +168,7 @@
            <if test="updateBy != null">#{updateBy},</if>
            <if test="remarks != null">#{remarks},</if>
            <if test="delFlag != null">#{delFlag},</if>
            set del_flag = 0,
         </trim>
    </insert>

@@ -169,7 +178,6 @@
            <if test="workOrderNo != null and workOrderNo != ''">work_order_no = #{workOrderNo},</if>
            <if test="salesOrderCode != null and salesOrderCode != ''">sales_order_code = #{salesOrderCode},</if>
            <if test="productCode != null and productCode != ''">product_code = #{productCode},</if>
            <if test="lineCode != null and lineCode != ''">line_code = #{lineCode},</if>
            <if test="planQty != null">plan_qty = #{planQty},</if>
            <if test="planStartTime != null">plan_start_time = #{planStartTime},</if>
            <if test="planEndTime != null">plan_end_time = #{planEndTime},</if>

 billion-ui/src/views/main/om/info/index.vue

@@ -48,16 +48,6 @@
      <el-row :gutter="10" class="mb8" >
        <el-col :span="1.5">
          <el-button
            type="primary"
            plain
            icon="el-icon-plus"
            size="mini"
            @click="handleAdd"
            v-hasPermi="['main:info:add']"
          >新增</el-button>
        </el-col>
        <el-col :span="1.5">
          <el-button
            type="success"
            plain
            icon="el-icon-edit"
@@ -66,17 +56,6 @@
            @click="handleUpdate"
            v-hasPermi="['main:info:edit']"
          >修改</el-button>
        </el-col>
        <el-col :span="1.5">
          <el-button
            type="danger"
            plain
            icon="el-icon-delete"
            size="mini"
            :disabled="multiple"
            @click="handleDelete"
            v-hasPermi="['main:info:remove']"
          >删除</el-button>
        </el-col>
        <el-col :span="1.5">
          <el-button
@@ -90,62 +69,63 @@
        </el-col>
        <el-col :span="1.5">
          <el-button
            type="primary"
            type="success"
            plain
            icon="el-icon-receiving"
            icon="el-icon-edit"
            size="mini"
            @click="handleReceive"
          >接收工单</el-button>
        </el-col>
        <el-col :span="1.5">
          <el-button
            type="primary"
            plain
            :disabled="multiple"
            icon="el-icon-magic-stick"
            size="mini"
            @click="handleCreate"
          >生成</el-button>
            :disabled="single"
            @click=""
            v-hasPermi="['main:info:edit']"
          >缸体暂停\启动</el-button>
        </el-col>
        <!--      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
      </el-row>
    </div>


    <el-table v-loading="loading" :data="infoList" @selection-change="handleSelectionChange">
    <el-table border  v-loading="loading" :data="infoList" @selection-change="handleSelectionChange">
      <el-table-column type="selection" width="55" align="center" />
      <el-table-column label="工单编号" align="center" prop="workOrderNo" width="120">
        <template slot-scope="scope">
          <a style="color: #7099F9"  @click="orderDetail(scope.row.workOrderNo)" >{{scope.row.workOrderNo}}
          </a>
<!--          <div @click="orderDetail(scope.row.workOrderNo)">{{scope.row.workOrderNo}}</div>-->
        </template>
      </el-table-column>
      <el-table-column label="订单编号" align="center" prop="salesOrderCode" width="120"/>
      <el-table-column label="产品编号" align="center" prop="productCode" width="180"/>
      <el-table-column label="产线编号" align="center" prop="lineCode" />
      <el-table-column label="订单编号" align="center" prop="salesOrderCode" />
      <el-table-column label="产品编号" align="center" prop="productCode" />
      <el-table-column label="计划数量" align="center" prop="planQty" />
      <el-table-column label="计划开始时间" align="center" prop="planStartTime" width="120">
      <el-table-column label="计划开始时间" align="center" prop="planStartTime" >
        <template slot-scope="scope">
          <span>{{ parseTime(scope.row.planStartTime, '{y}-{m}-{d}') }}</span>
          <span>{{ parseTime(scope.row.planStartTime, '{y}-{m}-{d} {h}:{i}') }}</span>
        </template>
      </el-table-column>
      <el-table-column label="计划结束时间" align="center" prop="planEndTime" width="120">
      <el-table-column label="计划结束时间" align="center" prop="planEndTime" >
        <template slot-scope="scope">
          <span>{{ parseTime(scope.row.planEndTime, '{y}-{m}-{d}') }}</span>
          <span>{{ parseTime(scope.row.planEndTime, '{y}-{m}-{d} {h}:{i}') }}</span>
        </template>
      </el-table-column>
      <el-table-column label="工单状态" align="center" prop="orderStatus">
      <el-table-column label="更新时间" align="center" prop="updateTime" >
        <template slot-scope="scope">
          <dict-tag :options="dict.type.order_status" :value="scope.row.orderStatus"/>
          <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}') }}</span>
        </template>
      </el-table-column>
      <el-table-column label="更新时间" align="center" prop="updateTime" width="180">
      <el-table-column label="缸体上线数量" align="center" prop="bodyQty" />
      <el-table-column label="缸盖上线数量" align="center" prop="head_qty" />
      <el-table-column label="预装上线数量" align="center" prop="pre_qty" />
      <el-table-column label="缸体工单状态" align="center" prop="bodyStatus" >
        <template slot-scope="scope">
          <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
          <dict-tag :options="dict.type.status" :value="scope.row.bodyStatus"/>
        </template>
      </el-table-column>
      <el-table-column label="更新用户" align="center" prop="updateBy" />
      <el-table-column label="缸盖工单状态" align="center" prop="headStatus" >
        <template slot-scope="scope">
          <dict-tag :options="dict.type.status" :value="scope.row.headStatus"/>
        </template>
      </el-table-column>
      <el-table-column label="预装工单状态" align="center" prop="preStatus" >
        <template slot-scope="scope">
          <dict-tag :options="dict.type.status" :value="scope.row.preStatus"/>
        </template>
      </el-table-column>
      <el-table-column label="备注" width="180px" show-overflow-tooltip align="center" prop="remarks" />
    </el-table>

@@ -160,45 +140,54 @@
    <!-- 添加或修改生产工单对话框 -->
    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
        <el-form-item label="工单编号" prop="workOrderNo">
          <el-input v-model="form.workOrderNo" placeholder="请输入工单编号" />
        <el-form-item  label="工单编号" prop="workOrderNo">
          <el-input  disabled v-model="form.workOrderNo" placeholder="请输入工单编号" />
        </el-form-item>
        <el-form-item label="订单编号" prop="salesOrderCode">
          <el-input v-model="form.salesOrderCode" placeholder="请输入订单编号" />
        <el-form-item  label="订单编号" prop="salesOrderCode">
          <el-input disabled v-model="form.salesOrderCode" placeholder="请输入订单编号" />
        </el-form-item>
        <el-form-item label="产品编号" prop="productCode">
          <el-input v-model="form.productCode" placeholder="请输入产品编号" />
        <el-form-item  label="产品编号" prop="productCode">
          <el-input disabled v-model="form.productCode" placeholder="请输入产品编号" />
        </el-form-item>
        <el-form-item label="产线编号" prop="lineCode">
          <el-input v-model="form.lineCode" placeholder="请输入产线编号" />
        </el-form-item>
        <el-form-item label="计划数量" prop="planQty">
          <el-input v-model="form.planQty" placeholder="请输入计划数量" />
        <el-form-item  label="计划数量" prop="planQty">
          <el-input disabled v-model="form.planQty" placeholder="请输入计划数量" />
        </el-form-item>
        <el-form-item label="计划开始时间" prop="planStartTime">
          <el-date-picker clearable
            v-model="form.planStartTime"
            type="date"
            value-format="yyyy-MM-dd"
            type="datetime"
            value-format="yyyy-MM-dd HH:mm:ss"
            placeholder="请选择计划开始时间">
          </el-date-picker>
        </el-form-item>
        <el-form-item label="计划结束时间" prop="planEndTime">
          <el-date-picker clearable
            v-model="form.planEndTime"
            type="date"
            value-format="yyyy-MM-dd"
            type="datetime"
            value-format="yyyy-MM-dd HH:mm:ss"
            placeholder="请选择计划结束时间">
          </el-date-picker>
        </el-form-item>
        <el-form-item label="工单状态" prop="orderStatus" v-if = updateFlag>
          <el-radio-group v-model="form.orderStatus">
        <el-form-item  label="缸体数量" prop="bodyQty">
          <el-input disabled v-model="form.bodyQty" placeholder="请输入计划数量" />
        </el-form-item>
        <el-form-item label="缸体工单状态" prop="bodyStatus" v-if = updateFlag>
          <el-radio-group v-model="form.bodyStatus">
            <el-radio
              v-for="dict in dict.type.order_status"
              v-for="dict in dict.type.status"
              :key="dict.value"
              :label="dict.value"
            >{{dict.label}}</el-radio>
          </el-radio-group>
        </el-form-item>



        <el-form-item  label="缸套数量" prop="headStatus">
          <el-input disabled v-model="form.headStatus" placeholder="请输入计划数量" />
        </el-form-item>
        <el-form-item  label="预装数量" prop="preStatus">
          <el-input disabled v-model="form.preStatus" placeholder="请输入计划数量" />
        </el-form-item>
        <el-form-item label="备注" prop="remarks">
          <el-input
@@ -329,9 +318,6 @@
        ],
        productCode: [
          { required: true, message: "产品编号不能为空", trigger: "blur" }
        ],
        lineCode: [
          { required: true, message: "产线编号不能为空", trigger: "blur" }
        ],
        planQty: [
          { required: true, message: "计划数量不能为空", trigger: "blur" }