春风项目四线(合箱线、总装线)
wujian
2024-08-31 2d1514355622d37e6da0b0058a247c8517fba97b
fix9-bug
已修改10个文件
228 ■■■■ 文件已修改
jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/domain/OmProductionOrdeInfo.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jcdm-main/src/main/resources/mapper/bs/orderScheduling/BsOrderSchedulingMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
jcdm-ui/src/views/main/da/paramCollection/index.vue 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jcdm-ui/src/views/main/om/productionOrde/index.vue 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jcdm-ui/src/views/main/pr/cameraReport/index.vue 36 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jcdm-ui/src/views/main/pr/detectionReport/index.vue 36 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jcdm-ui/src/views/main/pr/productResultReport/index.vue 36 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jcdm-ui/src/views/main/pr/refuelDataReport/index.vue 36 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jcdm-ui/src/views/main/pr/tightenReport/index.vue 36 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java
@@ -58,6 +58,15 @@
    public TableDataInfo list(OmProductionOrdeInfo omProductionOrdeInfo)
    {
        startPage();
        if (StrUtil.isNotBlank(omProductionOrdeInfo.getEngineNo())){
            BsOrderScheduling bsOrderScheduling = bsOrderSchedulingService.selectBsOrderSchedulingSNCode(omProductionOrdeInfo.getEngineNo());
            if (ObjectUtil.isNotEmpty(bsOrderScheduling)){
                String orderNo = bsOrderScheduling.getOrderNo();
                if (StrUtil.isNotBlank(orderNo)){
                    omProductionOrdeInfo.setWorkOrderNo(orderNo);
                }
            }
        }
        List<OmProductionOrdeInfo> list = omProductionOrdeInfoService.selectOmProductionOrdeInfoList(omProductionOrdeInfo);
        return getDataTable(list);
    }
jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/domain/OmProductionOrdeInfo.java
@@ -191,6 +191,9 @@
    private String endTime;
    @TableField(exist = false)
    private String engineNo;
    public String[] getDateConditions() {
        return dateConditions;
    }
jcdm-main/src/main/resources/mapper/bs/orderScheduling/BsOrderSchedulingMapper.xml
@@ -89,7 +89,7 @@
            <if test="engineNoListExcel != null and engineNoListExcel.size() > 0">
                and engine_no in
                <foreach collection="engineNoListExcel" open="(" close=")" separator="," item="engine">
                    #{engine} order by order_no,engine_no
                    #{engine}
                </foreach>
            </if>
        </where>
