From dc480730be9f376ac20d05b8c52c6ecef4098d7f Mon Sep 17 00:00:00 2001
From: siontion <siontion_2000@163.com>
Date: Tue, 27 Feb 2024 19:14:23 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=20?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=20=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

采购订单 排序 设备信息展示
---
 .../module/heli/dal/mysql/plansub/PlanSubMapper.java   |  4 ++--
 .../PurchaseOrderMaterialMapper.java                   |  2 +-
 mes-ui/mes-ui-admin-vue3/src/views/heli/plan/edit.vue  | 10 +++++++---
 .../src/views/heli/purchaseorder/edit.vue              |  2 +-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/plansub/PlanSubMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/plansub/PlanSubMapper.java
index 38f3788c..85af0656 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/plansub/PlanSubMapper.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/plansub/PlanSubMapper.java
@@ -26,13 +26,13 @@ public interface PlanSubMapper extends BaseMapperX<PlanSubDO> {
                 .eqIfPresent(PlanSubDO::getMouldId, reqVO.getMouldId())
                 .eqIfPresent(PlanSubDO::getEquipId, reqVO.getEquipId())
                 .betweenIfPresent(PlanSubDO::getBlankDate, reqVO.getBlankDate())
-                .eqIfPresent(PlanSubDO::getBlankOwner, reqVO.getBlankOwner())
                 .betweenIfPresent(PlanSubDO::getTwoDimDate, reqVO.getTwoDimDate())
+                .eqIfPresent(PlanSubDO::getBlankOwner, reqVO.getBlankOwner())
                 .eqIfPresent(PlanSubDO::getTwoDimOwner, reqVO.getTwoDimOwner())
                 .betweenIfPresent(PlanSubDO::getThreeDimDate, reqVO.getThreeDimDate())
                 .eqIfPresent(PlanSubDO::getThreeDimOwner, reqVO.getThreeDimOwner())
                 .betweenIfPresent(PlanSubDO::getCreateTime, reqVO.getCreateTime())
-                .orderByDesc(PlanSubDO::getId));
+                .orderByAsc(PlanSubDO::getId));
     }
 
 }
\ No newline at end of file
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseordermaterial/PurchaseOrderMaterialMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseordermaterial/PurchaseOrderMaterialMapper.java
index 6b586263..ffe9c494 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseordermaterial/PurchaseOrderMaterialMapper.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseordermaterial/PurchaseOrderMaterialMapper.java
@@ -28,7 +28,7 @@ public interface PurchaseOrderMaterialMapper extends BaseMapperX<PurchaseOrderMa
                 .select("mat.id as matId","mat.name as matName","mat.code as matCode","mat.spec as matSpec","mat.unit as matUnit","mat.material_type as matType")
                 .leftJoin(MaterialDO.class, "mat", MaterialDO::getId, PurchaseOrderMaterialDO::getMaterialId)
                 .disableSubLogicDel()
-                .orderByDesc(PurchaseOrderMaterialDO::getCreateTime);
+                .orderByAsc(PurchaseOrderMaterialDO::getId);
         query.eq(reqVO.getPurchaseOrderId()!=null,PurchaseOrderMaterialDO::getPurchaseOrderId, reqVO.getPurchaseOrderId()).orderByAsc(PurchaseOrderMaterialDO::getCreateTime);
 
         return selectPage(reqVO, query);
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/edit.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/edit.vue
index 1bc9df17..9f4f8580 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/edit.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/edit.vue
@@ -559,7 +559,7 @@ const handleSubCode = (row, name) => {
 
 const handleMouldType = async (scope, mid) => {
   // 获得设备信息下拉列表
-  scope.row.equipList = equipInit.value.filter(rg => rg.mould_type_id == mid)
+  scope.row.equipList = equipInit.value.filter(rg => rg.id == mid)
 }
 
 const submitForm = async () => {
@@ -625,14 +625,18 @@ const handleInitPlanSub = async () => {
       item.amount = subTemp.amount
       // item.projectSubCode = subTemp.projectSubCode
       // item.mouldId = subTemp.mouldId
-      // item.equipId = subTemp.equipId
+      
       // item.blankDate = subTemp.blankDate
       // item.blankOwner = subTemp.blankOwner
       // item.twoDimDate = subTemp.twoDimDate
       // item.twoDimOwner = subTemp.twoDimOwner
       // item.threeDimDate = subTemp.threeDimDate
       // item.threeDimOwner = subTemp.threeDimOwner
-      item.equipList = equipInit.value.filter(rg => rg.mould_type_id == subTemp.mouldId)
+
+      // if(item.equipId != undefined && item.equipId.length>0){
+      // item.equipList = equipInit.value.filter(rg => rg.id == item.equipId)
+      // }
+      item.equipList = equipInit.value.filter(rg => rg.id == item.equipId)
     }
 
   })
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/edit.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/edit.vue
index 5d1e59cf..22fc96c4 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/edit.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/edit.vue
@@ -560,7 +560,7 @@ const saveMaterials =  async () =>{
     subData.materialId = item.matId
     subData.purchaseOrderId = formData.value.id
     if (subData.id == undefined) {
-      PurchaseOrderMaterialApi.createPurchaseOrderMaterial(subData)
+      subData.id = PurchaseOrderMaterialApi.createPurchaseOrderMaterial(subData)
     } else {
       PurchaseOrderMaterialApi.updatePurchaseOrderMaterial(subData)
     }