生产订单相关 2022年12月1日 sxm

src/api/shopOrder/shopOrder.js

@@ -92,5 +92,8 @@ export const updateShopOrderToolData = data => createAPI('/shopOrder/updateShopO
 // 查询工单的工具信息
 export const deleteShopOrderToolData = data => createAPI('/shopOrder/deleteShopOrderToolData', 'post', data)
 
+// 更改生产工单工艺路线
+export const shopOrderUpdateRoutingViaRev = data => createAPI('/shopOrder/shopOrderUpdateRoutingViaRev', 'post', data)
+
 
 

src/api/shopOrder/soroutingAvailableResource.js

@@ -0,0 +1,8 @@
+import { createAPI } from "@/utils/httpRequest.js";
+
+// -------------产线操作员登记表--------------
+// 获取生产订单工序可用机台
+export const getSORoutingAvailableResource = data => createAPI(`/shoporder/soroutingAvailableResource/getSORoutingAvailableResource`,'post',data)
+
+// 修改生产订单工序可用机台
+export const updateSORoutingAvailableResource = data => createAPI(`/shoporder/soroutingAvailableResource/updateSORoutingAvailableResource`,'post',data)

src/assets/scss/global.scss

@@ -398,3 +398,32 @@ a:hover{
   font-size: 12px;
 }
 
+ .el-transfer-panel {
+  border: 2px solid #17b3a3;
+  border-radius: 4px;
+  overflow: hidden;
+  background: #fff;
+  display: inline-block;
+  vertical-align: middle;
+  width: 252px;
+  max-height: 100%;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+  position: relative;
+}
+
+ .el-transfer-panel .el-transfer-panel__header {
+  height: 40px;
+  line-height: 40px;
+  background: #17b3a3;
+  margin: 0;
+  padding-left: 15px;
+  border-bottom: 1px solid #17b3a3;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+  color: #000;
+}
+
+ .rred input {
+   color: red;
+ }

src/views/modules/report/reportCategory.vue

@@ -312,8 +312,8 @@ export default {
         if (data.data.length > 0) {
           this.buttons = data.data
         } else {
-          saveButtonList(this.buttonList).then(({data}) => {
-          })
+          // saveButtonList(this.buttonList).then(({data}) => {
+          // })
         }
       })
     },

src/views/modules/shopOrder/productionOrderScheduling/searchProductionDispatchList.vue