jcdm-ui/src/views/main/da/paramCollection/index.vue
@@ -261,11 +261,19 @@
    /** 查询设备产品过程参数采集列表 */
    getList() {
      this.loading = true;
      listParamCollection(this.queryParams).then(response => {
        this.paramCollectionList = response.rows;
        this.total = response.total;
        this.loading = false;
      });
      if (this.queryParams.sfcCode == null || this.queryParams.sfcCode == ''){
        this.$message({
          message: '请输入发动机号码',
          type: 'info'
        });
      } else {
        listParamCollection(this.queryParams).then(response => {
          this.paramCollectionList = response.rows;
          this.total = response.total;
          this.loading = false;
        });
      }
    },
    // 取消按钮
    cancel() {
jcdm-ui/src/views/main/om/productionOrde/index.vue
@@ -43,17 +43,8 @@
      <el-form-item label="机型" prop="typeZ">
        <el-input v-model="queryParams.typeZ" placeholder="请输入机型" clearable @keyup.enter.native="handleQuery"/>
      </el-form-item>
      <el-form-item label-width="130" label="通知单生成日期" prop="dateConditions">
        <el-date-picker
          v-model="queryParams.dateConditions"
          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 label-width="130" label="发动机号" prop="engineNo">
        <el-input v-model="queryParams.engineNo" placeholder="请输入发动机号" clearable @keyup.enter.native="handleQuery"/>
      </el-form-item>
    </el-form>
    </el-card>
@@ -405,6 +396,7 @@
        frontEndId: null,
        idNums: null,
        typeZ: null,
        engineNo: null,
        flag: null,
        adds:null,
        productionNotice: null,
@@ -675,6 +667,8 @@
    /** 重置按钮操作 */
    resetQuery() {
      this.resetForm("queryForm");
      this.queryParams.typeZ = ''
      this.queryParams.engineNo = ''
      this.handleQuery();
    },
    /** 多选框选中数据 */
jcdm-ui/src/views/main/pr/cameraReport/index.vue
@@ -8,24 +8,24 @@
                    placeholder="请输入箱体编码"
                    @keyup.enter.native="handleQuery"/>
        </el-form-item>
        <el-form-item label-width="120" label="工位号:" prop="locationCode">
          <el-input clearable
                    v-model="queryParams.locationCode"
                    placeholder="请输入工位号"
                    @keyup.enter.native="handleQuery"/>
        </el-form-item>
        <el-form-item label-width="130" label="保存日期" prop="dateConditions">
          <el-date-picker
            v-model="queryParams.dateConditions"
            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-item label-width="120" label="工位号:" prop="locationCode">-->
<!--          <el-input clearable-->
<!--                    v-model="queryParams.locationCode"-->
<!--                    placeholder="请输入工位号"-->
<!--                    @keyup.enter.native="handleQuery"/>-->
<!--        </el-form-item>-->
<!--        <el-form-item label-width="130" label="保存日期" prop="dateConditions">-->
<!--          <el-date-picker-->
<!--            v-model="queryParams.dateConditions"-->
<!--            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-item style="float: right">
          <el-button type="primary" icon="el-icon-refresh" @click="handleQuery">查询</el-button>
          <el-button type=""    icon="el-icon-refresh"  @click="resetQuery">重置</el-button>
jcdm-ui/src/views/main/pr/detectionReport/index.vue
@@ -8,24 +8,24 @@
                    placeholder="请输入箱体编码"
                    @keyup.enter.native="handleQuery"/>
        </el-form-item>
        <el-form-item label-width="120" label="工位号:" prop="locationCode">
          <el-input clearable
                    v-model="queryParams.locationCode"
                    placeholder="请输入工位号"
                    @keyup.enter.native="handleQuery"/>
        </el-form-item>
        <el-form-item label-width="130" label="保存日期" prop="dateConditions">
          <el-date-picker
            v-model="queryParams.dateConditions"
            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-item label-width="120" label="工位号:" prop="locationCode">-->
<!--          <el-input clearable-->
<!--                    v-model="queryParams.locationCode"-->
<!--                    placeholder="请输入工位号"-->
<!--                    @keyup.enter.native="handleQuery"/>-->
<!--        </el-form-item>-->
<!--        <el-form-item label-width="130" label="保存日期" prop="dateConditions">-->
<!--          <el-date-picker-->
<!--            v-model="queryParams.dateConditions"-->
<!--            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-item style="float: right">
          <el-button type="primary" icon="el-icon-refresh" @click="handleQuery">查询</el-button>
          <el-button type=""    icon="el-icon-refresh"  @click="resetQuery">重置</el-button>
jcdm-ui/src/views/main/pr/productResultReport/index.vue
@@ -8,24 +8,24 @@
                    placeholder="请输入箱体编码"
                    @keyup.enter.native="handleQuery"/>
        </el-form-item>
        <el-form-item label-width="120" label="工位号:" prop="locationCode">
          <el-input clearable
                    v-model="queryParams.locationCode"
                    placeholder="请输入工位号"
                    @keyup.enter.native="handleQuery"/>
        </el-form-item>
        <el-form-item label-width="130" label="保存日期" prop="dateConditions">
          <el-date-picker
            v-model="queryParams.dateConditions"
            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-item label-width="120" label="工位号:" prop="locationCode">-->
<!--          <el-input clearable-->
<!--                    v-model="queryParams.locationCode"-->
<!--                    placeholder="请输入工位号"-->
<!--                    @keyup.enter.native="handleQuery"/>-->
<!--        </el-form-item>-->
<!--        <el-form-item label-width="130" label="保存日期" prop="dateConditions">-->
<!--          <el-date-picker-->
<!--            v-model="queryParams.dateConditions"-->
<!--            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-item style="float: right">
          <el-button type="primary" icon="el-icon-refresh" @click="handleQuery">查询</el-button>
          <el-button type=""    icon="el-icon-refresh"  @click="resetQuery">重置</el-button>
jcdm-ui/src/views/main/pr/refuelDataReport/index.vue
@@ -8,24 +8,24 @@
                    placeholder="请输入箱体编码"
                    @keyup.enter.native="handleQuery"/>
        </el-form-item>
        <el-form-item label-width="120" label="工位号:" prop="locationCode">
          <el-input clearable
                    v-model="queryParams.locationCode"
                    placeholder="请输入工位号"
                    @keyup.enter.native="handleQuery"/>
        </el-form-item>
        <el-form-item label-width="130" label="保存日期" prop="dateConditions">
          <el-date-picker
            v-model="queryParams.dateConditions"
            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-item label-width="120" label="工位号:" prop="locationCode">-->
<!--          <el-input clearable-->
<!--                    v-model="queryParams.locationCode"-->
<!--                    placeholder="请输入工位号"-->
<!--                    @keyup.enter.native="handleQuery"/>-->
<!--        </el-form-item>-->
<!--        <el-form-item label-width="130" label="保存日期" prop="dateConditions">-->
<!--          <el-date-picker-->
<!--            v-model="queryParams.dateConditions"-->
<!--            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-item style="float: right">
          <el-button type="primary" icon="el-icon-refresh" @click="handleQuery">查询</el-button>
          <el-button type=""    icon="el-icon-refresh"  @click="resetQuery">重置</el-button>
jcdm-ui/src/views/main/pr/tightenReport/index.vue
@@ -8,24 +8,24 @@
            placeholder="请输入箱体编码"
            @keyup.enter.native="handleQuery"/>
        </el-form-item>
        <el-form-item label-width="120" label="工位号:" prop="locationCode">
          <el-input clearable
            v-model="queryParams.locationCode"
            placeholder="请输入工位号"
            @keyup.enter.native="handleQuery"/>
        </el-form-item>
        <el-form-item label-width="130" label="保存日期" prop="dateConditions">
          <el-date-picker
            v-model="queryParams.dateConditions"
            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-item label-width="120" label="工位号:" prop="locationCode">-->
<!--          <el-input clearable-->
<!--            v-model="queryParams.locationCode"-->
<!--            placeholder="请输入工位号"-->
<!--            @keyup.enter.native="handleQuery"/>-->
<!--        </el-form-item>-->
<!--        <el-form-item label-width="130" label="保存日期" prop="dateConditions">-->
<!--          <el-date-picker-->
<!--            v-model="queryParams.dateConditions"-->
<!--            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-item style="float: right">
          <el-button type="primary" icon="el-icon-refresh" @click="handleQuery">查询</el-button>
          <el-button type=""    icon="el-icon-refresh"  @click="resetQuery">重置</el-button>