工单优化

懒羊羊

2024-01-17 1391b345457a70d9449bb51e797c54039a3b0a53

工单优化

 jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/domain/BsOrderScheduling.java

@@ -110,7 +110,19 @@
    @Excel(name = "备注")
    private String remarks;

    public void setId(Long id) 
    /** CVT报工 */
    @Excel(name = "CVT报工")
    private String report30;

    public String getReport30() {
        return report30;
    }

    public void setReport30(String report30) {
        this.report30 = report30;
    }

    public void setId(Long id)
    {
        this.id = id;
    }

 jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/service/impl/BsOrderSchedulingServiceImpl.java

@@ -1,6 +1,8 @@
package com.jcdm.main.bs.orderScheduling.service.impl;

import java.util.List;

import cn.hutool.core.util.StrUtil;
import com.jcdm.common.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -41,6 +43,11 @@
    @Override
    public List<BsOrderScheduling> selectBsOrderSchedulingList(BsOrderScheduling bsOrderScheduling)
    {

//        if(StrUtil.isNotBlank(bsOrderScheduling.getOperateTime())){
////            String[] dateArray = gson.fromJson(jsonString, String[].class);
//
//        }
        return bsOrderSchedulingMapper.selectBsOrderSchedulingList(bsOrderScheduling);
    }


 jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java

