生产订单派单功能开发

src/api/mainData/index.js

@@ -77,21 +77,83 @@ export async function listByFirstTaskId(firstTaskId) {
 }
 
 // 查询产线
-export async function lineByCurrentUser() {
+export async function lineByCurrentUser(workCenterId) {
   const res = await request.get(
-    `main/factoryarea/listFactoryLineByCurrentUser`
+    `/main/factoryarea/listFactoryLineByWorkCenterId/${workCenterId}`
   );
   if (res.data.code == 0) {
     return res.data.data;
   }
   return Promise.reject(new Error(res.data.message));
 }
-// /listWorkCenterTeamsByProduceTaskId/{firstProduceTaskId}
-// // 查询工作中心跟班组
-// export async function listByWorkCenter(firstProduceTaskId) {
-//   const res = await request.get(`/listWorkCenterTeamsByProduceTaskId/${firstProduceTaskId}`);
-//   if (res.data.code == 0) {
-//     return res.data.data;
-//   }
-//   return Promise.reject(new Error(res.data.message));
-// }
+
+// 分批任务类型
+export async function listAssigneeType() {
+  const res = await request.get(`/aps/assign/listAssigneeType`);
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+// 派单任务保存
+export async function taskSave(data) {
+  const res = await request.post('/aps/assign/assign/save', data);
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+// 派单任务撤销
+export async function taskRevoked(data) {
+  const res = await request.post('/aps/assign/assign/revoked', data);
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+// 重置派单任务
+export async function resetAssignee(assigneeId) {
+  const res = await request.put('/aps/assign/resetAssignee/' + assigneeId);
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+// 派单任务
+export async function taskAssignment(data) {
+  const res = await request.post('/aps/assign/assign', data);
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+// 获取派单任务列表
+export async function listAssign(params) {
+  const res = await request.get(`/aps/assign/listAssign`, { params });
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+// 检查派单确认
+export async function checkAssignConfirm(params) {
+  const res = await request.get(`/aps/assign/checkAssignConfirm`, { params });
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+// 获取工序的工作中心和班组列表
+export async function listByRoutingIds(data) {
+  const res = await request.post(`/main/producerouting/taskinstance/listByRoutingIds`, data);
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}

src/views/workOrder/index.vue

@@ -91,7 +91,7 @@
             拆单
           </el-link>
 
-          <el-link
+          <!-- <el-link
             type="primary"
             :underline="false"
             icon="el-icon-truck"
@@ -106,7 +106,7 @@
             "
           >
             派单
-          </el-link>
+          </el-link> -->
           <!-- <el-link
             type="primary"
             :underline="false"
@@ -123,7 +123,8 @@
           >
             派单
           </el-link>
-          <!-- <el-link
+          -->
+          <el-link
             type="primary"
             :underline="false"
             icon="el-icon-truck"
@@ -138,7 +139,7 @@
             "
           >
             派单
-          </el-link> -->
+          </el-link>
         </template>
       </ele-pro-table>
     </el-card>
@@ -240,7 +241,13 @@
     </el-dialog>
 
     <unpackDialog ref="unpackRef" @success="createSuccess" />
-    <releaseDialog ref="releaseRef" @success="createSuccess" />
+    <releaseDialog
+      ref="releaseRef"
+      :current="dispatchRow"
+      :dispatchVisible.sync="dispatchVisible"
+      @createSuccess="createSuccess"
+      v-if="dispatchVisible"
+    />
   </div>
 </template>
 
@@ -327,7 +334,9 @@
 
         current: null,
         cacheKeyUrl: '3cbbdff9-aps-workOrder',
-        columnsVersion: 1
+        columnsVersion: 1,
+        dispatchRow: {},
+        dispatchVisible: false
       };
     },
     computed: {
@@ -680,7 +689,10 @@
       },
       //派单
       toReleaseOpen(row) {
-        this.$refs.releaseRef.open(row);
+        this.dispatchRow = {...row};
+        this.dispatchRow.initialWeight = row.formingWeight + row.newWeightUnit;
+        this.dispatchVisible = true;
+        // this.$refs.releaseRef.open(row);
       },
 
       createSuccess() {