From 53835d3c981b413baac6b9b6e46ffdc96ae27d0b Mon Sep 17 00:00:00 2001 From: lcode <18046109718@163.com> Date: Fri, 1 Nov 2024 17:12:04 +0800 Subject: [PATCH] =?UTF-8?q?20241101=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../挤压排产表/详情列表.ms | 17 ++++-- .../计划挤压排产管理/列表.ms | 8 ++- .../materialsSelect.vue | 12 +++++ .../processReport/materialsSelect.vue | 52 +++++++++++++------ 4 files changed, 68 insertions(+), 21 deletions(-) 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 f8f010d..a7adfb8 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" : "f4b3acf704cf4db29258ba70e24f8fc5", "name" : "详情列表", "createTime" : null, - "updateTime" : 1726371199127, + "updateTime" : 1730452017745, "lock" : null, "createBy" : null, "updateBy" : null, @@ -19,7 +19,7 @@ "responseBody" : "{\n \"code\": 0,\n \"data\": {\n \"count\": 10,\n \"list\": [\n {\n \"scheduleNumber\": null,\n \"productionLength\": 2,\n \"productionPieces\": 1,\n \"sawingMethod\": \"2345234\",\n \"orderNo\": null,\n \"salesOrderCode\": \"YS004\",\n \"materialCode\": \"JY646390\",\n \"materialName\": \"SW-170不打孔\",\n \"profileModel\": \"SH-044\",\n \"weight\": 0.19,\n \"specification\": \"30*12.6\",\n \"thickness\": 0.9,\n \"piecesBundle\": 20,\n \"materialCategory\": \"型材系列\",\n \"defaultLength\": 6,\n \"packagingMethod\": \"6\",\n \"source\": \"source1\",\n \"unit\": \"支\",\n \"orderLength\": 1,\n \"orderTotalQuantity\": 10,\n \"surfaceMethod\": null,\n \"theoreticalWeightPerPiece\": 0.19,\n \"theoreticalWeight\": 0.19,\n \"packingQuantity\": 0,\n \"deliveryDate\": \"2024-09-14\",\n \"customerMaterialCode\": null,\n \"producedPieces\": 0,\n \"producedLength\": 0,\n \"priceWithTax\": 10010,\n \"amountWithTax\": 0,\n \"shipmentsedNumber\": 0,\n \"returnedNumber\": null,\n \"status\": 1\n },\n {\n \"scheduleNumber\": null,\n \"productionLength\": 1,\n \"productionPieces\": 1,\n \"sawingMethod\": null,\n \"orderNo\": null,\n \"salesOrderCode\": \"YS004\",\n \"materialCode\": \"JY646391\",\n \"materialName\": \"SW-171不打孔\",\n \"profileModel\": \"SH-045\",\n \"weight\": 0.2,\n \"specification\": \"32*14.0\",\n \"thickness\": 1,\n \"piecesBundle\": 25,\n \"materialCategory\": \"型材系列\",\n \"defaultLength\": 6,\n \"packagingMethod\": \"6\",\n \"source\": \"source2\",\n \"unit\": \"支\",\n \"orderLength\": 1,\n \"orderTotalQuantity\": 10,\n \"surfaceMethod\": null,\n \"theoreticalWeightPerPiece\": 0.2,\n \"theoreticalWeight\": 0.2,\n \"packingQuantity\": 0,\n \"deliveryDate\": \"2024-09-14\",\n \"customerMaterialCode\": null,\n \"producedPieces\": 0,\n \"producedLength\": 0,\n \"priceWithTax\": 10010,\n \"amountWithTax\": 0,\n \"shipmentsedNumber\": 0,\n \"returnedNumber\": null,\n \"status\": 1\n },\n {\n \"scheduleNumber\": null,\n \"productionLength\": 1,\n \"productionPieces\": 1,\n \"sawingMethod\": null,\n \"orderNo\": null,\n \"salesOrderCode\": \"YS004\",\n \"materialCode\": \"JY646390\",\n \"materialName\": \"SW-170不打孔\",\n \"profileModel\": \"SH-044\",\n \"weight\": 0.19,\n \"specification\": \"30*12.6\",\n \"thickness\": 0.9,\n \"piecesBundle\": 20,\n \"materialCategory\": \"型材系列\",\n \"defaultLength\": 6,\n \"packagingMethod\": \"6\",\n \"source\": \"source1\",\n \"unit\": \"支\",\n \"orderLength\": 1,\n \"orderTotalQuantity\": 10,\n \"surfaceMethod\": null,\n \"theoreticalWeightPerPiece\": 0.19,\n \"theoreticalWeight\": 0.19,\n \"packingQuantity\": 0,\n \"deliveryDate\": \"2024-09-14\",\n \"customerMaterialCode\": null,\n \"producedPieces\": 0,\n \"producedLength\": 0,\n \"priceWithTax\": 10010,\n \"amountWithTax\": 0,\n \"shipmentsedNumber\": 0,\n \"returnedNumber\": null,\n \"status\": 1\n },\n {\n \"scheduleNumber\": null,\n \"productionLength\": 1,\n \"productionPieces\": 1,\n \"sawingMethod\": null,\n \"orderNo\": null,\n \"salesOrderCode\": \"YS004\",\n \"materialCode\": \"JY646391\",\n \"materialName\": \"SW-171不打孔\",\n \"profileModel\": \"SH-045\",\n \"weight\": 0.2,\n \"specification\": \"32*14.0\",\n \"thickness\": 1,\n \"piecesBundle\": 25,\n \"materialCategory\": \"型材系列\",\n \"defaultLength\": 6,\n \"packagingMethod\": \"6\",\n \"source\": \"source2\",\n \"unit\": \"支\",\n \"orderLength\": 1,\n \"orderTotalQuantity\": 10,\n \"surfaceMethod\": null,\n \"theoreticalWeightPerPiece\": 0.2,\n \"theoreticalWeight\": 0.2,\n \"packingQuantity\": 0,\n \"deliveryDate\": \"2024-09-14\",\n \"customerMaterialCode\": null,\n \"producedPieces\": 0,\n \"producedLength\": 0,\n \"priceWithTax\": 10010,\n \"amountWithTax\": 0,\n \"shipmentsedNumber\": 0,\n \"returnedNumber\": null,\n \"status\": 1\n },\n {\n \"scheduleNumber\": null,\n \"productionLength\": 1,\n \"productionPieces\": 1,\n \"sawingMethod\": null,\n \"orderNo\": null,\n \"salesOrderCode\": \"YS004\",\n \"materialCode\": \"JY646390\",\n \"materialName\": \"SW-170不打孔\",\n \"profileModel\": \"SH-044\",\n \"weight\": 0.19,\n \"specification\": \"30*12.6\",\n \"thickness\": 0.9,\n \"piecesBundle\": 20,\n \"materialCategory\": \"型材系列\",\n \"defaultLength\": 6,\n \"packagingMethod\": \"6\",\n \"source\": \"source1\",\n \"unit\": \"支\",\n \"orderLength\": 1,\n \"orderTotalQuantity\": 10,\n \"surfaceMethod\": null,\n \"theoreticalWeightPerPiece\": 0.19,\n \"theoreticalWeight\": 0.19,\n \"packingQuantity\": 0,\n \"deliveryDate\": \"2024-09-14\",\n \"customerMaterialCode\": null,\n \"producedPieces\": 0,\n \"producedLength\": 0,\n \"priceWithTax\": 10010,\n \"amountWithTax\": 0,\n \"shipmentsedNumber\": 0,\n \"returnedNumber\": null,\n \"status\": 1\n },\n {\n \"scheduleNumber\": null,\n \"productionLength\": 1,\n \"productionPieces\": 1,\n \"sawingMethod\": null,\n \"orderNo\": null,\n \"salesOrderCode\": \"YS004\",\n \"materialCode\": \"JY646391\",\n \"materialName\": \"SW-171不打孔\",\n \"profileModel\": \"SH-045\",\n \"weight\": 0.2,\n \"specification\": \"32*14.0\",\n \"thickness\": 1,\n \"piecesBundle\": 25,\n \"materialCategory\": \"型材系列\",\n \"defaultLength\": 6,\n \"packagingMethod\": \"6\",\n \"source\": \"source2\",\n \"unit\": \"支\",\n \"orderLength\": 1,\n \"orderTotalQuantity\": 10,\n \"surfaceMethod\": null,\n \"theoreticalWeightPerPiece\": 0.2,\n \"theoreticalWeight\": 0.2,\n \"packingQuantity\": 0,\n \"deliveryDate\": \"2024-09-14\",\n \"customerMaterialCode\": null,\n \"producedPieces\": 0,\n \"producedLength\": 0,\n \"priceWithTax\": 10010,\n \"amountWithTax\": 0,\n \"shipmentsedNumber\": 0,\n \"returnedNumber\": null,\n \"status\": 1\n },\n {\n \"scheduleNumber\": null,\n \"productionLength\": 1,\n \"productionPieces\": 1,\n \"sawingMethod\": null,\n \"orderNo\": null,\n \"salesOrderCode\": \"YS004\",\n \"materialCode\": \"JY646390\",\n \"materialName\": \"SW-170不打孔\",\n \"profileModel\": \"SH-044\",\n \"weight\": 0.19,\n \"specification\": \"30*12.6\",\n \"thickness\": 0.9,\n \"piecesBundle\": 20,\n \"materialCategory\": \"型材系列\",\n \"defaultLength\": 6,\n \"packagingMethod\": \"6\",\n \"source\": \"source1\",\n \"unit\": \"支\",\n \"orderLength\": 1,\n \"orderTotalQuantity\": 10,\n \"surfaceMethod\": null,\n \"theoreticalWeightPerPiece\": 0.19,\n \"theoreticalWeight\": 0.19,\n \"packingQuantity\": 0,\n \"deliveryDate\": \"2024-09-14\",\n \"customerMaterialCode\": null,\n \"producedPieces\": 0,\n \"producedLength\": 0,\n \"priceWithTax\": 10010,\n \"amountWithTax\": 0,\n \"shipmentsedNumber\": 0,\n \"returnedNumber\": null,\n \"status\": 1\n },\n {\n \"scheduleNumber\": null,\n \"productionLength\": 1,\n \"productionPieces\": 1,\n \"sawingMethod\": null,\n \"orderNo\": null,\n \"salesOrderCode\": \"YS004\",\n \"materialCode\": \"JY646391\",\n \"materialName\": \"SW-171不打孔\",\n \"profileModel\": \"SH-045\",\n \"weight\": 0.2,\n \"specification\": \"32*14.0\",\n \"thickness\": 1,\n \"piecesBundle\": 25,\n \"materialCategory\": \"型材系列\",\n \"defaultLength\": 6,\n \"packagingMethod\": \"6\",\n \"source\": \"source2\",\n \"unit\": \"支\",\n \"orderLength\": 1,\n \"orderTotalQuantity\": 10,\n \"surfaceMethod\": null,\n \"theoreticalWeightPerPiece\": 0.2,\n \"theoreticalWeight\": 0.2,\n \"packingQuantity\": 0,\n \"deliveryDate\": \"2024-09-14\",\n \"customerMaterialCode\": null,\n \"producedPieces\": 0,\n \"producedLength\": 0,\n \"priceWithTax\": 10010,\n \"amountWithTax\": 0,\n \"shipmentsedNumber\": 0,\n \"returnedNumber\": null,\n \"status\": 1\n },\n {\n \"scheduleNumber\": \"43\",\n \"productionLength\": 1,\n \"productionPieces\": 1,\n \"sawingMethod\": null,\n \"orderNo\": null,\n \"salesOrderCode\": \"YS004\",\n \"materialCode\": \"JY646390\",\n \"materialName\": \"SW-170不打孔\",\n \"profileModel\": \"SH-044\",\n \"weight\": 0.19,\n \"specification\": \"30*12.6\",\n \"thickness\": 0.9,\n \"piecesBundle\": 20,\n \"materialCategory\": \"型材系列\",\n \"defaultLength\": 6,\n \"packagingMethod\": \"6\",\n \"source\": \"source1\",\n \"unit\": \"支\",\n \"orderLength\": 1,\n \"orderTotalQuantity\": 10,\n \"surfaceMethod\": null,\n \"theoreticalWeightPerPiece\": 0.19,\n \"theoreticalWeight\": 0.19,\n \"packingQuantity\": 0,\n \"deliveryDate\": \"2024-09-14\",\n \"customerMaterialCode\": null,\n \"producedPieces\": 0,\n \"producedLength\": 0,\n \"priceWithTax\": 10010,\n \"amountWithTax\": 0,\n \"shipmentsedNumber\": 0,\n \"returnedNumber\": null,\n \"status\": 1\n },\n {\n \"scheduleNumber\": \"43\",\n \"productionLength\": 1,\n \"productionPieces\": 1,\n \"sawingMethod\": null,\n \"orderNo\": null,\n \"salesOrderCode\": \"YS004\",\n \"materialCode\": \"JY646391\",\n \"materialName\": \"SW-171不打孔\",\n \"profileModel\": \"SH-045\",\n \"weight\": 0.2,\n \"specification\": \"32*14.0\",\n \"thickness\": 1,\n \"piecesBundle\": 25,\n \"materialCategory\": \"型材系列\",\n \"defaultLength\": 6,\n \"packagingMethod\": \"6\",\n \"source\": \"source2\",\n \"unit\": \"支\",\n \"orderLength\": 1,\n \"orderTotalQuantity\": 10,\n \"surfaceMethod\": null,\n \"theoreticalWeightPerPiece\": 0.2,\n \"theoreticalWeight\": 0.2,\n \"packingQuantity\": 0,\n \"deliveryDate\": \"2024-09-14\",\n \"customerMaterialCode\": null,\n \"producedPieces\": 0,\n \"producedLength\": 0,\n \"priceWithTax\": 10010,\n \"amountWithTax\": 0,\n \"shipmentsedNumber\": 0,\n \"returnedNumber\": null,\n \"status\": 1\n }\n ]\n },\n \"message\": \"success\"\n}", "description" : null, "requestBodyDefinition" : { - "name" : "", + "name" : "root", "value" : "", "description" : "", "required" : false, @@ -541,7 +541,12 @@ import '@/common/sql' as sql String salesOrdeSelect = sql("salesOrder") -String scheduleNumber = body.scheduleNumber; +String scheduleNumber = body["scheduleNumber"]; +String salesOrderCode = body["salesOrderCode"]; +String orderNo = body["orderNo"]; +String materialCode = body["materialCode"]; +String profileModel = body["profileModel"]; + return db.page(""" select mesd.schedule_number, @@ -554,5 +559,9 @@ return db.page(""" left join mini_sales_order_materials msm on mesd.sales_order_code = msm.sales_order_code and mesd.material_code = msm.material_code where 1=1 - ?{scheduleNumber != null and scheduleNumber != '', and schedule_number like concat('%', #{scheduleNumber}, '%')} + ?{scheduleNumber != null and scheduleNumber != '', and mesd.schedule_number like concat('%', #{scheduleNumber}, '%')} + ?{salesOrderCode != null and salesOrderCode != '', and msm.sales_order_code like concat('%', #{salesOrderCode}, '%')} + ?{orderNo != null and orderNo != '', and msm.order_no like concat('%', #{orderNo}, '%')} + ?{materialCode != null and materialCode != '', and msm.material_code like concat('%', #{materialCode}, '%')} + ?{profileModel != null and profileModel != '', and msm.profile_model like concat('%', #{profileModel}, '%')} """) \ No newline at end of file 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 d230c55..250ae01 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" : "06d35cc5db5f4e6681262a1648c871c3", "name" : "列表", "createTime" : null, - "updateTime" : 1730109068864, + "updateTime" : 1730451538439, "lock" : null, "createBy" : null, "updateBy" : null, @@ -162,6 +162,8 @@ String salesOrderCode = body["salesOrderCode"]; String materialName = body["materialName"]; String materialCode = body["materialCode"]; String deliveryDate = body["deliveryDate"]; +String customerName = body["customerName"]; +String orderNo = body["orderNo"]; String salesOrdeSelect = sql("salesOrder") String sql = """ @@ -189,7 +191,9 @@ String sql = """ ?{salesOrderCode != null and salesOrderCode != "", and mps.sales_order_code = #{salesOrderCode}} ?{documentNumber != null and documentNumber != "", and mps.document_number = #{documentNumber}} ?{materialName != null and materialName != "", and msm.material_name like concat('%', #{materialName}, '%')} - ?{materialCode != null and materialCode != "", and mps.material_code like concat('%', #{materialCode}, '%')} + ?{materialCode != null and materialCode != "", and mps.material_code like concat('%', #{materialCode}, '%')} + ?{customerName != null and customerName != "", and mci.customer_name like concat('%', #{customerName}, '%')} + ?{orderNo != null and orderNo != "", and msm.order_no like concat('%', #{orderNo}, '%')} ?{deliveryDate != null and deliveryDate != '', and mso.delivery_date = #{deliveryDate}} """; diff --git a/manage/src/views/mini/productionManagement/extrusionProductionSchedule/materialsSelect.vue b/manage/src/views/mini/productionManagement/extrusionProductionSchedule/materialsSelect.vue index 6abb409..5b4735e 100644 --- a/manage/src/views/mini/productionManagement/extrusionProductionSchedule/materialsSelect.vue +++ b/manage/src/views/mini/productionManagement/extrusionProductionSchedule/materialsSelect.vue @@ -32,6 +32,18 @@ clearable > + + + +
- - + --> - + + + + + + + + - 添加 + 添加
@@ -79,14 +98,15 @@ export default { params: module.tableSelect.params, selection: [], materialCategoryItem: { - options: { tb: 'product_material_categories', placeholder: '物料/产品分类' } + options: { + tb: "product_material_categories", + placeholder: "物料/产品分类", + }, }, - listData: [] + listData: [], }; }, - mounted() { - - }, + mounted() {}, methods: { //显示 open() { @@ -98,7 +118,9 @@ export default { this.listData = listData; }, selectable(row, index) { - return !this.listData.some(item => row.materialCode == item.materialCode) + return !this.listData.some( + (item) => row.materialCode == item.materialCode + ); }, currentChange(row) { this.selection = [row]; @@ -108,7 +130,7 @@ export default { this.selection = selection; }, add() { - this.$emit("success", this.selection) + this.$emit("success", this.selection); this.visible = false; }, //搜索