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

src/api/shopOrder/shopOrder.js

@@ -1,51 +1,51 @@
-import { createAPI } from "@/utils/httpRequest.js";
+import {createAPI} from "@/utils/httpRequest.js";
 
 // -------------生产订单类型--------------
 // 获取生产订单类型
-export const getShopOrderFamily = data => createAPI(`/shopOrder/getShopOrderFamily`,'post',data)
+export const getShopOrderFamily = data => createAPI(`/shopOrder/getShopOrderFamily`, 'post', data)
 
 // 保存修改生产订单类型
-export const saveShopOrderFamily = data => createAPI(`/shopOrder/saveShopOrderFamily`,'post',data)
+export const saveShopOrderFamily = data => createAPI(`/shopOrder/saveShopOrderFamily`, 'post', data)
 
 
 // 删除生产订单类型
-export const deleteShopOrderFamily = data => createAPI(`/shopOrder/deleteShopOrderFamily`,'post',data)
+export const deleteShopOrderFamily = data => createAPI(`/shopOrder/deleteShopOrderFamily`, 'post', data)
 
 // -------------计划方式页面--------------
 // 获取计划方式
-export const getPlanFamily = data => createAPI(`/shopOrder/getPlanFamily`,'post',data)
+export const getPlanFamily = data => createAPI(`/shopOrder/getPlanFamily`, 'post', data)
 
 // 保存修改计划方式
-export const savePlanFamily = data => createAPI(`/shopOrder/savePlanFamily`,'post',data)
+export const savePlanFamily = data => createAPI(`/shopOrder/savePlanFamily`, 'post', data)
 
 
 // 删除计划方式
-export const deletePlanFamily = data => createAPI(`/shopOrder/deletePlanFamily`,'post',data)
+export const deletePlanFamily = data => createAPI(`/shopOrder/deletePlanFamily`, 'post', data)
 
 // -------------查询-生产订单无工艺路线--------------
-export const searchShopOrderWithNoProcessRoute = data => createAPI(`/shopOrder/searchShopOrderWithNoProcessRoute`,'post',data)
+export const searchShopOrderWithNoProcessRoute = data => createAPI(`/shopOrder/searchShopOrderWithNoProcessRoute`, 'post', data)
 
 // -------------查询-生产派工单--------------
-export const searchProductionDispatchList = data => createAPI(`/shopOrder/searchProductionDispatchList`,'post',data)
+export const searchProductionDispatchList = data => createAPI(`/shopOrder/searchProductionDispatchList`, 'post', data)
 
 // -------------查询-生产订单--------------
-export const searchShopOrder = data => createAPI(`/shopOrder/searchShopOrder`,'post',data)
+export const searchShopOrder = data => createAPI(`/shopOrder/searchShopOrder`, 'post', data)
 // -------------生产订单--------------
-export const getShopOrderData = data => createAPI(`/shopOrder/getShopOrderData`,'post',data)
+export const getShopOrderData = data => createAPI(`/shopOrder/getShopOrderData`, 'post', data)
 
-export const deleteShopOrderData = data => createAPI(`/shopOrder/deleteShopOrderData`,'post',data)
+export const deleteShopOrderData = data => createAPI(`/shopOrder/deleteShopOrderData`, 'post', data)
 
-export const saveShopOrderData = data => createAPI(`/shopOrder/saveShopOrderData`,'post',data)
+export const saveShopOrderData = data => createAPI(`/shopOrder/saveShopOrderData`, 'post', data)
 
-export const getShopOrderDetail = data => createAPI(`/shopOrder/getShopOrderDetail`,'post',data)
+export const getShopOrderDetail = data => createAPI(`/shopOrder/getShopOrderDetail`, 'post', data)
 
 // 获取shoporder 信息
-export const getOrderInfo = data => createAPI(`/shopOrder/getOrderInfo`,'post',data)
+export const getOrderInfo = data => createAPI(`/shopOrder/getOrderInfo`, 'post', data)
 // 获取 shoporder sap sobom 信息
-export const getShopOrderSapSOBOM = data => createAPI(`/shopOrder/getShopOrderSapSOBOM`,'post',data)
+export const getShopOrderSapSOBOM = data => createAPI(`/shopOrder/getShopOrderSapSOBOM`, 'post', data)
 
 //取消shopOrder
-export const cancelShopOrderBun = data => createAPI(`/shopOrder/cancelShopOrderBun`,'post',data)
+export const cancelShopOrderBun = data => createAPI(`/shopOrder/cancelShopOrderBun`, 'post', data)
 
 //关闭订单
 export const closeShopOrder = data => createAPI('/shopOrder/closeShopOrder', 'post', data)
@@ -77,20 +77,23 @@ export const getOrderNoRouteInMaxItemNo = data => createAPI('/shopOrder/getOrder
 // 获取订单可用机台
 export const getOrderNoItemNoCenter = data => createAPI('/shopOrder/getOrderNoItemNoCenter', 'post', data)
 
-//查询--生产派工单 ---》取消派工单操作
+// 查询--生产派工单 ---》取消派工单操作
 export const cancelScheduleWithScheduleQuery = data => createAPI('/scheduling/cancelScheduleWithScheduleQuery', 'post', data)
 
-//查询工单的工具信息
+// 查询工单的工具信息
 export const getShopOrderToolDatas = data => createAPI('/shopOrder/getShopOrderToolDatas', 'post', data)
 
-//新增工单的工具信息
+// 新增工单的工具信息
 export const insertShopOrderToolData = data => createAPI('/shopOrder/insertShopOrderToolData', 'post', data)
 
-//修改工单的工具信息
+// 修改工单的工具信息
 export const updateShopOrderToolData = data => createAPI('/shopOrder/updateShopOrderToolData', 'post', data)
 
-//查询工单的工具信息
+// 查询工单的工具信息
 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;">