From 5127038d4716728cf1b7f291dfc0dfa9e2c58f9d Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期二, 20 七月 2021 17:08:34 +0800
Subject: [PATCH] 20210720v1
---
WebTM/views/生产管理/生产汇报单/Sc_Add_ICMOReportBillList.html | 17 ++++++++
WebTM/views/验收入库/其他入库/Kf_OtherInBill_Fast.html | 8 ++--
WebTM/views/生产管理/生产停工单/Sc_Add_MESStopWorkBillList.html | 5 ++
WebTM/views/验收入库/委外入库/Kf_EntrustInBill_Fast.html | 4 +-
WebTM/views/生产管理/产量汇报单/Sc_ProductReportBillList.html | 4 +-
WebTM/views/生产管理/产量汇报单/Sc_Add_ProductReportBillList.html | 37 +++++++++++-------
WebTM/views/IpadIndex.html | 24 +++++++-----
WebTM/views/领料发货/其他出库/Kf_OtherOutBill_Fast.html | 2
WebTM/views/index.html | 2
WebTM/views/生产管理/生产开工单/Sc_Add_MESBeginWorkBillList.html | 2
10 files changed, 68 insertions(+), 37 deletions(-)
diff --git a/WebTM/views/IpadIndex.html b/WebTM/views/IpadIndex.html
index b381893..7585cad 100644
--- a/WebTM/views/IpadIndex.html
+++ b/WebTM/views/IpadIndex.html
@@ -63,7 +63,7 @@
});
function TSLoad() {
$("#topleft").html("");
- var HUserName = "Admin" //sessionStorage["HUserName"]; //榛樿褰撳墠鐧诲綍浜哄憳
+ var HUserName = sessionStorage["HUserName"]; //榛樿褰撳墠鐧诲綍浜哄憳
$.ajax({
url: GetWEBURL() + "/ReportPlatForm/SearchGetLineBindBillList",
type: "GET",
@@ -143,7 +143,7 @@
data: { "HSourceID": HSourceID },
dataType: "json",//鏁版嵁绫诲瀷鍙互涓� text xml json script jsonp
success: function (data) {
-
+
var LoadData1 = data.data.h_p_JIT_GetWorkBillListInfoBySource;
var LoadData2 = data.data.h_p_JIT_GetWorkBillListInfoBySource1;
if (LoadData1.length > 0) //宸ュ崟鍒楄〃鏁版嵁
@@ -199,7 +199,7 @@
html1 += '<div class="layui-col-sm12 layui-col-md12">';
html1 += '<dl class="topright">;'
html1 += '<dt>';
- html1 += '<img src="../layuiadmin/layui/images/device.png" onError="this.src="../ layuiadmin/layui/images/erro.png";">';
+ html1 += '<img src="../layuiadmin/layui/images/device.png" onError="this.src="../layuiadmin/layui/images/erro.png";">'
html1 += '</dt>';
html1 += '<dd>';
html1 += '<h1><span>褰撳墠璁惧锛�</span><span>' + LoadData2[i].HSourceName + '</span></h1>';
@@ -573,6 +573,10 @@
layer.alert("璇烽�夋嫨宸ュ崟鍒楄〃", { icon: 5 });
return false;
}
+ if (WorkStaus(HSourceID1, workcode, HSourceInterID, "姹囨姤")) {
+ layer.alert("鍗曟嵁鐘舵�佷笉婊¤冻瀹屽伐鏉′欢!", { icon: 5 });
+ return false;
+ }
layer.open({
type: 2,
skin: 'layui-layer-rim', //鍔犱笂杈规
@@ -733,7 +737,7 @@
sWhere = " where HSourceID='" + HSourceID1 + "' and HICMOBillNo='" + workcode + "' and HInterID='" + HSourceInterID +"' and hicmostatus not in('1')"; //鍋滃伐鎸傝捣鐘舵��
break;
case "姹囨姤":
- html1 = '';
+ sWhere = " where HSourceID='" + HSourceID1 + "' and HICMOBillNo='" + workcode + "' and HInterID='" + HSourceInterID + "' and hicmostatus not in('1')"; //姹囨姤鐘舵��
break;
case "鎶ユ鐢宠":
@@ -763,7 +767,7 @@
flag = false;
}
});
- console.log(flag);
+
return flag;
}
</script>
@@ -809,7 +813,7 @@
</ul>
<div class="layui-tab-content content3">
<div class="layui-tab-item layui-show">
- <div class="layui-row layui-col-space10" id="btomleft">
+ <div class="layui-row layui-col-space10" id="btomleft" style="height:600px;display:block;overflow-y:auto;">
</div>
</div>
@@ -874,8 +878,8 @@
</div>
</div>
</div>
- <div class="layui-row layui-col-space10" onclick="OpenInSpection(event,this)">
- <div class="layui-col-sm12 layui-col-md4">
+ <div class="layui-row layui-col-space10">
+ <div class="layui-col-sm12 layui-col-md4" onclick="OpenInSpection(event,this)">
<div class="cnt bottomright">
<span class="layui-icon layui-icon-release imgicon"></span>
<span class="imgtitle">鎶ユ鐢宠</span>
@@ -894,8 +898,8 @@
</div>
</div>
</div>
- <div class="layui-row layui-col-space10" onclick="OpenStop(event,this)">
- <div class="layui-col-sm12 layui-col-md4">
+ <div class="layui-row layui-col-space10">
+ <div class="layui-col-sm12 layui-col-md4" onclick="OpenStop(event,this)">
<div class="cnt bottomright">
<span class="layui-icon layui-icon-play imgicon"></span>
<span class="imgtitle">鍋滃伐</span>
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index b218760..66241e0 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -321,7 +321,7 @@
<dd>
<a>鎶ュ伐绠＄悊</a>
<dl class="layui-nav-child">
- <dd><a lay-href="">鎶ュ伐骞冲彴n</a></dd>
+ <dd><a lay-href="IpadIndex.html">鎶ュ伐骞冲彴</a></dd>
<dd><a lay-href="">鎶ユ鐢宠n</a></dd>
</dl>
</dd>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_Add_ProductReportBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_Add_ProductReportBillList.html"
index 01f2fe7..6c41f55 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_Add_ProductReportBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_Add_ProductReportBillList.html"
@@ -108,7 +108,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" />
- <input id="HMaker" name="HMaker" type="hidden" /><!--鍒跺崟浜�-->
+
</div>
</div>
<div class="layui-inline">
@@ -133,6 +133,8 @@
<input class="layui-input" name="HProcExchBillNo" lay-verify="HProcExchBillNo" id="HProcExchBillNo" autocomplete="off">
<input id="HSourceInterID" name="HSourceInterID" type="hidden" />
<input id="HSourceEntryID" name="HSourceEntryID" type="hidden" />
+ <input type="hidden" name="HSourceBillNo" id="HSourceBillNo">
+ <input type="hidden" name="HSourceBillType" id="HSourceBillType">
</div>
</div>
<div class="layui-inline">
@@ -184,6 +186,7 @@
</button>
</div>
</div>
+
<div class="layui-inline">
<label class="layui-form-label">鐢熶骇鐝粍:</label>
<div class="layui-input-inline">
@@ -199,8 +202,8 @@
<div class="layui-inline">
<label class="layui-form-label">鎿嶄綔鍛�:</label>
<div class="layui-input-inline">
- <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="text" name="HWorkManName" id="HWorkManName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HWorkManID" id="HWorkManID" class="layui-input" value="" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" id="HEmpList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
@@ -431,7 +434,8 @@
//鏈夋簮鍗曟柊澧�
- if (Type == 2) {
+ if (Type == 2)
+ {
//鍔犳簮鍗曠被鍨嬪尯鍒�(鍙互鍐欎笉鍚岀殑鏂规硶)
$('#HICMOBillNo').attr("disabled", true);
@@ -463,7 +467,8 @@
success: function (data) {
if (data.count == 1)// 璇存槑楠岃瘉鎴愬姛浜嗭紝
{
- var LoadData = data.data.h_p_JIT_GetSourceInfoByUser;
+ var LoadData = data.data.h_p_JIT_GetInfoByICMOStatusInterID;
+ console.log(LoadData);
$("#HProcID").val(LoadData[0].HProcID); //褰撳墠宸ュ簭ID
$("#HProcName").val(LoadData[0].HProcName); //褰撳墠宸ュ簭
$("#HMaterID").val(LoadData[0].HMaterID); //浜у搧ID
@@ -472,10 +477,10 @@
$("#HMaterSpec").val(LoadData[0].HModel); //浜у搧瑙勬牸
$("#HSourceID").val(LoadData[0].HSourceID); //鐢熶骇璧勬簮ID
$("#HSourceName").val(LoadData[0].HSourceName); //鐢熶骇璧勬簮
- $("#HMainSourceBillNo").val(LoadData[0].HSourceBillNo); //婧愬崟鍗曞彿
- $("#HMainSourceInterID").val(LoadData[0].HSourceInterID); //婧愬崟涓诲唴鐮�
- $("#HMainSourceEntryID").val(LoadData[0].HSourceEntryID); //婧愬崟瀛愬唴鐮�(婧愬崟琛屽彿)
- $("#HMainSourceBillType").val(HSourceBillType); //婧愬崟绫诲瀷
+ $("#HSourceBillNo").val(LoadData[0].HICMOBillNo); //婧愬崟鍗曞彿锛堟殏鏃跺彇鍊艰鍗曠紪鍙凤級
+ $("#HSourceInterID").val(LoadData[0].HSourceInterID); //婧愬崟涓诲唴鐮�(鍙栧�糎InterID)
+ $("#HSourceEntryID").val(LoadData[0].HSourceEntryID); //婧愬崟瀛愬唴鐮�(婧愬崟琛屽彿)
+ $("#HSourceBillType").val(HSourceBillType); //婧愬崟绫诲瀷
$("#HDeptID").val(LoadData[0].HDeptID); //杞﹂棿ID
$("#HDeptName").val(LoadData[0].HDeptName); //杞﹂棿
$("#HICMOInterID").val(LoadData[0].HICMOInterID); //鐢熶骇璁㈠崟ID
@@ -483,6 +488,7 @@
$("#HICMOBillNo").val(LoadData[0].HICMOBillNo); //鐢熶骇璁㈠崟
$("#HWorkBeginDate").val(LoadData[0].HBeginDate); //寮�宸ユ椂闂�
$("#HPlanQty").val(LoadData[0].HDatePlanQty); //璁″垝鏁伴噺
+
}
else {
layer.alert(data.Message, { icon: 5 });
@@ -493,6 +499,7 @@
layer.alert(err, { icon: 5 });
}
});
+ console.log($("#HSourceInterID").val());
}
@@ -505,7 +512,7 @@
}
$.ajax({
type: "POST",
- url: GetWEBURL() + "/Sc_ICMOReportBill/SaveGetMESProductReportFrom", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ url: GetWEBURL() + "/Sc_MESBeginWorkBill/SaveGetMESProductReportFrom", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
async: true,
data: { "msg": sMainStr },
dataType: "json",
@@ -631,8 +638,8 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HEmpName").val(checkStatus.data[0].HName);
- $("#HEmpID").val(checkStatus.data[0].HItemID);
+ $("#HWorkManName").val(checkStatus.data[0].HName);
+ $("#HWorkManID").val(checkStatus.data[0].HItemID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
@@ -707,11 +714,11 @@
layer.msg("浜у搧缂栫爜涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
- if ($("#HWorkBeginDate").val() == '' || $("#HBeginDate").val() == null) {
+ if ($("#HWorkBeginDate").val() == '' || $("#HWorkBeginDate").val() == null) {
layer.msg("寮�宸ユ椂闂翠笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
- if ($("#HWorkReportDate").val() == '' || $("#HBeginDate").val() == null) {
+ if ($("#HWorkReportDate").val() == '' || $("#HWorkReportDate").val() == null) {
layer.msg("寮�宸ユ椂闂翠笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
@@ -719,7 +726,7 @@
layer.msg("鐢熶骇璧勬簮涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
- if ($("#HEmpID").val() == '' || $("#HEmpID").val() == null) {
+ if ($("#HWorkManID").val() == '' || $("#HWorkManID").val() == null) {
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/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_ProductReportBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_ProductReportBillList.html"
index add2549..5d8f559 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_ProductReportBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_ProductReportBillList.html"
@@ -163,7 +163,7 @@
, cols: [[
{ type: 'checkbox', fixed: 'left' }
, { field: 'hmainid', title: 'hmainid', sort: true, hide: true, width: 200}
- , { field: 'HDate', title: '鏃ユ湡', width: 160,templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>"}
+ , { field: 'HDate', title: '鏃ユ湡', width: 200, templet: "<div>{{d.HDate ==null ?'':layui.util.toDateString(d.HDate, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
, { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 200}
, { field: 'HBillType', title: '鍗曟嵁绫诲瀷', width: 200 }
, { field: 'HICMOBillNo', title: '鐢熶骇璁㈠崟鍙�', width: 200 }
@@ -187,7 +187,7 @@
, { field: 'HWorkManID', title: '鎿嶄綔鍛業D', width: 200, hide: true}
, { field: 'HWorkManName', title: '鎿嶄綔鍛�', width: 200 }
, { field: 'HMaker', title: '鍒跺崟浜�', width: 200 }
- , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 160, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+ , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 160, templet: "<div>{{d.HMakeDate ==null ?'':layui.util.toDateString(d.HMakeDate, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
, { field: 'HReportType', title: '姹囨姤绫诲瀷', 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\345\201\234\345\267\245\345\215\225/Sc_Add_MESStopWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_Add_MESStopWorkBillList.html"
index 90ae626..c053dee 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_Add_MESStopWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_Add_MESStopWorkBillList.html"
@@ -470,6 +470,7 @@
if (data.count == 1)// 璇存槑楠岃瘉鎴愬姛浜嗭紝
{
var LoadData = data.data.h_p_JIT_GetInfoByICMOStatusInterID;
+
$("#HProcID").val(LoadData[0].HProcID); //褰撳墠宸ュ簭ID
$("#HProcName").val(LoadData[0].HProcName); //褰撳墠宸ュ簭
$("#HMaterID").val(LoadData[0].HMaterID); //浜у搧ID
@@ -781,6 +782,10 @@
layer.msg("鐢熶骇璁㈠崟涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
+ if ($("#HStopReason").val() == '' || $("#HStopReason").val() == null) {
+ layer.msg("鍋滃伐鍘熷洜涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
return Result;
}
</script>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_Add_MESBeginWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_Add_MESBeginWorkBillList.html"
index cda724c..c730087 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_Add_MESBeginWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_Add_MESBeginWorkBillList.html"
@@ -491,7 +491,7 @@
//淇濆瓨鎻愪氦
form.on('submit(Saver)', function (data) {
- alert("aa");
+
var sMainStr = JSON.stringify(data.field);
if (!AllowLoadData())//鏁版嵁楠岃瘉
{
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html"
index 05d1dd0..5f998c4 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html"
@@ -177,6 +177,19 @@
, laydate = layui.laydate
, element = layui.element;
+ var fn1 = function (field) {
+ return function (data) {
+ var value = data[field];
+ return [
+ '<select name="type" lay-filter="type" lay-search="true" value="' + value + '">',
+ '<option value="" >璇烽�夋嫨鐘舵��</option>',
+ '<option value="0"' + (value === 0 ? 'selected' : '') + '>鍥戒骇</option>',
+ '<option value="1"' + (value === 1 ? 'selected' : '') + '>杩涘彛</option>',
+ '</select>'
+ ].join('');
+ };
+ };
+
//甯歌鐢ㄦ硶
laydate.render({
elem: '#HDate'
@@ -200,7 +213,7 @@
{ type: 'checkbox', fixed: 'left' }
, { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
, { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 100, hide: true }
- , { field: 'HMaterCode', title: '鐗╂枡浠ｇ爜', edit: 'text', event: 'HMaterCode', width: 100 }
+ , { field: 'HMaterCode', title: '鐗╂枡浠ｇ爜', edit: 'text', event: 'HMaterCode', width: 100, templet: fn1('HMaterCode') }
, { field: 'HMaterName', title: '鐗╂枡鍚嶇О', edit: 'text', width: 100 }
, { field: 'HMaterSpec', title: '瑙勬牸鍨嬪彿', edit: 'text', width: 100 }
, { field: 'HUnitID', title: 'HUnitID', edit: 'text', width: 100, hide: true }
@@ -218,6 +231,8 @@
]]
, limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
};
+
+
//鍒ゆ柇鏄惁鏂板
if (hID == null || hID == 0) {
//鍒濆鍔犺浇琛ㄦ牸{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": " ", "HSQProcName": " ","HProcID":0, "HZRProcName": " ", "HMRBChecker": " ", "HRemark": " ", "HPSProcName": " ", "HCloseMan": " " }
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_Fast.html"
index 32ff51a..426e778 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_Fast.html"
@@ -629,7 +629,7 @@
$.ajax({
url: GetWEBURL() + "/OtherOutBill/get_CheckTypeByBarCode_Out_Json",
type: "GET",
- data: { "sCode": sBarCode, "sInterID": sInterID, "sBillNo": sBillNo, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": sessionStorage["SourceFlag"], "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": 0 },
+ data: { "sCode": sBarCode, "sInterID": sInterID, "sBillNo": sBillNo, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": sessionStorage["SourceFlag"], "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"] },
success: function (result) {
if (result.count == 1) {
if (result.data.HBarType == '浠撳簱鏉＄爜') {
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Fast.html"
index 699ae86..bd545af 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Fast.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Fast.html"
@@ -606,8 +606,8 @@
$.ajax(
{
type: "POST",
- //url: "http://61.130.49.162:9090/WMSAPI///OtherInStockBill/set_SaveOtherInStockBill_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- url: GetWEBURL() + "/OtherInStockBill/set_SaveOtherInStockBill_Json",
+ url: GetWEBURL() + "/OtherInStockBill/set_SaveOtherInStockBill_Json",
+ //url: "http://localhost:12761/OtherInStockBill/set_SaveOtherInStockBill_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
async: true,
data: { "oMain": sMain },
dataType: "json",
@@ -679,10 +679,10 @@
}
//if (AllowLoadData(sSubStr, 'HBarCode') != false) {//闈炵┖楠岃瘉
$.ajax({
- //url: "http://61.130.49.162:9090/WMSAPI///OtherInStockBill/get_InfoByBarCode_Source_Json",
+ //url: "http://localhost:12761/OtherInStockBill/get_InfoByBarCode_Source_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
url: GetWEBURL() + "/OtherInStockBill/get_InfoByBarCode_Source_Json",
type: "GET",
- data: { "sCode": sBarCode, "sInterID": sInterID, "sBillNo": sBillNo, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": sessionStorage["SourceFlag"], "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": 0},
+ data: { "sCode": sBarCode, "sInterID": sInterID, "sBillNo": sBillNo, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": sessionStorage["SourceFlag"], "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"] },
success: function (result) {
if (result.count == 1) {
if (result.data.HBarType == '浠撳簱鏉＄爜') {
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_Fast.html"
index ac6211f..897d955 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_Fast.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_Fast.html"
@@ -524,9 +524,9 @@
$.ajax(
{
type: "POST",
- url: "http://localhost:12761/Kf_EntrustInBill/set_SaveEntrustInBill_New_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ //url: "http://localhost:12761/Kf_EntrustInBill/set_SaveEntrustInBill_New_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
//url: GetWEBURL() + "/Kf_EntrustInBill/set_SaveEntrustInBill_Json",
- //url: GetWEBURL() + "/Kf_EntrustInBill/set_SaveEntrustInBill_New_Json",
+ url: GetWEBURL() + "/Kf_EntrustInBill/set_SaveEntrustInBill_New_Json",
async: true,
data: { "oMain": sMainStr },
dataType: "json",
--
Gitblit v1.9.1