|
|
@@ -2322,7 +2322,10 @@
|
|
|
// 装配页面,加载BOM
|
|
|
if (request('modeltype') == -5) {
|
|
|
var bomData = $.ajax({ url: 'api/GetBOMData.ashx?barCode=' + barcode + '&procedureId=' + procedureId, dataType: "json", type: "get" });
|
|
|
- var logoData = $.ajax({ url: 'api/GetLogoData.ashx?barCode=' + barcode, dataType: "json", type: "get" });
|
|
|
+ //暂时注释,附件绑定不查询生产计划
|
|
|
+ //var logoData = $.ajax({ url: 'api/GetLogoData.ashx?barCode=' + barcode, dataType: "json", type: "get" });
|
|
|
+ var logoData = $.ajax({ url: 'api/GetLogoDataByFJBD.ashx?barCode=' + barcode, dataType: "json", type: "get" });
|
|
|
+ //暂时注释,附件绑定不查询生产计划
|
|
|
|
|
|
$.when(bomData, logoData, bindIdnrkData).then(
|
|
|
function (jsonBOMData, jsonLogoData, jsonBindIdnrkData) {
|
|
|
@@ -3629,7 +3632,10 @@
|
|
|
// 装配页面,加载BOM
|
|
|
if (request('modeltype') == -5) {
|
|
|
var bomData = $.ajax({ url: 'api/GetBOMData.ashx?barCode=' + barcode + '&procedureId=' + procedureId, dataType: "json", type: "get" });
|
|
|
- var logoData = $.ajax({ url: 'api/GetLogoData.ashx?barCode=' + barcode, dataType: "json", type: "get" });
|
|
|
+ //暂时注释,附件绑定不查询生产计划
|
|
|
+ //var logoData = $.ajax({ url: 'api/GetLogoData.ashx?barCode=' + barcode, dataType: "json", type: "get" });
|
|
|
+ var logoData = $.ajax({ url: 'api/GetLogoDataByFJBD.ashx?barCode=' + barcode, dataType: "json", type: "get" });
|
|
|
+ //暂时注释,附件绑定不查询生产计划
|
|
|
|
|
|
$.when(bomData, logoData, bindIdnrkData).then(
|
|
|
function (jsonBOMData, jsonLogoData, jsonBindIdnrkData) {
|
|
|
@@ -4807,7 +4813,10 @@
|
|
|
// 装配页面,加载BOM
|
|
|
if (request('modeltype') == -5) {
|
|
|
var bomData = $.ajax({ url: 'api/GetBOMData.ashx?barCode=' + barcode + '&procedureId=' + procedureId, dataType: "json", type: "get" });
|
|
|
- var logoData = $.ajax({ url: 'api/GetLogoData.ashx?barCode=' + barcode, dataType: "json", type: "get" });
|
|
|
+ //暂时注释,附件绑定不查询生产计划
|
|
|
+ //var logoData = $.ajax({ url: 'api/GetLogoData.ashx?barCode=' + barcode, dataType: "json", type: "get" });
|
|
|
+ var logoData = $.ajax({ url: 'api/GetLogoDataByFJBD.ashx?barCode=' + barcode, dataType: "json", type: "get" });
|
|
|
+ //暂时注释,附件绑定不查询生产计划
|
|
|
|
|
|
$.when(bomData, logoData, bindIdnrkData).then(
|
|
|
function (jsonBOMData, jsonLogoData, jsonBindIdnrkData) {
|