From 43da37d14d6de8542ddd851aa6faeb9a8eaf7d79 Mon Sep 17 00:00:00 2001 From: qiuhongwu Date: Tue, 27 Feb 2024 09:16:20 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A2=84=E8=AD=A6?= =?UTF-8?q?=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes-ui-admin-vue3/src/layout/components/warnmessage.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mes-ui/mes-ui-admin-vue3/src/layout/components/warnmessage.vue b/mes-ui/mes-ui-admin-vue3/src/layout/components/warnmessage.vue index 2ca8b230..b5038d64 100644 --- a/mes-ui/mes-ui-admin-vue3/src/layout/components/warnmessage.vue +++ b/mes-ui/mes-ui-admin-vue3/src/layout/components/warnmessage.vue @@ -168,11 +168,11 @@ onMounted(() => { } } .warncenter { - height: 400px; + height: 410px; background-color: #fff; padding: 10px; overflow-y: auto; - max-height: 400px; + max-height: 410px; .warntext { display: flex; justify-content: space-between; From 32b8dec3abff86774339a967cb9ebc82f4939d8c Mon Sep 17 00:00:00 2001 From: siontion Date: Tue, 27 Feb 2024 09:43:27 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=9B=98=E7=82=B9=20?= =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=B7=B2=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 库存盘点 去除已删除 --- .../heli/controller/admin/material/vo/MaterialRespVO.java | 3 +++ .../mes-ui-admin-vue3/src/views/heli/purchaseorder/edit.vue | 1 - .../mes-ui-admin-vue3/src/views/heli/storagecheck/index.vue | 6 +++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/material/vo/MaterialRespVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/material/vo/MaterialRespVO.java index 5b0b4006..58380b30 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/material/vo/MaterialRespVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/material/vo/MaterialRespVO.java @@ -27,6 +27,9 @@ public class MaterialRespVO { @ExcelProperty("物料名称") private String name; + @Schema(description = "物料名称和编码") + private String codeAndName; + @Schema(description = "品牌") @ExcelProperty("品牌") private String brand; 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 1e0b2341..11c71d5e 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 @@ -361,7 +361,6 @@ const formData = ref({ purchaseNo:undefined, supplierId:undefined, contractNo:undefined, - purchaseNo:undefined, projectMaterialPlanNo: undefined, projectMaterialPlanId: undefined, goodsType: undefined, diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/index.vue index 8d19529c..8ebd2b11 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/index.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/index.vue @@ -21,7 +21,7 @@ - @@ -95,11 +95,11 @@ From 427fd337517ba07a2fa8a3ce735fefceda066b34 Mon Sep 17 00:00:00 2001 From: siontion Date: Tue, 27 Feb 2024 09:47:24 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=89=A9=E6=96=99=E8=BF=9C=E7=A8=8B?= =?UTF-8?q?=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 物料远程搜索 --- .../mes/module/heli/dal/mysql/material/MaterialMapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/material/MaterialMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/material/MaterialMapper.java index 71f92484..935f4a35 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/material/MaterialMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/material/MaterialMapper.java @@ -39,7 +39,7 @@ public interface MaterialMapper extends BaseMapperX { .eq(!StringUtils.isEmpty(reqVO.getVirtualPart()), MaterialDO::getVirtualPart, reqVO.getVirtualPart()); if(!StringUtils.isEmpty(reqVO.getCodeAndName())){ - query.like(MaterialDO::getName, reqVO.getName()).or().like(MaterialDO::getCode, reqVO.getCode()); + query.like(MaterialDO::getName, reqVO.getCodeAndName()).or().like(MaterialDO::getCode, reqVO.getCodeAndName()); } return selectPage(reqVO, query);