|
|
@@ -12,6 +12,7 @@ class Service{
|
|
|
this.mem_pointer_djcs = -1;
|
|
|
this.qufei = [];
|
|
|
this.qufeiEntry = null;
|
|
|
+ this.jiagongcai = [];
|
|
|
|
|
|
}
|
|
|
|
|
|
@@ -42,6 +43,10 @@ class Service{
|
|
|
}
|
|
|
this.qufei = result;
|
|
|
}
|
|
|
+ setJiagongcai(data) {
|
|
|
+
|
|
|
+ this.jiagongcai = data;
|
|
|
+ }
|
|
|
|
|
|
setQufeiEntry(bh) {
|
|
|
this.qufeiEntry = this.qufei.filter(x=>x['key'] == bh)[0];
|
|
|
@@ -720,6 +725,27 @@ async generateQingdanTuijian(name, bh, bt, bm) {
|
|
|
return data;
|
|
|
}
|
|
|
}
|
|
|
+ async generateJiagongcai(name) {
|
|
|
+ const response = await fetch(this.ip().concat( "/jiagongcai/"), {
|
|
|
+ method : "POST",
|
|
|
+ headers: {
|
|
|
+ "Content-type": "application/json"
|
|
|
+ },
|
|
|
+ body: JSON.stringify(
|
|
|
+ {
|
|
|
+
|
|
|
+ "name": name
|
|
|
+ }
|
|
|
+ )
|
|
|
+ });
|
|
|
+ if (!response.ok) {
|
|
|
+ //const error = await response.json();
|
|
|
+ console.error('error');
|
|
|
+ } else {
|
|
|
+ const data = await response.json();
|
|
|
+ return data;
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
async save_djcs() {
|
|
|
const response = await fetch(this.ip().concat( "/savedjcs/"), {
|
|
|
@@ -1967,9 +1993,25 @@ async generateQingdanTuijian(name, bh, bt, bm) {
|
|
|
'', '', '', '' ]);
|
|
|
}
|
|
|
for(let i = 0; i < res['clde'].length; i++) {
|
|
|
- dercj.push(['', res['clde'][i]['CLBH'], res['clde'][i]['CLMC'], '', res['clde'][i]['JLDW'],
|
|
|
- res['clde'][i]['YSJG'], '', '', '2', '', res['clde'][i]['SL'], res['clde'][i]['HJ'],
|
|
|
+ let hit = false;
|
|
|
+ let jg = null;
|
|
|
+ let bh = res['clde'][i]['CLBH'];
|
|
|
+ for(let j = 0; j < this.jiagongcai.length; j++) {
|
|
|
+ if (this.jiagongcai[j]['材料编号'] == bh) {
|
|
|
+ hit = true;
|
|
|
+ jg = this.jiagongcai[j]['单价'];
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (hit) {
|
|
|
+ dercj.push(['', res['clde'][i]['CLBH'], res['clde'][i]['CLMC'], '', res['clde'][i]['JLDW'],
|
|
|
+ jg, '', '', '2', 'true', res['clde'][i]['SL'], res['clde'][i]['HJ'],
|
|
|
+ '', '', '', '' ]);
|
|
|
+ } else {
|
|
|
+ dercj.push(['', res['clde'][i]['CLBH'], res['clde'][i]['CLMC'], '', res['clde'][i]['JLDW'],
|
|
|
+ res['clde'][i]['YSJG'], '', '', '2', 'false', res['clde'][i]['SL'], res['clde'][i]['HJ'],
|
|
|
'', '', '', '' ]);
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
for(let i = 0; i < res['jxde'].length; i++) {
|
|
|
dercj.push(['', res['jxde'][i]['jxbh'], res['jxde'][i]['jxmc'], '', res['jxde'][i]['DW'],
|
|
|
@@ -2044,9 +2086,25 @@ async generateQingdanTuijian(name, bh, bt, bm) {
|
|
|
'', '', '', '' ]);
|
|
|
}
|
|
|
for(let i = 0; i < res['clde'].length; i++) {
|
|
|
- dercj.push(['', res['clde'][i]['CLBH'], res['clde'][i]['CLMC'], '', res['clde'][i]['JLDW'],
|
|
|
- res['clde'][i]['YSJG'], '', '', '2', '', res['clde'][i]['SL'], res['clde'][i]['HJ'],
|
|
|
+ let hit = false;
|
|
|
+ let jg = null;
|
|
|
+ let bh = res['clde'][i]['CLBH'];
|
|
|
+ for(let j = 0; j < this.jiagongcai.length; j++) {
|
|
|
+ if (this.jiagongcai[j]['材料编号'] == bh) {
|
|
|
+ hit = true;
|
|
|
+ jg = this.jiagongcai[j]['单价'];
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (hit) {
|
|
|
+ dercj.push(['', res['clde'][i]['CLBH'], res['clde'][i]['CLMC'], '', res['clde'][i]['JLDW'],
|
|
|
+ jg, '', '', '2', 'true', res['clde'][i]['SL'], res['clde'][i]['HJ'],
|
|
|
'', '', '', '' ]);
|
|
|
+ } else {
|
|
|
+ dercj.push(['', res['clde'][i]['CLBH'], res['clde'][i]['CLMC'], '', res['clde'][i]['JLDW'],
|
|
|
+ res['clde'][i]['YSJG'], '', '', '2', 'false', res['clde'][i]['SL'], res['clde'][i]['HJ'],
|
|
|
+ '', '', '', '' ]);
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
for(let i = 0; i < res['jxde'].length; i++) {
|
|
|
dercj.push(['', res['jxde'][i]['jxbh'], res['jxde'][i]['jxmc'], '', res['jxde'][i]['DW'],
|