From ebbd29c990e71ff3ad0036f93c7224b88e2bab9c Mon Sep 17 00:00:00 2001 From: lcode <18046109718@163.com> Date: Fri, 25 Oct 2024 11:15:57 +0800 Subject: [PATCH] =?UTF-8?q?20241025=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/common/CommonServices.java | 2 +- .../swagger/entity/SwaggerProvider.java | 2 +- .../生产管理/工序报工表/列表.ms | 20 +- .../采购订单详情列表.ms | 478 +++++++++++++++++- .../销售管理/销售出货管理/新增.ms | 6 +- .../api/小程序端API/测试/测试token.ms | 4 +- .../processReport/index.vue | 267 ++++++---- 7 files changed, 664 insertions(+), 115 deletions(-) diff --git a/appengine/src/main/java/com/currency/appengine/service/common/CommonServices.java b/appengine/src/main/java/com/currency/appengine/service/common/CommonServices.java index 4944fb6..4d7d791 100644 --- a/appengine/src/main/java/com/currency/appengine/service/common/CommonServices.java +++ b/appengine/src/main/java/com/currency/appengine/service/common/CommonServices.java @@ -38,7 +38,7 @@ public class CommonServices { grantTypeMap.put("OrderNumber", params -> orderNumber(params)); // 订单编号 grantTypeMap.put("ProductionPlan", params -> productionPlan(params)); // 生产计划 grantTypeMap.put("ProductionSchedulingNumber", params -> productionSchedulingNumber(params)); // 排产编号 - grantTypeMap.put("ProductionOrderNumber", params -> productionOrderNumber(params)); // 排产单号 + grantTypeMap.put("ProductionOrderNumber", params -> productionOrderNumber(params)); // 报工单号 grantTypeMap.put("PurchaseNumber", params -> purchaseNumber(params)); // 采购编号 Function,String> result = grantTypeMap.get(type); diff --git a/appengine/src/main/java/com/currency/appengine/swagger/entity/SwaggerProvider.java b/appengine/src/main/java/com/currency/appengine/swagger/entity/SwaggerProvider.java index 6da38df..643c1f7 100644 --- a/appengine/src/main/java/com/currency/appengine/swagger/entity/SwaggerProvider.java +++ b/appengine/src/main/java/com/currency/appengine/swagger/entity/SwaggerProvider.java @@ -66,7 +66,7 @@ public class SwaggerProvider { String groupName = this.magicResourceService.getGroupName(info.getGroupId()) .replace("/", "-").replace("小程序端API-", ""); String requestPath = PathUtils.replaceSlash(this.prefix + this.magicResourceService.getGroupPath(info.getGroupId()) + "/" + info.getPath()); - Pattern p = Pattern.compile("^/api/(?!test).*"); + Pattern p = Pattern.compile("^/web/(?!test).*"); Matcher m = p.matcher(requestPath); if (!m.find()) continue; SwaggerEntity.Path path = new SwaggerEntity.Path(info.getId()); diff --git a/appengine/src/main/resources/api_file/api/web管理端API/生产管理/工序报工表/列表.ms b/appengine/src/main/resources/api_file/api/web管理端API/生产管理/工序报工表/列表.ms index 4163abb..8dbd252 100644 --- a/appengine/src/main/resources/api_file/api/web管理端API/生产管理/工序报工表/列表.ms +++ b/appengine/src/main/resources/api_file/api/web管理端API/生产管理/工序报工表/列表.ms @@ -5,7 +5,7 @@ "groupId" : "06bb1cef20924ed8887b1c3ae8a91d3a", "name" : "列表", "createTime" : null, - "updateTime" : 1726815371252, + "updateTime" : 1729824397433, "lock" : null, "createBy" : null, "updateBy" : null, @@ -46,7 +46,18 @@ "responseBodyDefinition" : null } ================================ + +// 销售订单编号，挤压编号，报工单号，型材型号，当前工序，报工日期 +sales_order_code +schedule_number +report_number +current_process +report_date + +String salesOrderCode = body.salesOrderCode; +String scheduleNumber = body.scheduleNumber; String reportNumber = body.reportNumber; +String currentProcess = body.currentProcess; String reportDate = body.reportDate; var sql = """ @@ -64,11 +75,16 @@ production_weight, scrap_number, scrap_reason, frame_number, -is_completed +is_completed, +sales_order_code, +schedule_number from mini_process_report where 1 = 1 -- and next_process is null +?{salesOrderCode != null and salesOrderCode != '', and sales_order_code like concat('%', #{salesOrderCode}, '%')} +?{scheduleNumber != null and scheduleNumber != '', and schedule_number like concat('%', #{scheduleNumber}, '%')} ?{reportNumber != null and reportNumber != '', and report_number like concat('%', #{reportNumber}, '%')} +?{currentProcess != null and currentProcess != '', and current_process = #{currentProcess}} ?{reportDate != null and reportDate != '', and date_format(report_date, '%Y-%m-%d') = #{reportDate}} -- group by report_number """ diff --git a/appengine/src/main/resources/api_file/api/web管理端API/采购管理/采购订单管理/采购订单详情列表.ms b/appengine/src/main/resources/api_file/api/web管理端API/采购管理/采购订单管理/采购订单详情列表.ms index f483e2e..241688a 100644 --- a/appengine/src/main/resources/api_file/api/web管理端API/采购管理/采购订单管理/采购订单详情列表.ms +++ b/appengine/src/main/resources/api_file/api/web管理端API/采购管理/采购订单管理/采购订单详情列表.ms @@ -5,7 +5,7 @@ "groupId" : "a2b7765d540449b7bf93e070c1911ce9", "name" : "采购订单详情列表", "createTime" : null, - "updateTime" : 1726404426890, + "updateTime" : 1729651279653, "lock" : null, "createBy" : null, "updateBy" : null, @@ -13,13 +13,481 @@ "method" : "POST", "parameters" : [ ], "options" : [ ], - "requestBody" : "", + "requestBody" : "{\r\n \"documentNumber\": \"\",\r\n \"materialCode\": \"\"\r\n}", "headers" : [ ], "paths" : [ ], - "responseBody" : null, + "responseBody" : "{\n \"code\": 0,\n \"data\": {\n \"count\": 504,\n \"list\": [\n {\n \"id\": 5628,\n \"purchaseOrderNumber\": \"P202407003\",\n \"materialCode\": \"FL00069\",\n \"materialName\": \"除灰挤\",\n \"profileModel\": null,\n \"weight\": null,\n \"specification\": \"\",\n \"thickness\": null,\n \"piecesBundle\": null,\n \"materialCategory\": null,\n \"defaultLength\": null,\n \"packagingMethod\": null,\n \"source\": null,\n \"unit\": \"KG\",\n \"remarks\": null,\n \"purchaseQuantity\": 1000,\n \"pieces\": null,\n \"theoreticalWeight\": null,\n \"unitPrice\": 6.5,\n \"amount\": 6500,\n \"taxRate\": null,\n \"priceWithTax\": null,\n \"amountWithTax\": null,\n \"pricingMethod\": null,\n \"createTime\": 1729416906000,\n \"createBy\": null,\n \"updateTime\": 1729432248000,\n \"warehousingQuantity\": 1000,\n \"returningQuantity\": 0\n },\n {\n \"id\": 5629,\n \"purchaseOrderNumber\": \"P202407004\",\n \"materialCode\": \"FL00046\",\n \"materialName\": \"帆布手套\",\n \"profileModel\": null,\n \"weight\": null,\n \"specification\": \"帆布手套\",\n \"thickness\": null,\n \"piecesBundle\": null,\n \"materialCategory\": null,\n \"defaultLength\": null,\n \"packagingMethod\": null,\n \"source\": null,\n \"unit\": \"包\",\n \"remarks\": null,\n \"purchaseQuantity\": 4,\n \"pieces\": null,\n \"theoreticalWeight\": null,\n \"unitPrice\": 17.5,\n \"amount\": 70,\n \"taxRate\": null,\n \"priceWithTax\": null,\n \"amountWithTax\": null,\n \"pricingMethod\": null,\n \"createTime\": 1729416906000,\n \"createBy\": null,\n \"updateTime\": 1729432295000,\n \"warehousingQuantity\": 4,\n \"returningQuantity\": 0\n },\n {\n \"id\": 5630,\n \"purchaseOrderNumber\": \"P202407005\",\n \"materialCode\": \"FL00046\",\n \"materialName\": \"帆布手套\",\n \"profileModel\": null,\n \"weight\": null,\n \"specification\": \"帆布手套\",\n \"thickness\": null,\n \"piecesBundle\": null,\n \"materialCategory\": null,\n \"defaultLength\": null,\n \"packagingMethod\": null,\n \"source\": null,\n \"unit\": \"包\",\n \"remarks\": null,\n \"purchaseQuantity\": 4,\n \"pieces\": null,\n \"theoreticalWeight\": null,\n \"unitPrice\": 17.5,\n \"amount\": 70,\n \"taxRate\": null,\n \"priceWithTax\": null,\n \"amountWithTax\": null,\n \"pricingMethod\": null,\n \"createTime\": 1729416906000,\n \"createBy\": null,\n \"updateTime\": 1729432375000,\n \"warehousingQuantity\": 4,\n \"returningQuantity\": 0\n },\n {\n \"id\": 5631,\n \"purchaseOrderNumber\": \"P202407006\",\n \"materialCode\": \"FL00057\",\n \"materialName\": \"碎布\",\n \"profileModel\": null,\n \"weight\": null,\n \"specification\": \"\",\n \"thickness\": null,\n \"piecesBundle\": null,\n \"materialCategory\": null,\n \"defaultLength\": null,\n \"packagingMethod\": null,\n \"source\": null,\n \"unit\": \"包\",\n \"remarks\": null,\n \"purchaseQuantity\": 10,\n \"pieces\": null,\n \"theoreticalWeight\": null,\n \"unitPrice\": 180,\n \"amount\": 180,\n \"taxRate\": null,\n \"priceWithTax\": null,\n \"amountWithTax\": null,\n \"pricingMethod\": null,\n \"createTime\": 1729416906000,\n \"createBy\": null,\n \"updateTime\": 1729432399000,\n \"warehousingQuantity\": 10,\n \"returningQuantity\": 0\n },\n {\n \"id\": 5632,\n \"purchaseOrderNumber\": \"P202407007\",\n \"materialCode\": \"FL00058\",\n \"materialName\": \"13--15开口扳手\",\n \"profileModel\": null,\n \"weight\": null,\n \"specification\": \"13--15\",\n \"thickness\": null,\n \"piecesBundle\": null,\n \"materialCategory\": null,\n \"defaultLength\": null,\n \"packagingMethod\": null,\n \"source\": null,\n \"unit\": \"PCS\",\n \"remarks\": null,\n \"purchaseQuantity\": 2,\n \"pieces\": null,\n \"theoreticalWeight\": null,\n \"unitPrice\": 6,\n \"amount\": 12,\n \"taxRate\": null,\n \"priceWithTax\": null,\n \"amountWithTax\": null,\n \"pricingMethod\": null,\n \"createTime\": 1729416906000,\n \"createBy\": null,\n \"updateTime\": 1729432445000,\n \"warehousingQuantity\": 2,\n \"returningQuantity\": 0\n },\n {\n \"id\": 5633,\n \"purchaseOrderNumber\": \"P202407008\",\n \"materialCode\": \"FL00059\",\n \"materialName\": \"明装五孔插座\",\n \"profileModel\": null,\n \"weight\": null,\n \"specification\": \"明装五孔\",\n \"thickness\": null,\n \"piecesBundle\": null,\n \"materialCategory\": null,\n \"defaultLength\": null,\n \"packagingMethod\": null,\n \"source\": null,\n \"unit\": \"盒\",\n \"remarks\": null,\n \"purchaseQuantity\": 10,\n \"pieces\": null,\n \"theoreticalWeight\": null,\n \"unitPrice\": 80,\n \"amount\": 80,\n \"taxRate\": null,\n \"priceWithTax\": null,\n \"amountWithTax\": null,\n \"pricingMethod\": null,\n \"createTime\": 1729416906000,\n \"createBy\": null,\n \"updateTime\": 1729416906000,\n \"warehousingQuantity\": 0,\n \"returningQuantity\": 0\n },\n {\n \"id\": 5634,\n \"purchaseOrderNumber\": \"P202407009\",\n \"materialCode\": \"FL00060\",\n \"materialName\": \"30x40厘米不锈钢强电箱\",\n \"profileModel\": null,\n \"weight\": null,\n \"specification\": \"30*40\",\n \"thickness\": null,\n \"piecesBundle\": null,\n \"materialCategory\": null,\n \"defaultLength\": null,\n \"packagingMethod\": null,\n \"source\": null,\n \"unit\": \"PCS\",\n \"remarks\": null,\n \"purchaseQuantity\": 10,\n \"pieces\": null,\n \"theoreticalWeight\": null,\n \"unitPrice\": 110,\n \"amount\": 110,\n \"taxRate\": null,\n \"priceWithTax\": null,\n \"amountWithTax\": null,\n \"pricingMethod\": null,\n \"createTime\": 1729416906000,\n \"createBy\": null,\n \"updateTime\": 1729416906000,\n \"warehousingQuantity\": 0,\n \"returningQuantity\": 0\n },\n {\n \"id\": 5635,\n \"purchaseOrderNumber\": \"P202407010\",\n \"materialCode\": \"FL00061\",\n \"materialName\": \"M4丝攻\",\n \"profileModel\": null,\n \"weight\": null,\n \"specification\": \"M4丝攻\",\n \"thickness\": null,\n \"piecesBundle\": null,\n \"materialCategory\": null,\n \"defaultLength\": null,\n \"packagingMethod\": null,\n \"source\": null,\n \"unit\": \"套\",\n \"remarks\": null,\n \"purchaseQuantity\": 10,\n \"pieces\": null,\n \"theoreticalWeight\": null,\n \"unitPrice\": 5,\n \"amount\": 5,\n \"taxRate\": null,\n \"priceWithTax\": null,\n \"amountWithTax\": null,\n \"pricingMethod\": null,\n \"createTime\": 1729416906000,\n \"createBy\": null,\n \"updateTime\": 1729416906000,\n \"warehousingQuantity\": 0,\n \"returningQuantity\": 0\n },\n {\n \"id\": 5636,\n \"purchaseOrderNumber\": \"P202407011\",\n \"materialCode\": \"FL00062\",\n \"materialName\": \"M5丝攻\",\n \"profileModel\": null,\n \"weight\": null,\n \"specification\": \"M5丝攻\",\n \"thickness\": null,\n \"piecesBundle\": null,\n \"materialCategory\": null,\n \"defaultLength\": null,\n \"packagingMethod\": null,\n \"source\": null,\n \"unit\": \"套\",\n \"remarks\": null,\n \"purchaseQuantity\": 10,\n \"pieces\": null,\n \"theoreticalWeight\": null,\n \"unitPrice\": 5,\n \"amount\": 5,\n \"taxRate\": null,\n \"priceWithTax\": null,\n \"amountWithTax\": null,\n \"pricingMethod\": null,\n \"createTime\": 1729416906000,\n \"createBy\": null,\n \"updateTime\": 1729416906000,\n \"warehousingQuantity\": 0,\n \"returningQuantity\": 0\n },\n {\n \"id\": 5637,\n \"purchaseOrderNumber\": \"P202407012\",\n \"materialCode\": \"FL00063\",\n \"materialName\": \"黑手洗手粉\",\n \"profileModel\": null,\n \"weight\": null,\n \"specification\": \"\",\n \"thickness\": null,\n \"piecesBundle\": null,\n \"materialCategory\": null,\n \"defaultLength\": null,\n \"packagingMethod\": null,\n \"source\": null,\n \"unit\": \"箱\",\n \"remarks\": null,\n \"purchaseQuantity\": 2,\n \"pieces\": null,\n \"theoreticalWeight\": null,\n \"unitPrice\": 18,\n \"amount\": 36,\n \"taxRate\": null,\n \"priceWithTax\": null,\n \"amountWithTax\": null,\n \"pricingMethod\": null,\n \"createTime\": 1729416906000,\n \"createBy\": null,\n \"updateTime\": 1729416906000,\n \"warehousingQuantity\": 0,\n \"returningQuantity\": 0\n },\n {\n \"id\": 5638,\n \"purchaseOrderNumber\": \"P202407013\",\n \"materialCode\": \"FL00064\",\n \"materialName\": \"拖把\",\n \"profileModel\": null,\n \"weight\": null,\n \"specification\": \"\",\n \"thickness\": null,\n \"piecesBundle\": null,\n \"materialCategory\": null,\n \"defaultLength\": null,\n \"packagingMethod\": null,\n \"source\": null,\n \"unit\": \"把\",\n \"remarks\": null,\n \"purchaseQuantity\": 4,\n \"pieces\": null,\n \"theoreticalWeight\": null,\n \"unitPrice\": 13,\n \"amount\": 52,\n \"taxRate\": null,\n \"priceWithTax\": null,\n \"amountWithTax\": null,\n \"pricingMethod\": null,\n \"createTime\": 1729416906000,\n \"createBy\": null,\n \"updateTime\": 1729416906000,\n \"warehousingQuantity\": 0,\n \"returningQuantity\": 0\n },\n {\n \"id\": 5639,\n \"purchaseOrderNumber\": \"P202407014\",\n \"materialCode\": \"FL00065\",\n \"materialName\": \"锯片\",\n \"profileModel\": null,\n \"weight\": null,\n \"specification\": \"405*25.4\",\n \"thickness\": null,\n \"piecesBundle\": null,\n \"materialCategory\": null,\n \"defaultLength\": null,\n \"packagingMethod\": null,\n \"source\": null,\n \"unit\": \"块\",\n \"remarks\": null,\n \"purchaseQuantity\": 5,\n \"pieces\": null,\n \"theoreticalWeight\": null,\n \"unitPrice\": 300,\n \"amount\": 1500,\n \"taxRate\": null,\n \"priceWithTax\": null,\n \"amountWithTax\": null,\n \"pricingMethod\": null,\n \"createTime\": 1729416906000,\n \"createBy\": null,\n \"updateTime\": 1729432531000,\n \"warehousingQuantity\": 5,\n \"returningQuantity\": 0\n },\n {\n \"id\": 5640,\n \"purchaseOrderNumber\": \"P202407015\",\n \"materialCode\": \"FL00056\",\n \"materialName\": \"拉伸膜\",\n \"profileModel\": null,\n \"weight\": null,\n \"specification\": \"\",\n \"thickness\": null,\n \"piecesBundle\": null,\n \"materialCategory\": null,\n \"defaultLength\": null,\n \"packagingMethod\": null,\n \"source\": null,\n \"unit\": \"卷\",\n \"remarks\": null,\n \"purchaseQuantity\": 4,\n \"pieces\": null,\n \"theoreticalWeight\": null,\n \"unitPrice\": 49.75,\n \"amount\": 199,\n \"taxRate\": null,\n \"priceWithTax\": null,\n \"amountWithTax\": null,\n \"pricingMethod\": null,\n \"createTime\": 1729416906000,\n \"createBy\": null,\n \"updateTime\": 1729416906000,\n \"warehousingQuantity\": 0,\n \"returningQuantity\": 0\n },\n {\n \"id\": 5642,\n \"purchaseOrderNumber\": \"P202407017\",\n \"materialCode\": \"FL00053\",\n \"materialName\": \"信封\",\n \"profileModel\": null,\n \"weight\": null,\n \"specification\": \"\",\n \"thickness\": null,\n \"piecesBundle\": null,\n \"materialCategory\": null,\n \"defaultLength\": null,\n \"packagingMethod\": null,\n \"source\": null,\n \"unit\": \"PCS\",\n \"remarks\": null,\n \"purchaseQuantity\": 500,\n \"pieces\": null,\n \"theoreticalWeight\": null,\n \"unitPrice\": 0.3,\n \"amount\": 150,\n \"taxRate\": null,\n \"priceWithTax\": null,\n \"amountWithTax\": null,\n \"pricingMethod\": null,\n \"createTime\": 1729416906000,\n \"createBy\": null,\n \"updateTime\": 1729416906000,\n \"warehousingQuantity\": 0,\n \"returningQuantity\": 0\n },\n {\n \"id\": 5643,\n \"purchaseOrderNumber\": \"P202407018\",\n \"materialCode\": \"FL00054\",\n \"materialName\": \"放行条\",\n \"profileModel\": null,\n \"weight\": null,\n \"specification\": \"\",\n \"thickness\": null,\n \"piecesBundle\": null,\n \"materialCategory\": null,\n \"defaultLength\": null,\n \"packagingMethod\": null,\n \"source\": null,\n \"unit\": \"本\",\n \"remarks\": null,\n \"purchaseQuantity\": 51,\n \"pieces\": null,\n \"theoreticalWeight\": null,\n \"unitPrice\": 2,\n \"amount\": 102,\n \"taxRate\": null,\n \"priceWithTax\": null,\n \"amountWithTax\": null,\n \"pricingMethod\": null,\n \"createTime\": 1729416906000,\n \"createBy\": null,\n \"updateTime\": 1729416906000,\n \"warehousingQuantity\": 0,\n \"returningQuantity\": 0\n },\n {\n \"id\": 5644,\n \"purchaseOrderNumber\": \"P202407019\",\n \"materialCode\": \"FL00066\",\n \"materialName\": \"五金仓库入库单\",\n \"profileModel\": null,\n \"weight\": null,\n \"specification\": \"\",\n \"thickness\": null,\n \"piecesBundle\": null,\n \"materialCategory\": null,\n \"defaultLength\": null,\n \"packagingMethod\": null,\n \"source\": null,\n \"unit\": \"本\",\n \"remarks\": null,\n \"purchaseQuantity\": 100,\n \"pieces\": null,\n \"theoreticalWeight\": null,\n \"unitPrice\": 2.2,\n \"amount\": 220,\n \"taxRate\": null,\n \"priceWithTax\": null,\n \"amountWithTax\": null,\n \"pricingMethod\": null,\n \"createTime\": 1729416906000,\n \"createBy\": null,\n \"updateTime\": 1729416906000,\n \"warehousingQuantity\": 0,\n \"returningQuantity\": 0\n },\n {\n \"id\": 5645,\n \"purchaseOrderNumber\": \"P202407020\",\n \"materialCode\": \"FL00055\",\n \"materialName\": \"隔膜泵膜片\",\n \"profileModel\": null,\n \"weight\": null,\n \"specification\": \"\",\n \"thickness\": null,\n \"piecesBundle\": null,\n \"materialCategory\": null,\n \"defaultLength\": null,\n \"packagingMethod\": null,\n \"source\": null,\n \"unit\": \"PCS\",\n \"remarks\": null,\n \"purchaseQuantity\": 2,\n \"pieces\": null,\n \"theoreticalWeight\": null,\n \"unitPrice\": 150,\n \"amount\": 300,\n \"taxRate\": null,\n \"priceWithTax\": null,\n \"amountWithTax\": null,\n \"pricingMethod\": null,\n \"createTime\": 1729416906000,\n \"createBy\": null,\n \"updateTime\": 1729416906000,\n \"warehousingQuantity\": 0,\n \"returningQuantity\": 0\n },\n {\n \"id\": 5646,\n \"purchaseOrderNumber\": \"P202407021\",\n \"materialCode\": \"FL00067\",\n \"materialName\": \"吊顶\",\n \"profileModel\": null,\n \"weight\": null,\n \"specification\": \"主龙骨45米、边骨23米、副龙骨60厘米、石膏天花板60*60厘米\",\n \"thickness\": null,\n \"piecesBundle\": null,\n \"materialCategory\": null,\n \"defaultLength\": null,\n \"packagingMethod\": null,\n \"source\": null,\n \"unit\": \"M\",\n \"remarks\": null,\n \"purchaseQuantity\": 50,\n \"pieces\": null,\n \"theoreticalWeight\": null,\n \"unitPrice\": 17,\n \"amount\": 850,\n \"taxRate\": null,\n \"priceWithTax\": null,\n \"amountWithTax\": null,\n \"pricingMethod\": null,\n \"createTime\": 1729416906000,\n \"createBy\": null,\n \"updateTime\": 1729432661000,\n \"warehousingQuantity\": 50,\n \"returningQuantity\": 0\n },\n {\n \"id\": 5647,\n \"purchaseOrderNumber\": \"P202407022\",\n \"materialCode\": \"FL00070\",\n \"materialName\": \"硫酸\",\n \"profileModel\": null,\n \"weight\": null,\n \"specification\": \"\",\n \"thickness\": null,\n \"piecesBundle\": null,\n \"materialCategory\": null,\n \"defaultLength\": null,\n \"packagingMethod\": null,\n \"source\": null,\n \"unit\": \"KG\",\n \"remarks\": null,\n \"purchaseQuantity\": 7810,\n \"pieces\": null,\n \"theoreticalWeight\": null,\n \"unitPrice\": 0.54,\n \"amount\": 4217.4,\n \"taxRate\": null,\n \"priceWithTax\": null,\n \"amountWithTax\": null,\n \"pricingMethod\": null,\n \"createTime\": 1729416906000,\n \"createBy\": null,\n \"updateTime\": 1729432729000,\n \"warehousingQuantity\": 7810,\n \"returningQuantity\": 0\n },\n {\n \"id\": 5648,\n \"purchaseOrderNumber\": \"P202407023\",\n \"materialCode\": \"FL00003\",\n \"materialName\": \"磷酸\",\n \"profileModel\": null,\n \"weight\": null,\n \"specification\": \"\",\n \"thickness\": null,\n \"piecesBundle\": null,\n \"materialCategory\": null,\n \"defaultLength\": null,\n \"packagingMethod\": null,\n \"source\": null,\n \"unit\": \"KG\",\n \"remarks\": null,\n \"purchaseQuantity\": 31745,\n \"pieces\": null,\n \"theoreticalWeight\": null,\n \"unitPrice\": 2,\n \"amount\": 63490,\n \"taxRate\": null,\n \"priceWithTax\": null,\n \"amountWithTax\": null,\n \"pricingMethod\": null,\n \"createTime\": 1729416906000,\n \"createBy\": null,\n \"updateTime\": 1729432759000,\n \"warehousingQuantity\": 31745,\n \"returningQuantity\": 0\n }\n ]\n },\n \"message\": \"success\"\n}", "description" : null, - "requestBodyDefinition" : null, - "responseBodyDefinition" : null + "requestBodyDefinition" : { + "name" : "", + "value" : "", + "description" : "", + "required" : false, + "dataType" : "Object", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ { + "name" : "documentNumber", + "value" : "", + "description" : "采购订单编号", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "materialCode", + "value" : "", + "description" : "物料编码", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + } ] + }, + "responseBodyDefinition" : { + "name" : "", + "value" : "", + "description" : "", + "required" : false, + "dataType" : "Object", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ { + "name" : "code", + "value" : "0", + "description" : "", + "required" : false, + "dataType" : "Integer", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "data", + "value" : "", + "description" : "", + "required" : false, + "dataType" : "Object", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ { + "name" : "count", + "value" : "504", + "description" : "", + "required" : false, + "dataType" : "Integer", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "list", + "value" : "", + "description" : "", + "required" : false, + "dataType" : "Array", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ { + "name" : "", + "value" : "", + "description" : "", + "required" : false, + "dataType" : "Object", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ { + "name" : "id", + "value" : "5628", + "description" : "", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "purchaseOrderNumber", + "value" : "P202407003", + "description" : "", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "materialCode", + "value" : "FL00069", + "description" : "", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "materialName", + "value" : "除灰挤", + "description" : "", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "profileModel", + "value" : "null", + "description" : "", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "weight", + "value" : "null", + "description" : "", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "specification", + "value" : "", + "description" : "", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "thickness", + "value" : "null", + "description" : "", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "piecesBundle", + "value" : "null", + "description" : "", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "materialCategory", + "value" : "null", + "description" : "", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "defaultLength", + "value" : "null", + "description" : "", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "packagingMethod", + "value" : "null", + "description" : "", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "source", + "value" : "null", + "description" : "", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "unit", + "value" : "KG", + "description" : "", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "remarks", + "value" : "null", + "description" : "", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "purchaseQuantity", + "value" : "1000", + "description" : "", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "pieces", + "value" : "null", + "description" : "", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "theoreticalWeight", + "value" : "null", + "description" : "", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "unitPrice", + "value" : "6.5", + "description" : "", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "amount", + "value" : "6500", + "description" : "", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "taxRate", + "value" : "null", + "description" : "", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "priceWithTax", + "value" : "null", + "description" : "", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "amountWithTax", + "value" : "null", + "description" : "", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "pricingMethod", + "value" : "null", + "description" : "", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "createTime", + "value" : "1729416906000", + "description" : "", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "createBy", + "value" : "null", + "description" : "", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "updateTime", + "value" : "1729432248000", + "description" : "", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "warehousingQuantity", + "value" : "1000", + "description" : "", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, { + "name" : "returningQuantity", + "value" : "0", + "description" : "", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + } ] + } ] + } ] + }, { + "name" : "message", + "value" : "success", + "description" : "", + "required" : false, + "dataType" : "String", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + } ] + } } ================================ String documentNumber = body.documentNumber diff --git a/appengine/src/main/resources/api_file/api/web管理端API/销售管理/销售出货管理/新增.ms b/appengine/src/main/resources/api_file/api/web管理端API/销售管理/销售出货管理/新增.ms index 96d0134..2a11643 100644 --- a/appengine/src/main/resources/api_file/api/web管理端API/销售管理/销售出货管理/新增.ms +++ b/appengine/src/main/resources/api_file/api/web管理端API/销售管理/销售出货管理/新增.ms @@ -5,7 +5,7 @@ "groupId" : "a170047f79ab4cb1b892edc5cccd823e", "name" : "新增", "createTime" : null, - "updateTime" : 1729160792624, + "updateTime" : 1729825162357, "lock" : null, "createBy" : null, "updateBy" : null, @@ -25,10 +25,10 @@ "expression" : null, "children" : null } ], - "requestBody" : "", + "requestBody" : "{\r\n \"materials\": [\r\n {\r\n \"salesOrderCode\": \"20241020001C\",\r\n \"materialCode\": \"A03H-001\",\r\n \"materialName\": \"两头料已加（图2）\",\r\n \"profileModel\": \"A03H\",\r\n \"weight\": 0.499,\r\n \"specification\": \"47*29.5\",\r\n \"thickness\": 1,\r\n \"piecesBundle\": 140,\r\n \"materialCategory\": \"004\",\r\n \"defaultLength\": null,\r\n \"packagingMethod\": null,\r\n \"source\": \"source1\",\r\n \"unit\": \"支\",\r\n \"orderLength\": 1.97,\r\n \"orderTotalQuantity\": 100,\r\n \"surfaceMethod\": \"Y00007\",\r\n \"theoreticalWeightPerPiece\": 0.983,\r\n \"theoreticalWeight\": 0,\r\n \"packingQuantity\": null,\r\n \"deliveryDate\": \"2024-11-21 00:00:00\",\r\n \"customerMaterialCode\": null,\r\n \"producedPieces\": 0,\r\n \"producedLength\": 0,\r\n \"priceWithTax\": null,\r\n \"amountWithTax\": null,\r\n \"remark\": null,\r\n \"shipmentsedNumber\": 0,\r\n \"returnedNumber\": null,\r\n \"unitPrice\": 0,\r\n \"orderNo\": \"33012\",\r\n \"existingInventory\": 1,\r\n \"actualWeight\": 239,\r\n \"customerId\": null,\r\n \"warehouse\": null,\r\n \"customerName\": null,\r\n \"shipmentQuantity\": 1,\r\n \"pieces\": 140,\r\n \"undeliveredQuantity\": 100\r\n }\r\n ],\r\n \"orderInfo\": {\r\n \"documentNumber\": \"ces\",\r\n \"shipmentDate\": \"2024-10-25\",\r\n \"customerId\": \"C00002\",\r\n \"shipmentInspectionReport\": \"cs\",\r\n \"remarks\": \"测试\"\r\n }\r\n}", "headers" : [ { "name" : "authorization", - "value" : null, + "value" : "5E34C0D7EA601026B93C26119C7E1AD50FF4301C7ED4F6D71B9389266C4D0154EA305F5647F993754318DA0ED39E8450", "description" : "登录token", "required" : false, "dataType" : "String", diff --git a/appengine/src/main/resources/api_file/api/小程序端API/测试/测试token.ms b/appengine/src/main/resources/api_file/api/小程序端API/测试/测试token.ms index cab6d09..0fe516f 100644 --- a/appengine/src/main/resources/api_file/api/小程序端API/测试/测试token.ms +++ b/appengine/src/main/resources/api_file/api/小程序端API/测试/测试token.ms @@ -5,7 +5,7 @@ "groupId" : "447d969bf99243f188b84289aff1ba91", "name" : "测试token", "createTime" : null, - "updateTime" : 1722826729086, + "updateTime" : 1729650958697, "lock" : null, "createBy" : null, "updateBy" : null, @@ -28,7 +28,7 @@ "requestBody" : "", "headers" : [ ], "paths" : [ ], - "responseBody" : null, + "responseBody" : "{\n \"code\": 0,\n \"data\": {\n \"token\": \"5E34C0D7EA601026B93C26119C7E1AD5BFD0EE445CC2CCC8BCF8F8565A8AF9D250A9A70E3579385B6FCD1148027C97D7\",\n \"userId\": \"1\"\n },\n \"message\": \"success\"\n}", "description" : null, "requestBodyDefinition" : null, "responseBodyDefinition" : null diff --git a/manage/src/views/mini/productionManagement/processReport/index.vue b/manage/src/views/mini/productionManagement/processReport/index.vue index df17b06..e34c316 100644 --- a/manage/src/views/mini/productionManagement/processReport/index.vue +++ b/manage/src/views/mini/productionManagement/processReport/index.vue @@ -1,60 +1,123 @@