Merge remote-tracking branch 'origin/master'

admin

2024-11-22 17638d2eba38eb0d9d98e899374b5db5d474b819

Merge remote-tracking branch 'origin/master'

 billion-main/src/main/java/com/billion/main/om/domain/OmOrderScheduling.java

@@ -44,11 +44,11 @@
    private Date offlineTime;

    /** 质量状态(1合格，2不合格) */
    @Excel(name = "质量状态(1合格，2不合格)")
    @Excel(name = "质量状态(1合格，2不合格)", readConverterExp = "1=合格,2=不合格")
    private String qualityStatus;

    /** 状态(1未开始，2执行中，3已完成) */
    @Excel(name = "状态(1未开始，2执行中，3已完成)")
    @Excel(name = "状态(1未开始，2执行中，3已完成)", readConverterExp = "1=未开始,2=执行中,3=已完成")
    private String status;

    /** 备注 */

 billion-main/src/main/java/com/billion/main/om/domain/OmProductionOrderInfo.java

@@ -47,7 +47,7 @@
    private Date planEndTime;

    /** 工单状态（1未开始2生产中3已完成4已关闭） */
    @Excel(name = "工单状态", readConverterExp = "1=未开始2生产中3已完成4已关闭")
    @Excel(name = "工单状态", readConverterExp = "1=未开始,2=生产中,3=已完成,4=已关闭")
    private String orderStatus;

    /** 备注 */

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

@@ -114,15 +114,15 @@

    <el-table 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">
      <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" />
      <el-table-column label="产品编号" align="center" prop="productCode" />
      <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="planQty" />
      <el-table-column label="计划开始时间" align="center" prop="planStartTime" width="120">
@@ -398,7 +398,7 @@
      this.loading = true;
      listInfo(this.queryParams).then(response => {
        this.infoList = response.rows;
        this.detailTotal = response.total;
        this.total = response.total;
        this.loading = false;
      });
    },
@@ -504,3 +504,8 @@
  }
};
</script>
<style>
.table-wrapper {
  width: 100%;
}
</style>

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

@@ -112,9 +112,9 @@

    <el-table v-loading="loading" :data="schedulingList" @selection-change="handleSelectionChange">
      <el-table-column type="selection" width="55" align="center" />
      <el-table-column label="工单编号" align="center" prop="workOrderNo" />
      <el-table-column label="工单编号" align="center" prop="workOrderNo" width="120"/>
      <el-table-column label="总成序列号" width="180px" align="center" prop="sfcCode" />
      <el-table-column label="产品编码" align="center" prop="productCode" />
      <el-table-column label="产品编码" align="center" prop="productCode" width="120"/>
      <el-table-column label="上线时间" align="center" prop="onlineTime" width="180">
        <template slot-scope="scope">
          <span>{{ parseTime(scope.row.onlineTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>