From 518831dac5bc34eb4c93b6c27aa091a7cd218d02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Tue, 15 Dec 2020 23:24:01 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E5=8D=95=E6=8D=AE=E7=9A=84=E5=95=86?=
=?UTF-8?q?=E5=93=81=E9=80=89=E6=8B=A9=E5=A2=9E=E5=8A=A0=E7=B1=BB=E5=88=AB?=
=?UTF-8?q?=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
erp_web/js/pages/bill/in_out.js | 10 ++++++++++
erp_web/pages/bill/allocation_out_list.html | 11 ++++++++---
erp_web/pages/bill/assemble_list.html | 11 ++++++++---
erp_web/pages/bill/disassemble_list.html | 11 ++++++++---
erp_web/pages/bill/other_in_list.html | 11 ++++++++---
erp_web/pages/bill/other_out_list.html | 11 ++++++++---
erp_web/pages/bill/purchase_back_list.html | 11 ++++++++---
erp_web/pages/bill/purchase_in_list.html | 11 ++++++++---
erp_web/pages/bill/purchase_orders_list.html | 11 ++++++++---
erp_web/pages/bill/retail_back_list.html | 11 ++++++++---
erp_web/pages/bill/retail_out_list.html | 11 ++++++++---
erp_web/pages/bill/sale_back_list.html | 11 ++++++++---
erp_web/pages/bill/sale_orders_list.html | 11 ++++++++---
erp_web/pages/bill/sale_out_list.html | 11 ++++++++---
.../com/jsh/erp/controller/MaterialController.java | 1 +
.../datasource/mappers/MaterialCategoryMapperEx.java | 2 +-
src/main/resources/mapper_xml/MaterialMapperEx.xml | 8 +++++---
17 files changed, 121 insertions(+), 43 deletions(-)
diff --git a/erp_web/js/pages/bill/in_out.js b/erp_web/js/pages/bill/in_out.js
index 4cca87e8..e939af6a 100644
--- a/erp_web/js/pages/bill/in_out.js
+++ b/erp_web/js/pages/bill/in_out.js
@@ -1293,6 +1293,7 @@
{field: 'id',width:35,align:"center",checkbox:true},
{field: 'mBarCode', title: '条码', width: 120},
{field: 'name', title: '名称', width: 140},
+ {field: 'categoryName', title: '类别', width: 80},
{field: 'standard', title: '规格', width: 80},
{field: 'model', title: '型号', width: 80},
{field: 'unit', title: '单位', width: 60},
@@ -1338,6 +1339,7 @@
url: "/material/findBySelect",
dataType: "json",
data: ({
+ categoryId: $("#searchMaterialCategory").combotree("getValue"),
q: $("#searchBarCode").textbox("getValue"),
mpList: mPropertyList,
depotId: depotId,
@@ -1372,6 +1374,14 @@
pageSize: initPageSize
});
});
+ //重置按钮
+ $("#searchMaterialResetBtn").unbind().bind({
+ click: function () {
+ $("#searchMaterialCategory").combotree("setValue","");
+ $("#searchBarCode").textbox("setValue","");
+ $("#searchMaterialBtn").click();
+ }
+ });
$("#appendMaterial").off("click").on("click",function(){
js.addTabPage(null, "商品信息", "/pages/materials/material.html");
});
diff --git a/erp_web/pages/bill/allocation_out_list.html b/erp_web/pages/bill/allocation_out_list.html
index 6b33ea8b..f54f1787 100644
--- a/erp_web/pages/bill/allocation_out_list.html
+++ b/erp_web/pages/bill/allocation_out_list.html
@@ -136,15 +136,20 @@
closed="true" modal="true" buttons="#materialSelectDlgBtn" cache="false" collapsible="false" closable="true">
diff --git a/erp_web/pages/bill/assemble_list.html b/erp_web/pages/bill/assemble_list.html
index 88501974..d1ed52b4 100644
--- a/erp_web/pages/bill/assemble_list.html
+++ b/erp_web/pages/bill/assemble_list.html
@@ -136,15 +136,20 @@
closed="true" modal="true" buttons="#materialSelectDlgBtn" cache="false" collapsible="false" closable="true">
diff --git a/erp_web/pages/bill/disassemble_list.html b/erp_web/pages/bill/disassemble_list.html
index 7055b8f9..138bb43b 100644
--- a/erp_web/pages/bill/disassemble_list.html
+++ b/erp_web/pages/bill/disassemble_list.html
@@ -136,15 +136,20 @@
closed="true" modal="true" buttons="#materialSelectDlgBtn" cache="false" collapsible="false" closable="true">
diff --git a/erp_web/pages/bill/other_in_list.html b/erp_web/pages/bill/other_in_list.html
index 59887f78..e88e49c9 100644
--- a/erp_web/pages/bill/other_in_list.html
+++ b/erp_web/pages/bill/other_in_list.html
@@ -151,15 +151,20 @@
closed="true" modal="true" buttons="#materialSelectDlgBtn" cache="false" collapsible="false" closable="true">
diff --git a/erp_web/pages/bill/other_out_list.html b/erp_web/pages/bill/other_out_list.html
index e4fb4b8a..4e54f07f 100644
--- a/erp_web/pages/bill/other_out_list.html
+++ b/erp_web/pages/bill/other_out_list.html
@@ -145,15 +145,20 @@
closed="true" modal="true" buttons="#materialSelectDlgBtn" cache="false" collapsible="false" closable="true">
diff --git a/erp_web/pages/bill/purchase_back_list.html b/erp_web/pages/bill/purchase_back_list.html
index f2b85d04..939ec80b 100644
--- a/erp_web/pages/bill/purchase_back_list.html
+++ b/erp_web/pages/bill/purchase_back_list.html
@@ -272,15 +272,20 @@
closed="true" modal="true" buttons="#materialSelectDlgBtn" cache="false" collapsible="false" closable="true">
diff --git a/erp_web/pages/bill/purchase_in_list.html b/erp_web/pages/bill/purchase_in_list.html
index 26bab611..ff1599ce 100644
--- a/erp_web/pages/bill/purchase_in_list.html
+++ b/erp_web/pages/bill/purchase_in_list.html
@@ -300,15 +300,20 @@
closed="true" modal="true" buttons="#materialSelectDlgBtn" cache="false" collapsible="false" closable="true">
diff --git a/erp_web/pages/bill/purchase_orders_list.html b/erp_web/pages/bill/purchase_orders_list.html
index b27f84cb..a7c2e5dd 100644
--- a/erp_web/pages/bill/purchase_orders_list.html
+++ b/erp_web/pages/bill/purchase_orders_list.html
@@ -200,15 +200,20 @@
closed="true" modal="true" buttons="#materialSelectDlgBtn" cache="false" collapsible="false" closable="true">
diff --git a/erp_web/pages/bill/retail_back_list.html b/erp_web/pages/bill/retail_back_list.html
index c1f476a9..ed28fafa 100644
--- a/erp_web/pages/bill/retail_back_list.html
+++ b/erp_web/pages/bill/retail_back_list.html
@@ -212,15 +212,20 @@
closed="true" modal="true" buttons="#materialSelectDlgBtn" cache="false" collapsible="false" closable="true">
diff --git a/erp_web/pages/bill/retail_out_list.html b/erp_web/pages/bill/retail_out_list.html
index 7c251f67..69094772 100644
--- a/erp_web/pages/bill/retail_out_list.html
+++ b/erp_web/pages/bill/retail_out_list.html
@@ -249,15 +249,20 @@
closed="true" modal="true" buttons="#materialSelectDlgBtn" cache="false" collapsible="false" closable="true">
diff --git a/erp_web/pages/bill/sale_back_list.html b/erp_web/pages/bill/sale_back_list.html
index 0741c1e2..fd982709 100644
--- a/erp_web/pages/bill/sale_back_list.html
+++ b/erp_web/pages/bill/sale_back_list.html
@@ -273,15 +273,20 @@
closed="true" modal="true" buttons="#materialSelectDlgBtn" cache="false" collapsible="false" closable="true">
diff --git a/erp_web/pages/bill/sale_orders_list.html b/erp_web/pages/bill/sale_orders_list.html
index 7572314b..59d7a399 100644
--- a/erp_web/pages/bill/sale_orders_list.html
+++ b/erp_web/pages/bill/sale_orders_list.html
@@ -202,15 +202,20 @@
closed="true" modal="true" buttons="#materialSelectDlgBtn" cache="false" collapsible="false" closable="true">
diff --git a/erp_web/pages/bill/sale_out_list.html b/erp_web/pages/bill/sale_out_list.html
index 6a77a988..1999be16 100644
--- a/erp_web/pages/bill/sale_out_list.html
+++ b/erp_web/pages/bill/sale_out_list.html
@@ -300,15 +300,20 @@
closed="true" modal="true" buttons="#materialSelectDlgBtn" cache="false" collapsible="false" closable="true">
diff --git a/src/main/java/com/jsh/erp/controller/MaterialController.java b/src/main/java/com/jsh/erp/controller/MaterialController.java
index d2085027..f2e90c12 100644
--- a/src/main/java/com/jsh/erp/controller/MaterialController.java
+++ b/src/main/java/com/jsh/erp/controller/MaterialController.java
@@ -209,6 +209,7 @@ public class MaterialController {
}
MaterialName = MaterialName + expand + ((material.getCommodityUnit() == null || material.getCommodityUnit().equals("")) ? "" : "(" + material.getCommodityUnit() + ")") + ratio;
item.put("MaterialName", MaterialName);
+ item.put("categoryName", material.getCategoryName());
item.put("name", material.getName());
item.put("expand", expand);
item.put("model", material.getModel());
diff --git a/src/main/java/com/jsh/erp/datasource/mappers/MaterialCategoryMapperEx.java b/src/main/java/com/jsh/erp/datasource/mappers/MaterialCategoryMapperEx.java
index 91f9f4ea..f609c4c8 100644
--- a/src/main/java/com/jsh/erp/datasource/mappers/MaterialCategoryMapperEx.java
+++ b/src/main/java/com/jsh/erp/datasource/mappers/MaterialCategoryMapperEx.java
@@ -38,5 +38,5 @@ public interface MaterialCategoryMapperEx {
List getMaterialCategoryListByCategoryIds(@Param("parentIds") String[] categoryIds);
- List getListByParentId(Long parentId);
+ List getListByParentId(@Param("parentId") Long parentId);
}
diff --git a/src/main/resources/mapper_xml/MaterialMapperEx.xml b/src/main/resources/mapper_xml/MaterialMapperEx.xml
index 932244db..5935e915 100644
--- a/src/main/resources/mapper_xml/MaterialMapperEx.xml
+++ b/src/main/resources/mapper_xml/MaterialMapperEx.xml
@@ -99,12 +99,14 @@