@@ -180,8 +180,9 @@
    }

    /**
     * table列上移下移
     * 接收工单
     */
    @PreAuthorize("@ss.hasPermi('om:productionOrde:receive')")
    @GetMapping("/getProductionNotice")
    public AjaxResult getProductionNotice(OmProductionOrdeInfo omProductionOrdeInfo)
    {

 jcdm-main/src/main/resources/mapper/bs/orderScheduling/BsOrderSchedulingMapper.xml

@@ -31,10 +31,12 @@
        <result property="updateUser"    column="update_user"    />
        <result property="updateTime"    column="update_time"    />
        <result property="remarks"    column="remarks"    />
        <result property="report30"    column="report_30"    />

    </resultMap>

    <sql id="selectBsOrderSchedulingVo">
        select id, order_no, engine_no, product_type, model, production_status, working_hours, current_workstation, quality_status, whether_or_print, report_10, report_20, combined_box_time, final_assembly_time, operator, operate_time, status, spare_field_1, spare_field_2, spare_field_3, spare_field_4, create_user, create_time, update_user, update_time, remarks from bs_order_scheduling
        select id, order_no, engine_no, product_type, model, production_status, working_hours, current_workstation, quality_status, whether_or_print, report_10, report_20, combined_box_time, final_assembly_time, operator, operate_time, status, spare_field_1, spare_field_2, spare_field_3, spare_field_4, create_user, create_time, update_user, update_time, remarks, report_30 from bs_order_scheduling
    </sql>

    <select id="selectBsOrderSchedulingList" parameterType="BsOrderScheduling" resultMap="BsOrderSchedulingResult">
@@ -63,6 +65,8 @@
            <if test="createUser != null  and createUser != ''"> and create_user = #{createUser}</if>
            <if test="updateUser != null  and updateUser != ''"> and update_user = #{updateUser}</if>
            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
            <if test="report30 != null  and report30 != ''"> and report_30 = #{report30}</if>

        </where>
    </select>
    
@@ -99,6 +103,7 @@
            <if test="updateUser != null">update_user,</if>
            <if test="updateTime != null">update_time,</if>
            <if test="remarks != null">remarks,</if>
            <if test="report30 != null">report_30,</if>
         </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="orderNo != null">#{orderNo},</if>
@@ -126,7 +131,9 @@
            <if test="updateUser != null">#{updateUser},</if>
            <if test="updateTime != null">#{updateTime},</if>
            <if test="remarks != null">#{remarks},</if>
         </trim>
            <if test="report30 != null">#{report30},</if>

        </trim>
    </insert>

    <update id="updateBsOrderScheduling" parameterType="BsOrderScheduling">
@@ -157,6 +164,8 @@
            <if test="updateUser != null">update_user = #{updateUser},</if>
            <if test="updateTime != null">update_time = #{updateTime},</if>
            <if test="remarks != null">remarks = #{remarks},</if>
            <if test="report30 != null">report_30 = #{report30},</if>

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

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

@@ -10,15 +10,6 @@
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
          <el-form-item label="发动机号" prop="engineNo">
            <el-input
              v-model="queryParams.engineNo"
              placeholder="请输入发动机号"
              clearable
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>

          <el-form-item label="机型" prop="model">
            <el-input
              v-model="queryParams.model"
@@ -27,119 +18,85 @@
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>

          <el-form-item label="工时" prop="workingHours">
            <el-input
              v-model="queryParams.workingHours"
              placeholder="请输入工时"
              clearable
              @keyup.enter.native="handleQuery"
            />
          <el-form-item label="生产状态" prop="productionStatus">
            <el-select v-model="queryParams.productionStatus" placeholder="请选择工单状态" clearable>
              <el-option
                v-for="dict in dict.type.order_scheduling_produce_status"
                :key="dict.value"
                :label="dict.label"
                :value="dict.value"/>
            </el-select>
          </el-form-item>
          <el-form-item label="当前工位" prop="currentWorkstation">
            <el-input
              v-model="queryParams.currentWorkstation"
              placeholder="请输入当前工位"
              clearable
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>

          <el-form-item label="是否打印" prop="whetherOrPrint">
            <el-input
              v-model="queryParams.whetherOrPrint"
              placeholder="请输入是否打印"
              clearable
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
          <el-form-item label="10报工" prop="report10">
            <el-input
              v-model="queryParams.report10"
              placeholder="请输入10报工"
              clearable
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
          <el-form-item label="20报工" prop="report20">
            <el-input
              v-model="queryParams.report20"
              placeholder="请输入20报工"
              clearable
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
          <el-form-item label="操作人" prop="operator">
            <el-input
              v-model="queryParams.operator"
              placeholder="请输入操作人"
              clearable
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>

<!--          <el-form-item label="预留字段1" prop="spareField1">-->
<!--            <el-input-->
<!--              v-model="queryParams.spareField1"-->
<!--              placeholder="请输入预留字段1"-->
<!--              clearable-->
<!--              @keyup.enter.native="handleQuery"-->
<!--            />-->
<!--          </el-form-item>-->
<!--          <el-form-item label="预留字段2" prop="spareField2">-->
<!--            <el-input-->
<!--              v-model="queryParams.spareField2"-->
<!--              placeholder="请输入预留字段2"-->
<!--              clearable-->
<!--              @keyup.enter.native="handleQuery"-->
<!--            />-->
<!--          </el-form-item>-->
<!--          <el-form-item label="预留字段3" prop="spareField3">-->
<!--            <el-input-->
<!--              v-model="queryParams.spareField3"-->
<!--              placeholder="请输入预留字段3"-->
<!--              clearable-->
<!--              @keyup.enter.native="handleQuery"-->
<!--            />-->
<!--          </el-form-item>-->
<!--          <el-form-item label="预留字段4" prop="spareField4">-->
<!--            <el-input-->
<!--              v-model="queryParams.spareField4"-->
<!--              placeholder="请输入预留字段4"-->
<!--              clearable-->
<!--              @keyup.enter.native="handleQuery"-->
<!--            />-->
<!--          </el-form-item>-->
<!--          <el-form-item label="创建用户" prop="createUser">-->
<!--            <el-input-->
<!--              v-model="queryParams.createUser"-->
<!--              placeholder="请输入创建用户"-->
<!--              clearable-->
<!--              @keyup.enter.native="handleQuery"-->
<!--            />-->
<!--          </el-form-item>-->
<!--          <el-form-item label="更改用户" prop="updateUser">-->
<!--            <el-input-->
<!--              v-model="queryParams.updateUser"-->
<!--              placeholder="请输入更改用户"-->
<!--              clearable-->
<!--              @keyup.enter.native="handleQuery"-->
<!--            />-->
<!--          </el-form-item>-->
<!--          <el-form-item label="备注" prop="remarks">-->
<!--            <el-input-->
<!--              v-model="queryParams.remarks"-->
<!--              placeholder="请输入备注"-->
<!--              clearable-->
<!--              @keyup.enter.native="handleQuery"-->
<!--            />-->
<!--          </el-form-item>-->
          <el-form-item style="float: right">
            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
            <el-button type="warning" icon="el-icon-copy-document" size="mini" @click="advancedQuery">高级查询</el-button>
            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
          </el-form-item>
        </el-form>
      <el-form :model="queryParams" ref="queryParams" size="small" :inline="true" v-show="advancedShowSearch" label-width="68px">
        <el-form-item label="发动机号" prop="engineNo">
          <el-input
            v-model="queryParams.engineNo"
            placeholder="请输入发动机号"
            clearable
            @keyup.enter.native="handleQuery"
          />
        </el-form-item>
        <el-form-item label="质量状态" prop="qualityStatus">
          <el-select v-model="queryParams.qualityStatus" placeholder="请选择质量状态" clearable>
            <el-option
              v-for="dict in dict.type.quality_status"
              :key="dict.value"
              :label="dict.label"
              :value="dict.value"/>
          </el-select>
        </el-form-item>
        <el-form-item label="是否打印" prop="whetherOrPrint">
          <el-select v-model="queryParams.whetherOrPrint" placeholder="请选择是否打印" clearable>
            <el-option
              v-for="dict in dict.type.print_status"
              :key="dict.value"
              :label="dict.label"
              :value="dict.value"/>
          </el-select>
        </el-form-item>
        <el-form-item label="合箱报工" prop="report10">
          <el-input
            v-model="queryParams.report10"
            placeholder="请输入合箱报工"
            clearable
            @keyup.enter.native="handleQuery"
          />
        </el-form-item>
        <el-form-item label="总装报工" prop="report20">
          <el-input
            v-model="queryParams.report20"
            placeholder="请输入总装报工"
            clearable
            @keyup.enter.native="handleQuery"
          />
        </el-form-item>
        <el-form-item label="CVT报工" prop="report30">
          <el-input
            v-model="queryParams.report30"
            placeholder="请输入CVT报工"
            clearable
            @keyup.enter.native="handleQuery"
          />
        </el-form-item>
        <el-form-item label="操作时间" prop="operateTime">
          <el-date-picker
            v-model="queryParams.operateTime"
            type="datetimerange"
            :picker-options="pickerOptions"
            value-format="yyyy-MM-dd HH:mm:ss"
            range-separator="至"
            start-placeholder="开始日期"
            end-placeholder="结束日期"
            align="right">
          </el-date-picker>
        </el-form-item>
      </el-form>
    </el-card>

    <el-card style="margin-top: 10px" class="box-card">
@@ -215,15 +172,22 @@

          </el-table-column>
          <el-table-column label="质量状态" align="center" prop="qualityStatus">

            <template slot-scope="scope">
              <dict-tag :options="dict.type.quality_status" :value="scope.row.qualityStatus"/>
            </template>
          </el-table-column>
          <el-table-column label="是否打印" align="center" prop="whetherOrPrint">
            <template slot-scope="scope">
              <dict-tag :options="dict.type.print_status" :value="scope.row.whetherOrPrint"/>
            </template>
          </el-table-column>
          <el-table-column label="合箱报工" align="center" prop="report10">

          </el-table-column>
          <el-table-column label="10报工" align="center" prop="report10">
          <el-table-column label="总装报工" align="center" prop="report20">

          </el-table-column>
          <el-table-column label="20报工" align="center" prop="report20">
          <el-table-column label="CVT报工" align="center" prop="report30">

          </el-table-column>
          <el-table-column label="合箱上线" align="center" prop="combinedBoxTime">
@@ -348,11 +312,14 @@
        <el-form-item label="是否打印" prop="whetherOrPrint">
          <el-input v-model="form.whetherOrPrint" placeholder="请输入是否打印" />
        </el-form-item>
        <el-form-item label="10报工" prop="report10">
          <el-input v-model="form.report10" placeholder="请输入10报工" />
        <el-form-item label="合箱报工" prop="report10">
          <el-input v-model="form.report10" placeholder="请输入合箱报工" />
        </el-form-item>
        <el-form-item label="20报工" prop="report20">
          <el-input v-model="form.report20" placeholder="请输入20报工" />
        <el-form-item label="总装报工" prop="report20">
          <el-input v-model="form.report20" placeholder="请输入总装报工" />
        </el-form-item>
        <el-form-item label="30报工" prop="report20">
          <el-input v-model="form.report30" placeholder="请输入30报工" />
        </el-form-item>
        <el-form-item label="操作人" prop="operator">
          <el-input v-model="form.operator" placeholder="请输入操作人" />
@@ -401,7 +368,7 @@

export default {
  name: "OrderScheduling",
  dicts: ['order_scheduling_produce_status'],
  dicts: ['order_scheduling_produce_status','quality_status','print_status'],
  data() {
    return {
      // 遮罩层
@@ -413,6 +380,7 @@
      single: true,
      // 非多个禁用
      multiple: true,
      advancedShowSearch: false,
      // 显示搜索条件
      showSearch: true,
      // 总条数
@@ -441,7 +409,7 @@
        combinedBoxTime: null,
        finalAssemblyTime: null,
        operator: null,
        operateTime: null,
        operateTime: '',
        status: null,
        spareField1: null,
        spareField2: null,
@@ -458,7 +426,36 @@
        id: [
          { required: true, message: "ID不能为空", trigger: "blur" }
        ],
      }
      },
      pickerOptions: {
        shortcuts: [{
          text: '最近一周',
          onClick(picker) {
            const end = new Date();
            const start = new Date();
            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
            picker.$emit('pick', [start, end]);
          }
        }, {
          text: '最近一个月',
          onClick(picker) {
            const end = new Date();
            const start = new Date();
            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
            picker.$emit('pick', [start, end]);
          }
        }, {
          text: '最近三个月',
          onClick(picker) {
            const end = new Date();
            const start = new Date();
            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
            picker.$emit('pick', [start, end]);
          }
        }]
      },
      value1: [new Date(2000, 10, 10, 10, 10), new Date(2000, 10, 11, 10, 10)],
      value2: ''
    };
  },
  created() {
@@ -467,6 +464,9 @@
    this.getList();
  },
  methods: {
    advancedQuery(){
      this.advancedShowSearch = (this.advancedShowSearch) ? this.advancedShowSearch = false : this.advancedShowSearch = true;
    },
    /** 查询订单排产列表 */
    getList() {
      this.loading = true;
@@ -509,14 +509,16 @@
        createTime: null,
        updateUser: null,
        updateTime: null,
        remarks: null
        remarks: null,
        report30: null
      };
      this.resetForm("form");
    },
    /** 搜索按钮操作 */
    handleQuery() {
      this.queryParams.pageNum = 1;
      this.getList();
      // this.queryParams.pageNum = 1;
      // this.getList();
      this.$modal.msgSuccess(this.queryParams.operateTime);
    },
    /** 重置按钮操作 */
    resetQuery() {

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

@@ -122,13 +122,14 @@
          icon="el-icon-download"
          size="mini"
          @click="getProductionNotice"
          v-hasPermi="['om:productionOrde:receive']"
        >接收</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button
          type="primary"
          plain
          icon="el-icon-createUpdate"
          icon="el-icon-edit"
          size="mini"
          :disabled="single"
          @click="CreatehandleUpdate"
@@ -551,10 +552,6 @@

    getProductionNotice(){
      getProductionNotice(this.queryParams).then(response => {
        console.log(response)
        console.log(response.data)

        console.log(response.data.msg)
        this.$modal.msgSuccess(response.data.msg);
        this.queryParams = {}
        this.getList();