From c674882ab752ac038bea83e09aaa156a067a1947 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期五, 20 五月 2022 23:02:08 +0800
Subject: [PATCH] nothing
---
WebTM/views/基础资料/公用基础资料/xmlLBM_QK_PackingBillList.aspx | 12 +++---
WebTM/views/生产管理/报工台工序/开工/Sc_Add_MESBeginStepWorkBillList.html | 29 ++++++++++++++
WebTM/views/生产管理/生产装箱单/QK_PackedBillList.html | 9 ++--
WebTM/Vlog/webapi20220518.txt | 1
WebTM/views/基础资料/公用基础资料/HBarPlanPrint.html | 5 --
WebTM/Vlog/webapi20220517.txt | 1
WebTM/views/生产管理/生产装箱单/QK_PackingBill.html | 17 +++++---
7 files changed, 51 insertions(+), 23 deletions(-)
diff --git a/WebTM/Vlog/webapi20220517.txt b/WebTM/Vlog/webapi20220517.txt
new file mode 100644
index 0000000..572735a
--- /dev/null
+++ b/WebTM/Vlog/webapi20220517.txt
@@ -0,0 +1 @@
+2022/5/17 13:44:42 鎵撳嵃sql:select fo.FBILLNO 閿�鍞鍗曞彿,fo.F_ZZZZ_TEXT7 鑱旂郴浜�,fo.FRECEIVEADDRESS 鏀惰揣鏂瑰湴鍧�,fm1.FOLDNUMBER 閿�鍞墿鏂欏悕绉�,fo.F_ZZZZ_TEXT 鍖呰鏂瑰紡,fu.FDATAVALUE 鑺卞瀷,fu1.FDATAVALUE 澧欏挃缂�,a.HQty 鏁伴噺,a.HBarCode 绠卞彿,fo.F_ZZZZ_WBBZ 澶栧寘澶囨敞 from Gy_BarCodeBill a left join Sc_ICMOBillSub b on a.HSourceInterID=b.HInterID left join AIS20200908101915zs..T_PRD_MOENTRY f1 on b.HERPEntryID=f1.FENTRYID left join AIS20200908101915zs..T_SAL_ORDER fo on f1.FSaleOrderId =fo.FID left join AIS20200908101915zs..T_SAL_ORDERENTRY fo1 on fo.FID=fo1.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 ('30983')
diff --git a/WebTM/Vlog/webapi20220518.txt b/WebTM/Vlog/webapi20220518.txt
new file mode 100644
index 0000000..4ccabd2
--- /dev/null
+++ b/WebTM/Vlog/webapi20220518.txt
@@ -0,0 +1 @@
+2022/5/18 10:46:56 鎵撳嵃sql:select fo.FBILLNO 閿�鍞鍗曞彿,fo.F_ZZZZ_TEXT7 鑱旂郴浜�,fo.FRECEIVEADDRESS 鏀惰揣鏂瑰湴鍧�,fm1.FOLDNUMBER 閿�鍞墿鏂欏悕绉�,fo.F_ZZZZ_TEXT 鍖呰鏂瑰紡,fu.FDATAVALUE 鑺卞瀷,fu1.FDATAVALUE 澧欏挃缂�,a.HQty 鏁伴噺,a.HBarCode 绠卞彿,fo.F_ZZZZ_WBBZ 澶栧寘澶囨敞 from Gy_BarCodeBill a left join Sc_ICMOBillSub b on a.HSourceInterID=b.HInterID left join AIS20200908101915zs..T_PRD_MOENTRY f1 on b.HERPEntryID=f1.FENTRYID left join AIS20200908101915zs..T_SAL_ORDER fo on f1.FSaleOrderId =fo.FID left join AIS20200908101915zs..T_SAL_ORDERENTRY fo1 on fo.FID=fo1.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 ('6932','6932')
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/HBarPlanPrint.html" "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/HBarPlanPrint.html"
index 715eca4..b1ecffd 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/HBarPlanPrint.html"
+++ "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/HBarPlanPrint.html"
@@ -60,10 +60,7 @@
var Type = params[params[1]];
var OpenTmp = params[params[2]];
- if (OpenTmp =="澧欏挃鏉＄爜") {
- Type += "1";
- }
-
+
switch (Type) {
//case "HBarCodePrint"://鐗╂枡鏉＄爜鎵撳嵃
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 b73c6f5..e59843f 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"
@@ -27,18 +27,18 @@
if (type.Trim()=="澧欏挃鏉＄爜")
{
- SqlXMLReportData.GenOneRecordset(this, "select HSourceBillNo 璁㈠崟鍙�,a.HMaterID,m.HName 鐗╂枡,m.HModel 鍨嬪彿,a.HQty 鏁伴噺,a.HBatchNo 鎵瑰彿,a.HBarCode 绠卞彿,a.HRemark 鍦烘櫙鍙� from Gy_BarCodeBill a left join Gy_Material m on a.HMaterID=m.HItemID where a.HItemID in (" + PrintIds + ")");
+ SqlXMLReportData.GenOneRecordset(this, "select HSourceBillNo 璁㈠崟鍙�,a.HMaterID,m.HName 鐗╂枡,m.HModel 鍨嬪彿,a.HQty 鏁伴噺,a.HBatchNo 鎵瑰彿,a.HRemark 绠卞彿,a.HRemark 鍦烘櫙鍙� from Gy_BarCodeBill a left join Gy_Material m on a.HMaterID=m.HItemID where a.HItemID in (" + PrintIds + ")");
}
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.HBarCode 绠卞彿,fo.F_ZZZZ_WBBZ 澶栧寘澶囨敞 " +
+ "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.HSourceInterID=b.HInterID " +
+ " 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_ORDER fo on f1.FSaleOrderId =fo.FID " +
- "left join AIS20200908101915zs..T_SAL_ORDERENTRY fo1 on fo.FID=fo1.FID " +
- "left join AIS20200908101915zs..T_BD_MATERIAL fm1 on fo1.FSUBMATERIALNUMBER=fm1.FMATERIALID " +
+ "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 + ")");
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_Add_MESBeginStepWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_Add_MESBeginStepWorkBillList.html"
index 5cdb0ae..fe6846d 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_Add_MESBeginStepWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_Add_MESBeginStepWorkBillList.html"
@@ -110,7 +110,7 @@
<div class="layui-input-inline">
<input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" disabled autocomplete="off">
<input id="HInterID" name="HInterID" type="hidden" />
-
+
</div>
</div>
<div class="layui-inline">
@@ -234,6 +234,28 @@
<input class="layui-input" name="HICMOBillNo" lay-verify="HICMOBillNo" id="HICMOBillNo" autocomplete="off">
<input id="HICMOInterID" name="HICMOInterID" type="hidden" />
<input id="HICMOEntryID" name="HICMOEntryID" type="hidden" />
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">閿�鍞鍗曞彿:</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="F_YQN_XSDD" lay-verify="F_YQN_XSDD" id="F_YQN_XSDD" disabled autocomplete="off">
+
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">閿�鍞墿鏂欏悕绉�:</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="F_zzzz_Text4" lay-verify="F_zzzz_Text4" id="F_zzzz_Text4" disabled autocomplete="off">
+
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">閿�鍞暟閲�:</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="FQTY" lay-verify="FQTY" id="FQTY" disabled autocomplete="off">
</div>
</div>
</div>
@@ -447,6 +469,7 @@
$("#HMainSourceInterID").val("");
$("#HMainSourceEntryID").val("");
$("#HMainSourceBillNo").val("");
+ $('#HMainSourceBillNo').attr("readonly", true);
$("#HMainSourceBillType").val("");
$('#HMainSourceBillNo').attr("disabled", false);
$('#XDHList').addClass("layui-btn-disabled").attr("disabled", true);
@@ -487,6 +510,9 @@
, "HICMOInterID": "0"
, "HICMOEntryID": "0"
, "HICMOBillNo": "0"
+ , "F_YQN_XSDD": data.閿�鍞鍗曠紪鍙�
+ , "F_zzzz_Text4": data.閿�鍞墿鏂欏悕绉�
+ , "FQTY": data.閿�鍞暟閲�
});
$("#HMainSourceBillNo").css("box-shadow", "none");
$("#HProcID").val(0);
@@ -1059,6 +1085,7 @@
return Result = false;
}
if ($("#HGroupID").val() == '' || $("#HGroupID").val() == null) {
+ $("#HGroupID").val(0);
layer.msg("鐝粍涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
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 2e6ca33..3d63540 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"
@@ -314,7 +314,6 @@
layer.msg('璇烽�夋嫨鑷冲皯涓�琛屾暟鎹墦鍗帮紒');
}
}
-
//鎵撳嵃
function get_PrintReport() {
var checkStatus = table.checkStatus('mainTable')
@@ -347,11 +346,11 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
var cache=table.cache['mainTable1']
- if (checkStatus.data.length === 1) {
+ if (checkStatus.data.length === 0) {
var HInterID = data[0].hmainid.toString();
- if (cache.length!=0) {
- flag = 1;
- }
+ //if (cache.length!=0) {
+ // flag = 1;
+ //}
//閫昏緫鍒犻櫎鏂规硶
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
$.ajax({
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 8eba67b..1252363 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"
@@ -109,16 +109,14 @@
});
//鏁寸鐢熸垚
form.on('submit(btnPack)', function (data) {
- var flag = "ZZ";
var sSubStr = table.checkStatus('mainTable');
if (sSubStr.data.length > 0) {
- SavePack(flag, sSubStr);
+ SavePack(sSubStr);
}
else {
layer.msg('璇锋渶灏戦�夋嫨1琛屾暟鎹紒');
return;
}
- SavePack(flag, sSubStr);
});
//鎷肩鐢熸垚
form.on('submit(btnAssembly)', function (data) {
@@ -177,6 +175,7 @@
, { field: 'HMinQty', title: '鏈�灏忓寘瑁呮暟', edit: 'text', event: 'HMinQty', width: 100 }
, { field: 'HTotalQty', title: '鐢熸垚鏉℃暟', edit: 'false', width: 100 }
, { field: 'HSpsQty', title: '鍓╀綑鏁伴噺', edit: 'false', width: 100 }
+ , { field: 'HXH', title: '绠卞彿', edit: 'false', width: 100 }
, { field: 'FBillNo', title: '閿�鍞鍗曞彿', edit: 'false', width: 100 }
, { field: 'FLXName', title: '鑱旂郴浜�', edit: 'text', width: 100 }
@@ -213,7 +212,7 @@
table.render(option);
}
//鐢熸垚
- function SavePack(flag, sSubStr) {
+ function SavePack(sSubStr) {
if (!AllowLoadData(sSubStr))//鏁版嵁楠岃瘉
{
return false;
@@ -223,7 +222,7 @@
type: "POST",
url: GetWEBURL() + "/Sc_ICMOBill/QK_PackingBillSavePack", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
async: true,
- data: { "msg": JSON.stringify(sSubStr.data) + ";" + sessionStorage["HUserName"] + ";" + flag + ";" + sessionStorage["OrganizationID"]},
+ data: { "msg": JSON.stringify(sSubStr.data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"]},
dataType: "json",
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
@@ -237,8 +236,8 @@
else {
OpenTmp = "鍖呰鏂瑰紡鏉＄爜";
}
- window.open("../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + PrintIds.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());
-
+ window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + PrintIds.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());
+
}
else {
f_alert(data.Message);
@@ -262,6 +261,10 @@
layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鏈�灏忓寘瑁呮暟涓嶈兘涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
+ if (sSubStr.data[i].HXH == "") {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,绠卞彿涓嶈兘涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
}
}
else {
--
Gitblit v1.9.1