From 2bdc2a40e2179a0a72bfa06adf162353ee8aa1b5 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 08 六月 2022 17:10:04 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/基础资料/公用基础资料/xmlLBM_QK_PackingBillList.aspx | 23 ++++++++++++-----------
WebTM/views/生产管理/生产装箱单/QK_PackedBillList.html | 2 +-
WebTM/layuiadmin/Scripts/webConfig.js | 1 +
WebTM/views/模治具管理/器具报表/ReportMaterialReceipt.html | 16 ++++++++--------
WebTM/views/生产管理/生产装箱单/QK_PackingBill.html | 6 ++++--
5 files changed, 26 insertions(+), 22 deletions(-)
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 0e6ed35..29cd12c 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -15,6 +15,7 @@
//var WEBURL = "http://192.168.1.253:8080/API/"; //鍑礉濂堢壒瀹㈡埛鏈嶅姟鍣ㄥ唴缃�
//var WEBURL = "http://220.189.218.154:8092/API/"; //涓镐簳鍥涚淮灏旀湇鍔″櫒
//var WEBURL = "http://192.168.0.214/API/"; //鐟炰笌绁烘湇鍔″櫒
+ //var WEBURL = "http://192.168.10.66/API/"; //妫シ鏈嶅姟鍣�
//var WEBURL = "http://localhost/API/";
return WEBURL
}
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_QK_PackingBillList.aspx" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_QK_PackingBillList.aspx"
index e59843f..4b710c6 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_QK_PackingBillList.aspx"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_QK_PackingBillList.aspx"
@@ -31,17 +31,18 @@
}
else
{
- SqlXMLReportData.GenOneRecordset(this, "select fo.FBILLNO 閿�鍞鍗曞彿,fo.F_ZZZZ_TEXT7 鑱旂郴浜�,fo.FRECEIVEADDRESS 鏀惰揣鏂瑰湴鍧�," +
- "fm1.FOLDNUMBER 閿�鍞墿鏂欏悕绉�,fo.F_ZZZZ_TEXT 鍖呰鏂瑰紡,fu.FDATAVALUE 鑺卞瀷,fu1.FDATAVALUE 澧欏挃缂�,a.HQty 鏁伴噺,a.HRemark 绠卞彿,fo.F_ZZZZ_WBBZ 澶栧寘澶囨敞 " +
- "from Gy_BarCodeBill a " +
- " left join Sc_ICMOBillSub b on a.HSourceEntryID=b.HEntryID and a.HSourceInterID = b.HInterID " +
- "left join AIS20200908101915zs..T_PRD_MOENTRY f1 on b.HERPEntryID=f1.FENTRYID " +
- "left join AIS20200908101915zs..T_SAL_ORDERENTRY fo1 on f1.FSaleOrderEntryId=fo1.FENTRYID " +
- "left join AIS20200908101915zs..T_SAL_ORDER fo on fo1.FID=fo.FID " +
- "LEFT join AIS20200908101915zs..T_BD_MATERIAL fm1 on fo1.FSUBMATERIALNUMBER=fm1.FMATERIALID " +
- "LEFT JOIN AIS20200908101915zs..T_BAS_ASSISTANTDATAENTRY_L fu1 on fo1.F_ZZZZ_ASSISTANT1=fu1.FENTRYID " +
- "LEFT JOIN AIS20200908101915zs..T_BAS_ASSISTANTDATAENTRY_L fu on fo1.F_ZZZZ_ASSISTANT2=fu.FENTRYID "+
- "where a.HItemID in (" + PrintIds + ")");
+ string sql = string.Format(@"select fo.FBILLNO 閿�鍞鍗曞彿,fo.F_ZZZZ_TEXT7 鑱旂郴浜�,fo.FRECEIVEADDRESS 鏀惰揣鏂瑰湴鍧�,
+ fmn.FNAME 閿�鍞墿鏂欏悕绉�,fo.F_ZZZZ_TEXT 鍖呰鏂瑰紡,fu.FDATAVALUE 鑺卞瀷,fu1.FDATAVALUE 澧欏挃缂�,a.HQty 鏁伴噺,a.HRemark 绠卞彿,fo.F_ZZZZ_WBBZ 澶栧寘澶囨敞
+ from Gy_BarCodeBill a
+ left join Sc_ICMOBillSub b on a.HSourceEntryID=b.HEntryID and a.HSourceInterID = b.HInterID
+ left join AIS20200908101915zs..T_PRD_MOENTRY f1 on b.HERPEntryID=f1.FENTRYID
+ left join AIS20200908101915zs..T_SAL_ORDERENTRY fo1 on f1.FSaleOrderEntryId=fo1.FENTRYID
+ left join AIS20200908101915zs..T_SAL_ORDER fo on fo1.FID=fo.FID
+ left join AIS20200908101915zs..T_BD_MATERIAL_L fmn on fo1.FSUBMATERIALNUMBER=fmn.FMATERIALID
+ LEFT JOIN AIS20200908101915zs..T_BAS_ASSISTANTDATAENTRY_L fu1 on fo1.F_ZZZZ_ASSISTANT1=fu1.FENTRYID
+ LEFT JOIN AIS20200908101915zs..T_BAS_ASSISTANTDATAENTRY_L fu on fo1.F_ZZZZ_ASSISTANT2=fu.FENTRYID
+ where a.HItemID in ("+PrintIds+") order by a.HRemark");
+ SqlXMLReportData.GenOneRecordset(this, sql);
}
}
</script>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/ReportMaterialReceipt.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/ReportMaterialReceipt.html"
index 54e03d9..786d0a9 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/ReportMaterialReceipt.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/ReportMaterialReceipt.html"
@@ -337,20 +337,20 @@
cols_arr[0][0] = { checkbox: true, fixed: true, totalRowText: '鍚堣' };
for (var i = 0; i < data.length; i++) {
if (data[i].name == 'HItemID') {
- cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', hide: true }; //闅愯棌id鍒�
+ cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', hide: true, width: 200 }; //闅愯棌id鍒�
}
else {
switch (data[i].Type) {
//int
case 'Int32':
- cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true };
+ cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true, width: 200 };
break;
//Decimal
case 'Decimal':
- cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true };
+ cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true, width: 200};
break;
default:
- cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', sort: true };
+ cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200};
}
}
}
@@ -393,20 +393,20 @@
cols_arr1[0][0] = { checkbox: true, fixed: true, totalRowText: '鍚堣' };
for (var i = 0; i < data.length; i++) {
if (data[i].name == 'HItemID') {
- cols_arr1[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', hide: true }; //闅愯棌id鍒�
+ cols_arr1[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', hide: true, width: 200 }; //闅愯棌id鍒�
}
else {
switch (data[i].Type) {
//int
case 'Int32':
- cols_arr1[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true };
+ cols_arr1[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true, width: 200};
break;
//Decimal
case 'Decimal':
- cols_arr1[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true };
+ cols_arr1[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true, width: 200 };
break;
default:
- cols_arr1[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', sort: true };
+ cols_arr1[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200};
}
}
}
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\243\205\347\256\261\345\215\225/QK_PackedBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\243\205\347\256\261\345\215\225/QK_PackedBillList.html"
index 3d63540..e5da51f 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\243\205\347\256\261\345\215\225/QK_PackedBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\243\205\347\256\261\345\215\225/QK_PackedBillList.html"
@@ -346,7 +346,7 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
var cache=table.cache['mainTable1']
- if (checkStatus.data.length === 0) {
+ if (checkStatus.data.length === 1) {
var HInterID = data[0].hmainid.toString();
//if (cache.length!=0) {
// flag = 1;
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\243\205\347\256\261\345\215\225/QK_PackingBill.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\243\205\347\256\261\345\215\225/QK_PackingBill.html"
index 0714f30..80a30fa 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\243\205\347\256\261\345\215\225/QK_PackingBill.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\243\205\347\256\261\345\215\225/QK_PackingBill.html"
@@ -141,12 +141,13 @@
switch (field) {
case "HMinQty": //鏈�灏忓寘瑁呮暟
value = parseInt(isNaN(value) ? 0 : value);
+ var HSPlanQty = parseInt(isNaN(data.HSPlanQty) ? 0 : data.HSPlanQty);
var HPlanQty = parseInt(isNaN(data.HPlanQty) ? 0 : data.HPlanQty);
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
HMinQty: value, //鏈�灏忓寘瑁呮暟
- HTotalQty: Math.floor(HPlanQty / value), //鐢熸垚鍖呰鏁�=鏁伴噺/鏈�灏忓寘瑁呮暟
- HSpsQty: HPlanQty % value //鍓╀綑鏁伴噺=鏁伴噺%鏈�灏忓寘瑁呮暟
+ HTotalQty: Math.floor(HSPlanQty / value), //鐢熸垚鍖呰鏁�=鏁伴噺/鏈�灏忓寘瑁呮暟
+ HSpsQty: HPlanQty-(HSPlanQty - HSPlanQty % value) //鍓╀綑鏁伴噺=鏁伴噺%鏈�灏忓寘瑁呮暟
});
break;
default:
@@ -171,6 +172,7 @@
, { field: 'HUnitName', title: '璁￠噺鍗曚綅', edit: 'false', width: 100 }
, { field: 'HPlanQty', title: '鏁伴噺', edit: 'false', width: 100 }
+ , { field: 'HSPlanQty', title: '澶勭悊鏁伴噺', edit: 'text', width: 100 }
, { field: 'HMinQty', title: '鏈�灏忓寘瑁呮暟', edit: 'text', event: 'HMinQty', width: 100 }
, { field: 'HTotalQty', title: '鐢熸垚鏉℃暟', edit: 'false', width: 100 }
, { field: 'HSpsQty', title: '鍓╀綑鏁伴噺', edit: 'false', width: 100 }
--
Gitblit v1.9.1