From 11d7990309ddace2fa600cbeae58e3ab5ac368f9 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期日, 20 九月 2026 19:25:45 +0800
Subject: [PATCH] 新疆-融邦 1. 委外管理：新增合作商档案、委外订单、往来台账三个页面及接口；合作商附件弹框支持直接上传/删除并即时保存。 2. 信托基金与代储台账：客户档案加「信托基金 / 代储金额」并对超限标红提示；销售台账拆「卖油 / 代储」页签，代储走油库+储罐+合同金额，卖油保留产品明细；台账列表加审批状态与超限红字；审批中心显示销售合同号并能下钻台账明细。 3. 储罐号带入库存：储罐信息表单加「是否启用 / 用途 / 租客信息」联动与校验；库存管理、批号明细、入库/出库表单与列表补齐储罐号、油品、物流、过磅等字段展示。 4. 出库即发货与往来备件：出库台账区分「发货单 / 油品出库」两类来源并分别处理详情；新增备件出入库流水页面。 5. 车辆管理与残油联动：新增车辆管理页面；油品出入库表单物流信息顺序调整，车牌/车挂牌号联动只读。 6. 油品出库联动发货台账：发货台账加「发货单号 / 销售合同号」筛选，修复油品出库行批号列取错字段。 7. 采购申请模块：新增采购申请页面及接口。 8. 付款流水组件：抽出公共「付款流水」弹框组件，采购付款分栏、收付款台账与委外往来台账复用。 9. 列调整：收付款台账删除「付款金额 / 退货金额」；委外往来台账删除「回款金额」，并去掉金额列右对齐。
---
src/api/productionManagement/productionOrder.js | 81 +++++++++++++++++++++++++++++++++-------
1 files changed, 66 insertions(+), 15 deletions(-)
diff --git a/src/api/productionManagement/productionOrder.js b/src/api/productionManagement/productionOrder.js
index ad07798..b84a188 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,7 +39,16 @@
// 鐢熶骇璁㈠崟-鏂板
export function addProductOrder(data) {
return request({
- url: "/productOrder/addProductOrder",
+ url: "/productionOrder/addOrder",
+ method: "post",
+ data: data,
+ });
+}
+
+// 鐢熶骇璁㈠崟-淇敼
+export function updateProductOrder(data) {
+ return request({
+ url: "/productionOrder/updateOrder",
method: "post",
data: data,
});
@@ -47,8 +56,9 @@
export function delProductOrder(ids) {
return request({
- url: `/productOrder/${ids}`,
+ url: `/productionOrder/delete`,
method: "delete",
+ data: ids,
});
}
@@ -64,43 +74,84 @@
// 鐢熶骇璁㈠崟-棰嗘枡鍙拌处鍒楄〃
export function listMaterialPickingLedger(query) {
return request({
- url: "/productOrder/materialPicking/list",
+ 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: "/productOrder/materialPicking/save",
+ url: "/productionOrderPick/savePick",
+ method: "post",
+ data,
+ });
+}
+export function updateMaterialPickingLedger(data) {
+ return request({
+ url: "/productionOrderPick/updatePick",
method: "post",
data,
});
}
-// 鐢熶骇璁㈠崟-棰嗘枡璇︽儏鍒楄〃
-export function listMaterialPickingDetail(query) {
+// 鐢熶骇璁㈠崟婧簮璇︽儏
+export function getOrderDetail(npsNo) {
return request({
- url: "/productOrder/materialPicking/detailList",
+ url: "/productionOrder/ordeDetail",
+ method: "get",
+ params: { npsNo },
+ });
+}
+// 鐢熶骇璁㈠崟-棰嗘枡璇︽儏鍒楄〃
+// 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 listMaterialSupplementRecord(query) {
+// 鐢熶骇璁㈠崟-鑾峰彇鏉ユ簮鏁版嵁
+export function getProductOrderSource(id) {
return request({
- url: "/productOrder/materialPicking/supplementRecord",
+ url: `/productionOrder/source/${id}`,
method: "get",
- params: query,
});
}
// 鐢熶骇璁㈠崟-閫�鏂欑‘璁�
export function confirmMaterialReturn(data) {
return request({
- url: "/productOrder/materialPicking/confirmReturn",
+ url: "/productOrderMaterial/confirmReturn",
method: "post",
data,
});
@@ -174,4 +225,4 @@
method: "post",
data: data,
});
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3