@@ -188,7 +188,7 @@
         },
         searchData: {
           site:'',
-          orderNo:'',
+          orderNo:this.$route.query.orderNo,
           checked: true,
           partNo:'',
           sResourceID:'',

src/views/modules/shopOrder/shopOrder/common/tool_add_and_edit.vue

@@ -5,7 +5,7 @@
       @close="closeDialog"
       width="390px"
       class="sxm"
-      :title="titile"
+      :title="titleCon"
       :close-on-click-modal="false"
       :visible.sync="visible">
       <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: 0px;">

src/views/modules/shopOrder/shopOrder/shopOrder.vue

@@ -33,15 +33,36 @@
     <el-tabs style="font-size: 12px" class="customer-tab" v-model="activeName" type="border-card">
       <el-tab-pane :label=labels.orderLabel name="first">
         <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
-          <el-button @click="updateModal" :disabled = authEdit type="primary" style="margin-left: 2px;margin-top: 0px">{{ buttons.editButton }}</el-button>
-          <el-button @click="deleteData" :disabled = "authDelete" type="primary" style="margin-left: 2px;margin-top: 0px">{{ buttons.deleteButton }}</el-button>
-          <el-button @click="printOrder()" type="primary" style="margin-left: 2px;margin-top: 0px">{{ buttons.printButton }}
+          <el-dropdown trigger="click" style="margin-top: 3px" class="customer-dropdown" @command="handleCommand">
+            <el-button type="primary" :disabled="authEdit">
+              {{ buttons.orderPrimaryMenu }}<i class="el-icon-arrow-down el-icon--right"></i>
             </el-button>
-          <el-button @click="warnCancelOrderConfirm()" :disabled="authEdit" type="primary" style="margin-left: 2px;margin-top: 0px">{{ buttons.cancelButton }}
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item class="customer-li" command="orderToScheduling"><span>{{
+                  buttons.orderToScheduling
+                }}</span>
+              </el-dropdown-item>
+              <el-dropdown-item class="customer-li" command="changeRouting"><span>{{ buttons.changeRouting }}</span>
+              </el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
+          <el-button @click="updateModal" :disabled=authEdit type="primary" style="margin-left: 2px;margin-top: 0px">
+            {{ buttons.editButton }}
           </el-button>
-          <el-button @click="warnCloseOrderConfirm()" :disabled = "authEdit" type="primary" style="margin-left: 2px;margin-top: 0px">{{ buttons.closeButton }}
+          <el-button @click="deleteData" :disabled="authDelete" type="primary" style="margin-left: 2px;margin-top: 0px">
+            {{ buttons.deleteButton }}
           </el-button>
-          <el-button @click="warnOpenOrderConfirm()" :disabled = "authEdit" type="primary" style="margin-left: 2px;margin-top: 0px">{{ buttons.openButton }}
+          <el-button @click="printOrder()" type="primary" style="margin-left: 2px;margin-top: 0px">
+            {{ buttons.printButton }}
+          </el-button>
+          <el-button @click="warnCancelOrderConfirm()" :disabled="authEdit" type="primary"
+                     style="margin-left: 2px;margin-top: 0px">{{ buttons.cancelButton }}
+          </el-button>
+          <el-button @click="warnCloseOrderConfirm()" :disabled="authEdit" type="primary"
+                     style="margin-left: 2px;margin-top: 0px">{{ buttons.closeButton }}
+          </el-button>
+          <el-button @click="warnOpenOrderConfirm()" :disabled="authEdit" type="primary"
+                     style="margin-left: 2px;margin-top: 0px">{{ buttons.openButton }}
           </el-button>
         </el-form>
         <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 10px;">
@@ -246,6 +267,10 @@
                 <el-dropdown-item class="customer-li" command="0"><span>{{ buttons.routingMenu }}</span>
                 </el-dropdown-item>
               </el-dropdown-menu>
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item class="customer-li" command="routingResource"><span>{{ buttons.resources }}</span>
+                </el-dropdown-item>
+              </el-dropdown-menu>
             </el-dropdown>
           </el-col>
         </el-row>
@@ -255,6 +280,8 @@
               :height="height"
               :data="dataList2"
               border
+              highlight-current-row
+              @current-change="routingCurrentChange"
               v-loading="dataListLoading"
               style="width: 100%;">
               <el-table-column
@@ -331,6 +358,7 @@
         </el-table>
       </el-tab-pane>
     </el-tabs>
+
     <el-dialog :title=labels.orderList :close-on-click-modal="false" v-drag :visible.sync="modelFlag2" width="800px">
       <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -5px;">
         <el-form-item :label=labels.orderNo>
@@ -417,6 +445,7 @@
         <el-button type="primary" @click="modelFlag2 = false">{{ buttons.closeButton }}</el-button>
       </el-footer>
     </el-dialog>
+    <!-- 生产工单 -->
     <el-dialog :title=labels.shopOrder :close-on-click-modal="false" v-drag :visible.sync="modelFlag3" width="550px">
       <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -5px;">
 
@@ -496,12 +525,94 @@
         <el-button type="primary" @click="modelFlag3 = false">关闭</el-button>
       </el-footer>
     </el-dialog>
+    <!-- 选择列表 -->
     <Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
-
+    <!-- 工艺路线 -->
     <Routing ref="routing" @tableHanddle="tableHanddle"></Routing>
-
     <!--订单的工具信息维护-->
     <shopOrderTool ref="shopOrderTool" @tableHanddle="tableHanddle"></shopOrderTool>
+    <!-- 工艺路线可用机台 -->
+    <el-dialog
+      style="font-size: 12px"
+      v-drag
+      :title="'工艺路线设置可用机台'"
+      :visible.sync="routingVisible"
+      width="621px"
+      :append-to-body="true">
+      <el-form class="rred" :inline="true" label-position="top">
+        <el-form-item label="订单编号">
+          <el-input readonly v-model="routingResourceData.orderNo"></el-input>
+        </el-form-item>
+        <el-form-item label="工序号">
+          <el-input readonly v-model="routingResourceData.itemNo"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-transfer v-model="resourceList" :data="selectResourceList"
+                   :titles="['可选机台列表', '已选机台列表']"></el-transfer>
+      <span slot="footer" class="dialog-footer">
+        <div style="margin-top: 5px">
+                <el-button type="primary" @click="saveOrderItemNoResource()">确定</el-button>
+                <el-button @click="routingVisible = false" type="primary">取消</el-button>
+        </div>
+    </span>
+    </el-dialog>
+    <!-- 工艺路线变更 -->
+    <el-dialog
+      style="font-size: 12px"
+      v-drag
+      :title="'更改产品工艺路线'"
+      :visible.sync="changeRoutingVisible"
+      width="611px"
+      :append-to-body="true">
+      <el-form class="rred" :inline="true" label-position="top">
+        <el-form-item label="物料编码">
+          <el-input readonly v-model="modelData.partNo"></el-input>
+        </el-form-item>
+        <el-form-item label="物料名称/规格">
+          <el-input style="width: 410px;" readonly v-model="modelData.partDesc"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-table
+        :height="300"
+        :data="partRoutingList"
+        border
+        highlight-current-row
+        @row-dblclick="dblclickPartRouting"
+        @current-change="clickPartRouting"
+        style="width: 100%;">
+        <el-table-column
+          prop="revNo"
+          width="100"
+          label="版本号">
+        </el-table-column>
+        <el-table-column
+          prop="status"
+          width="100"
+          label="状态">
+        </el-table-column>
+        <el-table-column
+          prop="phaseInDate"
+          width="120"
+          label="启用日期">
+        </el-table-column>
+        <el-table-column
+          prop="phaseOutDate"
+          width="120"
+          label="停用日期">
+        </el-table-column>
+        <el-table-column
+          prop="remark"
+          width="150"
+          label="备注">
+        </el-table-column>
+      </el-table>
+      <span slot="footer" class="dialog-footer">
+        <div style="margin-top: 5px">
+                <el-button type="primary" @click="updateOrderRouting()">确定</el-button>
+                <el-button @click="changeRoutingVisible = false" type="primary">取消</el-button>
+        </div>
+    </span>
+    </el-dialog>
 
   </div>
 </template>
@@ -510,7 +621,14 @@
 import Routing from './common/routing';
 import shopOrderTool from './common/shop_order_tool';/*工具的信息维护*/
 
-
+import {
+  getSORoutingAvailableResource,
+  updateSORoutingAvailableResource
+} from "@/api/shopOrder/soroutingAvailableResource.js"
+import {
+  searchRoutingWithPartNo,
+  searchAllResource,
+} from "@/api/base/site.js"
 import {
   getShopOrderData,
   deleteShopOrderData,
@@ -521,6 +639,7 @@
   cancelShopOrderBun,//取消订单
   closeShopOrder,//关闭订单
   openShopOrder,//打开订单
+  shopOrderUpdateRoutingViaRev, // 更改工艺路线
 } from "@/api/shopOrder/shopOrder.js"
 
 import Chooselist from '@/views/modules/common/Chooselist'
@@ -537,13 +656,12 @@
   removerLanguage,
   saveSysLanguageList
 } from "@/api/sysLanguage.js";
