部门领料单，退料单，物料单详情接口合并

erp-produce/src/main/resources/template/js/erpPick/erpPatchDetails.js

@@ -14,8 +14,9 @@ layui.config({
  		showGrid({
 			id: "showForm",
 			url: flowableBasePath + "erppick007",
-			params: {rowId: parent.rowId},
+			params: {id: parent.rowId},
 			pagination: false,
+			method: 'GET',
 			template: $("#useTemplate").html(),
 			ajaxSendLoadBefore: function(hdb) {
 				hdb.registerHelper('compare1', function(v1, v2, options) {

erp-produce/src/main/resources/template/js/erpPick/erpPatchEdit.js

@@ -38,7 +38,7 @@ layui.config({
 		});
 
  		function loadData(){
-			AjaxPostUtil.request({url:flowableBasePath + "erppick010", params: {rowId: parent.rowId}, type: 'json', callback: function (json) {
+			AjaxPostUtil.request({url:flowableBasePath + "erppick007", params: {id: parent.rowId}, type: 'json', method: 'GET', callback: function (json) {
 				var data = json.bean;
 				if (!isNull(data.machinId)){
 					$("#machinOrder").val(data.machinNum);
@@ -59,7 +59,7 @@ layui.config({
 					$("#unitId" + (rowNum - 1)).html(getDataUseHandlebars(selOption, {rows: item.unitList}));
 					$("#unitId" + (rowNum - 1)).val(item.normsId);
 					//商品回显
-					$("#materialId" + (rowNum - 1)).val(item.productName + "(" + item.productModel + ")");
+					$("#materialId" + (rowNum - 1)).val(item.materialName + "(" + item.materialModel + ")");
 					$("#currentTock" + (rowNum - 1)).html(item.currentTock);//库存回显
 					//补充数量
 					$("#rkNum" + (rowNum - 1)).val(item.needNumber);

erp-produce/src/main/resources/template/js/erpPick/erpRequisitionDetails.js

@@ -14,8 +14,9 @@ layui.config({
  		showGrid({
 			id: "showForm",
 			url: flowableBasePath + "erppick007",
-			params: {rowId: parent.rowId},
+			params: {id: parent.rowId},
 			pagination: false,
+			method: 'GET',
 			template: $("#useTemplate").html(),
 			ajaxSendLoadBefore: function(hdb) {
 				hdb.registerHelper('compare1', function(v1, v2, options) {

erp-produce/src/main/resources/template/js/erpPick/erpRequisitionEdit.js

@@ -39,7 +39,7 @@ layui.config({
 		});
 
  		function loadData(){
-			AjaxPostUtil.request({url:flowableBasePath + "erppick005", params: {id: parent.rowId}, type: 'json', method: 'GET', callback: function (json) {
+			AjaxPostUtil.request({url:flowableBasePath + "erppick007", params: {id: parent.rowId}, type: 'json', method: 'GET', callback: function (json) {
 				var data = json.bean;
 				if (!isNull(data.machinId)){
 					$("#machinOrder").val(data.machinNum);

erp-produce/src/main/resources/template/js/erpPick/erpReturnDetails.js

@@ -14,8 +14,9 @@ layui.config({
  		showGrid({
 			id: "showForm",
 			url: flowableBasePath + "erppick007",
-			params: {rowId: parent.rowId},
+			params: {id: parent.rowId},
 			pagination: false,
+			method: 'GET',
 			template: $("#useTemplate").html(),
 			ajaxSendLoadBefore: function(hdb) {
 				hdb.registerHelper('compare1', function(v1, v2, options) {

erp-produce/src/main/resources/template/js/erpPick/erpReturnEdit.js

@@ -36,7 +36,7 @@ layui.config({
 		});
 
  		function loadData(){
-			AjaxPostUtil.request({url:flowableBasePath + "erppick013", params: {rowId: parent.rowId}, type: 'json', callback: function (json) {
+			AjaxPostUtil.request({url: flowableBasePath + "erppick007", params: {id: parent.rowId}, type: 'json', method: 'GET', callback: function (json) {
 				var data = json.bean;
 				$("#depotId").val(data.depotId);
 				$("#operTime").val(data.operTime);
@@ -50,7 +50,7 @@ layui.config({
 					$("#unitId" + (rowNum - 1)).html(getDataUseHandlebars(selOption, {rows: item.unitList}));
 					$("#unitId" + (rowNum - 1)).val(item.normsId);
 					//商品回显
-					$("#materialId" + (rowNum - 1)).val(item.productName + "(" + item.productModel + ")");
+					$("#materialId" + (rowNum - 1)).val(item.materialName + "(" + item.materialModel + ")");
 					$("#currentTock" + (rowNum - 1)).html(item.currentTock);//库存回显
 					//退料数量
 					$("#rkNum" + (rowNum - 1)).val(item.needNumber);

erp-produce/src/main/resources/template/tpl/erpPick/erpPatchDetails.html

@@ -74,7 +74,7 @@
 		                <tbody id="useTable" class="insurance-table">
 		                	{{#each items}}
 			                	<tr>
-									<td>{{productName}}({{productModel}})</td>
+									<td>{{materialName}}({{materialModel}})</td>
 									<td>{{unitName}}</td>
 									<td>{{needNumber}}</td>
 									<td>{{unitPrice}}</td>

erp-produce/src/main/resources/template/tpl/erpPick/erpRequisitionDetails.html

@@ -74,7 +74,7 @@
 		                <tbody id="useTable" class="insurance-table">
 		                	{{#each items}}
 			                	<tr>
-									<td>{{productName}}({{productModel}})</td>
+									<td>{{materialName}}({{materialModel}})</td>
 									<td>{{unitName}}</td>
 									<td>{{needNumber}}</td>
 									<td>{{unitPrice}}</td>

erp-produce/src/main/resources/template/tpl/erpPick/erpReturnDetails.html

@@ -68,7 +68,7 @@
 		                <tbody id="useTable" class="insurance-table">
 		                	{{#each items}}
 			                	<tr>
-									<td>{{productName}}({{productModel}})</td>
+									<td>{{materialName}}({{materialModel}})</td>
 									<td>{{unitName}}</td>
 									<td>{{needNumber}}</td>
 									<td>{{unitPrice}}</td>