春风项目四线(合箱线、总装线)
懒羊羊
2024-01-17 5f7e70b8132d018614e8f4989d0614bd50cb7ecb
工单优化
已修改5个文件
45 ■■■■ 文件已修改
jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jcdm-ui/src/router/index.js 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jcdm-ui/src/views/main/bs/orderScheduling/index.vue 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
jcdm-ui/src/views/main/om/productionOrde/index.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jcdm-ui/src/views/main/om/productionOrde/planStatistics.vue 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java
@@ -185,7 +185,15 @@
    @GetMapping("/getProductionNotice")
    public AjaxResult getProductionNotice(OmProductionOrdeInfo omProductionOrdeInfo)
    {
        ReceivingServices.insertWebserviceData(omProductionOrdeInfo.getProductionNotice());
        return AjaxResult.success();
        String productionNotice = omProductionOrdeInfo.getProductionNotice();
        List<OmProductionOrdeInfo> omProductionOrdeInfos = omProductionOrdeInfoService.selectOmProductionOrdeInfoList(omProductionOrdeInfo);
        if(omProductionOrdeInfos.size() == 0){
            try {
                ReceivingServices.insertWebserviceData(productionNotice);
            } catch (Exception e) {
                return error("接收失败!请检查通知单号");
            }
        }
        return warn("该订单已接收完毕,不能重复接收!");
    }
}
jcdm-ui/src/router/index.js
@@ -218,6 +218,20 @@
      }
    ]
  },
  {
    path: '/main/orderScheduling-data',
    component: Layout,
    hidden: true,
    permissions: ['bs:workReport:list'],
    children: [
      {
        path: 'index',
        component: () => import('@/views/main/bs/orderScheduling/index'),
        name: 'Data',
        meta: { title: '报工记录表', activeMenu: '/main/bs/orderScheduling' }
      }
    ]
  },
]
// 防止连续点击多次路由报错
jcdm-ui/src/views/main/bs/orderScheduling/index.vue
@@ -191,7 +191,7 @@
        <el-table border v-loading="loading" :data="orderSchedulingList" @selection-change="handleSelectionChange">
          <el-table-column type="selection" width="55" align="center" />
          <el-table-column label="订单编号" align="center" prop="orderNo" width="130">
          <el-table-column label="生产订单" align="center" prop="orderNo" width="130">
          </el-table-column>
          <el-table-column label="发动机号" align="center" prop="engineNo" width="150">
@@ -462,6 +462,8 @@
    };
  },
  created() {
    let workOrderNo = this.$route.query.workOrderNo;
    this.queryParams.orderNo = workOrderNo
    this.getList();
  },
  methods: {
jcdm-ui/src/views/main/om/productionOrde/index.vue
@@ -145,7 +145,7 @@
        </el-table-column>
        <el-table-column label="生产订单" width="160" align="center">
          <template slot-scope="scope">
            <router-link :to="{path: '/main/workReport-data/index/', query: {workOrderNo: scope.row.workOrderNo} }" class="link-type">
            <router-link :to="{path: '/main/orderScheduling-data/index/', query: {workOrderNo: scope.row.workOrderNo} }" class="link-type">
              <span>{{ scope.row.workOrderNo }}</span>
            </router-link>
          </template>
@@ -551,7 +551,11 @@
    getProductionNotice(){
      getProductionNotice(this.queryParams).then(response => {
        this.$modal.msgSuccess("接收成功");
        console.log(response)
        console.log(response.data)
        console.log(response.data.msg)
        this.$modal.msgSuccess(response.data.msg);
        this.queryParams = {}
        this.getList();
      });
jcdm-ui/src/views/main/om/productionOrde/planStatistics.vue
@@ -61,12 +61,7 @@
        <el-table-column type="selection" width="55" align="center" />
        <el-table-column label="生产通知单号" width="160" align="center" prop="productionNotice">
        </el-table-column>
        <el-table-column label="生产订单" width="160" align="center">
          <template slot-scope="scope">
            <router-link :to="{path: '/main/workReport-data/index/', query: {workOrderNo: scope.row.workOrderNo} }" class="link-type">
              <span>{{ scope.row.workOrderNo }}</span>
            </router-link>
          </template>
        <el-table-column label="生产订单" width="160" align="center" prop="workOrderNo">
        </el-table-column>
        <el-table-column label="机型" width="160" align="center" prop="typeZ">
        </el-table-column>