-  var functionId = '104001001';
 
+var functionId = '104001001';
 
 
 export default {
   //查询-产线产量报告(分订单)
-    name: "searchProductionLineOutputReportInOrderNo",
   components: {
     Chooselist,
     Routing,
@@ -574,6 +692,19 @@
       exportHeader3: ["工具信息"],
       exportFooter3: [],
       // 导出 end
+      // 工序机台
+      routingVisible: false,
+      routingResourceData: {
+        orderNo: '',
+        site: '',
+        itemNo: '',
+      },
+      selectResourceList: [],
+      resourceList: [],
+      // 工艺路线变更
+      changeRoutingVisible: false,
+      partRoutingList: [],
+      partRoutingData: {},
       activeName: 'first',
       height: 200,
       modelFlag2: false,
@@ -1713,6 +1844,9 @@
       orderInfo: null,
       orderSoBom: [],
       buttons: {
+        orderPrimaryMenu: '主菜单',
+        orderToScheduling: '查看派工单信息',
+        changeRouting: '变更工艺路线',
         orderListButton: '列表',
         editButton: '编辑',
         deleteButton: '删除',
@@ -1724,6 +1858,7 @@
         download2: '导出',
         routingPrimaryMenu: '主菜单',
         routingMenu: '工艺路线',
+        resources: '可用机台',
         download3: '导出',
         toolPrimaryMenu: '主菜单',
         toolMenu: '工具信息',
@@ -1797,6 +1932,8 @@
         toolLabel: '工具',
         orderList: '订单列表',
         to: '至:',
+        notSelectItemNo: '请选择工序!',
+        pleaseSelectPartRouting: '请选择工艺路线版本'
       },
       queryLabel: {
         functionId: functionId,
@@ -1838,19 +1975,167 @@
     })
   },
   methods: {
+
     // 选中菜单出发
     handleCommand(command) {
       switch (command) {
         case '0':
+          // 工序操作
           this.getRouting()
           break;
         case '1':
+          // 工具操作
           this.getShopOrderToolData()
           break;
-        };
-        //刷新多语言信息
+        case 'routingResource':
+          // 工序设施可用机台
+          this.openResourceDialog()
+          break;
+        case 'changeRouting':
+          // 工艺路线变更
+          this.openChangeRoutingDialog()
+          break;
+        case 'orderToScheduling':
+          // 前往派工单页面
+          this.$router.push({
+            path: '/shopOrder-productionOrderScheduling/searchProductionDispatchList',
+            query: {
+              orderNo: this.modelData.orderNo,
+            }
+          })
+          break;
+      }
+    },
+    // 打开工单工艺路线变更
+    openChangeRoutingDialog() {
+      if (!this.modelData.orderNo) {
+        this.$message.warning(this.labels.pleaseSelectShopOrder)
+        return
+      }
+      this.getRoutingWithPartNo()
+      this.changeRoutingVisible = true
+    },
+    // 获取物料工艺路线
+    getRoutingWithPartNo() {
+      let dto = {
+        site: this.$store.state.user.site,
+        partNo: this.modelData.partNo
+      }
+      searchRoutingWithPartNo(dto).then(({data}) => {
+        if (data.success) {
+          this.partRoutingList = data.rows;
+        }
+      })
+    },
+    // 单机获取数据
+    clickPartRouting(row) {
+      this.partRoutingData = row
+    },
+    // 双击routing 获取选择
+    dblclickPartRouting(row) {
+      this.partRoutingData = row
+      this.updateOrderRouting()
+    },
+    // 执行更改该工艺路线
+    updateOrderRouting() {
+      if (!this.partRoutingData) {
+        this.$message.warning(this.labels.pleaseSelectPartRouting)
+        return
+      }
+      this.$confirm(`确定进行更改操作?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        let dto = {
+          site: this.$store.state.user.site,
+          orderNo: this.modelData.orderNo,
+          revNo: this.partRoutingData.revNo,
+          userId: this.$store.state.user.name,
+        }
+        shopOrderUpdateRoutingViaRev(dto).then(({data}) => {
+          if (data && data.code == 0) {
+            this.$message.success(data.msg)
+          } else {
+            this.$message.error(data.msg)
+          }
+        })
+      })
 
     },
+    // 打开工序机台选择
+    openResourceDialog() {
+      if (!this.routingResourceData || !this.routingResourceData.itemNo) {
+        this.$message.warning(this.labels.notSelectItemNo)
+        return;
+      }
+      this.routingVisible = true;
+      this.getSORoutingAvailableResource()
+      this.getSOResource()
+    },
+    // 选择工序
+    routingCurrentChange(val) {
+      this.routingResourceData = val
+    },
+    // 获取工单工序可用机台机台
+    getSORoutingAvailableResource() {
+      let dto = {
+        workCenterNo: this.routingResourceData.workCenterNo,
+        site: this.$store.state.user.site,
+      }
+      searchAllResource(dto).then(({data}) => {
+        if (data.success) {
+          this.selectResourceList = data.rows.map(item => {
+            let newItem = {
+              key: item.resourceID,
+              label: item.resourceID + " - " + item.resourceDesc,
+            }
+            return newItem
+          })
+        }
+      })
+    },
+    // 获取工单工序已设置机台
+    getSOResource() {
+      let dto = {
+        itemno: this.routingResourceData.itemNo,
+        orderno: this.modelData.orderNo,
+        site: this.$store.state.user.site,
+      }
+      getSORoutingAvailableResource(dto).then(({data}) => {
+        if (data && data.code == 0) {
+          this.resourceList = data.data.map(item => {
+            return item.resourceid
+          })
+        }
+      })
+    },
+    // 保存可用机台
+    saveOrderItemNoResource() {
+      let resourceList = this.resourceList.map(item => {
+        let newItem = {
+          site: this.$store.state.user.site,
+          orderno: this.modelData.orderNo,
+          itemno: this.routingResourceData.itemNo,
+          resourceid: item
+        }
+        return newItem;
+      })
+      let dto = {
+        orderNo: this.modelData.orderNo,
+        itemNo: this.routingResourceData.itemNo,
+        site: this.$store.state.user.site,
+        availableresourceEntityList: resourceList
+      }
+      updateSORoutingAvailableResource(dto).then(({data}) => {
+        if (data && data.code == 0) {
+          this.routingVisible = false
+          this.$message.success(data.msg)
+        } else {
+          this.$message.warning(data.msg)
+        }
+      })
+    },
     // 工艺路线管理
     getRouting() {
       if (!this.modelData.orderNo) {
@@ -2480,7 +2765,7 @@
 
 }
 
-  /deep/  .el-tabs__item {
+/deep/ .customer-tab .el-tabs__item {
   padding: 0 20px;
   height: 30px;
   -webkit-box-sizing: border-box;
@@ -2513,5 +2798,7 @@
   cursor: pointer;
   color: #409EFF;
 }
+
+
 </style>