From f84e425bb9debb5f2af8e417bf07d2a2b0077609 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 28 四月 2026 17:00:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_NEW_pro' into dev_NEW_pro

---
 src/api/productionManagement/productionOrder.js |   93 ++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 89 insertions(+), 4 deletions(-)

diff --git a/src/api/productionManagement/productionOrder.js b/src/api/productionManagement/productionOrder.js
index 178b385..688abfc 100644
--- a/src/api/productionManagement/productionOrder.js
+++ b/src/api/productionManagement/productionOrder.js
@@ -12,7 +12,7 @@
 
 export function productOrderListPage(query) {
   return request({
-    url: "/productOrder/page",
+    url: "/productionOrder/page",
     method: "get",
     params: query,
   });
@@ -30,7 +30,7 @@
 // 鐢熶骇璁㈠崟-缁戝畾宸ヨ壓璺嚎
 export function bindingRoute(data) {
   return request({
-    url: "/productOrder/bindingRoute",
+    url: "/productionOrder/bindingRoute",
     method: "post",
     data,
   });
@@ -39,9 +39,17 @@
 // 鐢熶骇璁㈠崟-鏂板
 export function addProductOrder(data) {
   return request({
-    url: "/productOrder/addProductOrder",
+    url: "/productionOrder/addOrder",
     method: "post",
     data: data,
+  });
+}
+
+export function delProductOrder(ids) {
+  return request({
+    url: `/productionOrder/delete`,
+    method: "delete",
+    data: ids,
   });
 }
 
@@ -51,6 +59,83 @@
     url: "/productOrder/listProcessBom",
     method: "get",
     params: query,
+  });
+}
+
+// 鐢熶骇璁㈠崟-棰嗘枡鍙拌处鍒楄〃
+export function listMaterialPickingLedger(query) {
+  return request({
+    url: "/productOrderMaterial/list",
+    method: "get",
+    params: query,
+  });
+}
+
+// 鐢熶骇璁㈠崟-淇濆瓨棰嗘枡鍙拌处
+// export function saveMaterialPickingLedger(data) {
+//   return request({
+//     url: "/productOrderMaterial/save",
+//     method: "post",
+//     data,
+//   });
+// }
+export function saveMaterialPickingLedger(data) {
+  return request({
+    url: "/productionOrderPick/savePick",
+    method: "post",
+    data,
+  });
+}
+export function updateMaterialPickingLedger(data) {
+  return request({
+    url: "/productionOrderPick/updatePick",
+    method: "post",
+    data,
+  });
+}
+// 鐢熶骇璁㈠崟-棰嗘枡璇︽儏鍒楄〃
+// export function listMaterialPickingDetail(query) {
+//   return request({
+//     url: "/productOrderMaterial/detailList",
+//     method: "get",
+//     params: query,
+//   });
+// }
+export function listMaterialPickingBom(productionOrderId) {
+  return request({
+    url: "/productionOrder/pick/" + productionOrderId,
+    method: "get",
+  });
+}
+export function listMaterialPickingDetail(productionOrderId) {
+  return request({
+    url: "/productionOrderPick/detail/" + productionOrderId,
+    method: "get",
+  });
+}
+// 鐢熶骇璁㈠崟-琛ユ枡璁板綍鍒楄〃
+export function listMaterialSupplementRecord(query) {
+  return request({
+    url: "/productionOrderPickRecord/feeding",
+    method: "get",
+    params: query,
+  });
+}
+
+// 鐢熶骇璁㈠崟-鑾峰彇鏉ユ簮鏁版嵁
+export function getProductOrderSource(id) {
+  return request({
+    url: `/productionOrder/source/${id}`,
+    method: "get",
+  });
+}
+
+// 鐢熶骇璁㈠崟-閫�鏂欑‘璁�
+export function confirmMaterialReturn(data) {
+  return request({
+    url: "/productOrderMaterial/confirmReturn",
+    method: "post",
+    data,
   });
 }
 
@@ -122,4 +207,4 @@
     method: "post",
     data: data,
   });
-}
\ No newline at end of file
+}

--
Gitblit v1.9.3