From 424e086ae251e26a420ee11521a3aadbc3265e02 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 12 十一月 2025 18:57:55 +0800
Subject: [PATCH] 小卫过站解绑模块
---
WebTM/views/车间管理/单品过站_小卫/Cj_ProcessItemStationPlatform_UnbindList.html | 24 +--
WebTM/views/车间管理/单品过站_小卫/Cj_ProcessItemStationPlatform_UnbindEdit.html | 354 ++++++++++++++------------------------------------
2 files changed, 109 insertions(+), 269 deletions(-)
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_UnbindEdit.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_UnbindEdit.html"
index b6332f5..6549a73 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_UnbindEdit.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_UnbindEdit.html"
@@ -44,7 +44,7 @@
</div>
</div>
<!--鍙充笂妗嗘灦-->
- <div class="layui-tab layui-tab-card" style="width: 50.5%; height: calc(25vh); float: right;">
+ <div class="layui-tab layui-tab-card" style="width: 50.5%; height: calc(30vh); float: right;">
<ul class="layui-tab-title">
<li class="layui-this">鏂版祦绋嬮�夋嫨</li>
</ul>
@@ -52,25 +52,26 @@
<div class="layui-input-block" style="display: inline-block; margin-left:0px;">
<label class="layui-form-label" style="padding-left:0px" id="">鐢熶骇璁㈠崟鍙�:</label>
<input type="text" class="layui-input" name="HICMOBillNo" lay-verify="HICMOBillNo" autocomplete="off" placeholder="璇烽敭鍏ュ悗鍥炶溅" id="HICMOBillNo" style="width: 500px;">
+ <input type="text" class="layui-input" name="HICMOInterID" lay-verify="HICMOInterID" style="display:none;">
+ <input type="text" class="layui-input" name="HICMOEntryID" lay-verify="HICMOEntryID" style="display:none;">
</div>
<div class="layui-inline-block" style="margin-top:10px;">
<label class="layui-form-label">涓嬩竴宸ュ簭:</label>
<div class="layui-input-inline">
- <select name="HProcName" id="HProcName" lay-verify="HProcName">
- <option value="宸ュ簭1" selected>宸ュ簭1</option>
- <option value="宸ュ簭2">宸ュ簭2</option>
+ <select name="HProcID" id="HProcID" lay-verify="HProcID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
</select>
</div>
</div>
<div class="layui-row" style="margin-top:20px;margin-left:5px;">
- <button class="layui-btn layui-btn-normal" style="float:left" type="button" lay-submit="" lay-filter="btnExit" id="btnExit">瑙ｉ櫎鍖呰鍏崇郴</button>
- <button class="layui-btn layui-btn-normal" style="float:left" type="button" lay-submit="" lay-filter="btnExit" id="btnExit">鎷嗛櫎鐗╂枡</button>
+ <button class="layui-btn layui-btn-normal" style="float:left" type="button" lay-submit="" lay-filter="btnDelBarRelation" id="btnDelBarRelation">瑙ｉ櫎鍖呰鍏崇郴</button>
+ <button class="layui-btn layui-btn-normal" style="float:left" type="button" lay-submit="" lay-filter="btnDelBind" id="btnDelBind">鎷嗛櫎鐗╂枡</button>
</div>
</div>
</div>
<!--鍙充笅妗嗘灦-->
- <div class="layui-tab layui-tab-card" style="float: right; width: 50.5%; height: calc(55vh); ">
+ <div class="layui-tab layui-tab-card" style="float: right; width: 50.5%; height: calc(40vh); ">
<ul class="layui-tab-title">
<li class="layui-this">鍏抽敭浠剁粦瀹氳褰�</li>
</ul>
@@ -101,12 +102,21 @@
</html>
<script>
+ var params = get_UrlVars();
+ if (typeof (params[params[0]]) == "undefined") {
+ var OperationType = 1;//鎿嶄綔绫诲瀷
+ var closeType = 2; //鍏抽棴绫诲瀷
+ } else {
+ var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+ var HBarcode_SN = params[params[1]];//閲嶅伐鏉＄爜
+ var HBarCodeID = params[params[2]];//鏉＄爜ID
+ }
+
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index' //涓诲叆鍙ｆā鍧�
}).use(['index', 'form', 'laydate', 'table', 'element'], function () {
-
//#region 鍏叡鍙橀噺
var $ = layui.$
@@ -124,12 +134,8 @@
var option2 = [];
//#endregion
- //#region 杩涘叆椤甸潰鍗冲姞杞�
- var params = get_UrlVars();
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
set_ClearBill();
-
-
-
//#endregion
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
@@ -154,91 +160,7 @@
break;
};
});
- //鎵规鐮佸洖杞︽柟娉�
- $('#HBarCode_Batch').on('keydown', function (event) {
- var HBarCode = $('#HBarCodeSN').val();
- var HBardCodeProcExchBillNo = $('#HBardCodeProcExchBillNo').val();
- if (event.keyCode == 13) {
- if (!HBardCodeProcExchBillNo) {
- layer.msg(get_MessageError("[0000-2-034]璇峰厛鎵祦杞崱锛�", sessionStorage["HTranSlate"]))
- return;
- } else {
- HBarCode = HBarCode.toUpperCase();
- if (!HBarCode) {
- layer.msg(get_MessageError("[0000-2-019]鏉″舰鐮佷笉鑳戒负绌猴紒", sessionStorage["HTranSlate"]))
- return;
- } else {
- if (HBarCode.length != 29 && HBarCode.length != 50) {
- layer.alert(get_MessageError("[3791-2-012]瀛愪欢鏉＄爜闀垮害涓嶄负29浣嶆垨50浣�!", sessionStorage["HTranSlate"]), { icon: 5, btn: [get_MessageError('[0000-2-035]閫�鍑�', sessionStorage["HTranSlate"])], time: 100000, offset: 't' });
- return;
- }
-
- if (HBarCode.match(/[^\x00-\xff]/g) != null) {
- layer.alert(get_MessageError("[3791-2-013]蹇呴』鏄崐瑙掑瓧绗�!", sessionStorage["HTranSlate"]), { icon: 5, btn: [get_MessageError('[0000-2-035]閫�鍑�', sessionStorage["HTranSlate"])], time: 100000, offset: 't' });
- return;
- }
- }
- }
- for (var i = 0; i < option.data.length; i++) {
- if (option.data[i]["HBatchNo"] == "") {
- layer.msg(get_MessageError("[3791-2-014]褰撳墠宸ュ簭鎵规涓嶈兘涓虹┖锛�", sessionStorage["HTranSlate"]))
- return;
- }
- }
- txtHICMOBillNoDown(HBarCode);
- }
- });
-
- //闀洉鐮佸洖杞︽柟娉�
- $('#HBarCode_SN').on('keydown', function (event) {
- var HBarCode = $('#HBardCodeProcExchBillNo').val();
- if (event.keyCode == 13) {
- if (!HBarCode) {
- layer.msg(get_MessageError("[0000-1-057]娴佽浆鍗′笉鑳戒负绌猴紒", sessionStorage["HTranSlate"]))
- return;
- }
- setIntervalIndex = setInterval(setIntervalList, 30000);
- get_BomList(HBarCode);
- //if (option.data != 0) {
- // //淇濆瓨鍒颁复鏃惰〃
- // get_AddBomTempList();
- //}
- //鏌ヨ涓嶈壇璁板綍
- get_BadRecords();
- //鏌ヨ鍚堟牸璁板綍
- get_HGRecords();
-
-
- }
- });
-
- //閫夋嫨鎿嶄綔鍛�
- form.on('submit(btnHEmp)', function () {
- btnHEmp();
- });
-
-
- //閫夋嫨鐢熶骇璧勬簮
- form.on('submit(btnHSource)', function () {
- btnHSource();
- });
-
- //閫夋嫨鐢熶骇鐝粍鎸夐挳
- form.on('submit(btnHGroup)', function () {
- btnHGroup();
- });
-
- //閫夋嫨鐢熶骇杞﹂棿鎸夐挳
- form.on('submit(btnHDept)', function () {
- btnHDept();
- });
-
- //閫夋嫨宸ュ簭鎸夐挳
- form.on('submit(btnHProc)', function () {
- btnHProc();
- });
-
-
+
//閫�鍑�
form.on('submit(btnExit)', function (data) {
if (params[1] != null) {
@@ -248,61 +170,29 @@
}
});
+ //瑙ｉ櫎鍖呰鍏崇郴
+ form.on('submit(btnDelBarRelation)', function (data) {
+ get_DelRelation(1);
+ });
+
+ //鎷嗛櫎鐗╂枡
+ form.on('submit(btnDelBind)', function (data) {
+ get_DelRelation(2);
+ });
//#endregion
//#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
//鍒濆鍖栫晫闈�
- function set_ClearBill() {
- //杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ祦杞崱涓�
- $("#HBardCodeProcExchBillNo").focus();
- //鍒跺崟浜�
- $("#HMaker").val(sessionStorage["HUserName"]);
- $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
- //閫氳繃鐧诲綍鐢ㄦ埛鑾峰彇榛樿鍊�
- GetDefValByUser();
+ function set_ClearBill() {
//鍒濆鍖栬〃鏍�
set_InitGrid();
- //
- //get_Display();
+ //鏌ヨ閲嶅伐鏉＄爜淇℃伅
+ get_Display();
}
- //#region 閫氳繃鐧诲綍鐢ㄦ埛鑾峰彇榛樿鍊�
- function GetDefValByUser() {
- var index = layer.load();
- $.ajax({
- url: GetWEBURL() + "/Cj_StationInBill/GetDefValByUser",
- type: "GET",
- async: false,
- data: { "Czybm": sessionStorage["Czybm"], "Czymc": sessionStorage["HUserName"] },
- success: function (result) {
- var data = result.data[0];
-
- form.val("formData", {
- "HSourceID": data.HSourceID,
- "HSourceName": data.鐢熶骇璧勬簮鍚嶇О,
- "HGroupID": data.HGroupID,
- "HGroupName": data.鐢熶骇鐝粍鍚嶇О,
- "HEmpID": data.HEmpID,
- "HEmpName": data.鎿嶄綔鍛樺悕绉�,
- "HDeptID": data.HDeptID,
- "HDeptName": data.閮ㄩ棬鍚嶇О,
- "HProcNumber": data.宸ュ簭浠ｇ爜,
- "HProcName": data.宸ュ簭鍚嶇О,
- "HProcID": data.HProcID
- });
- layer.close(index);
- }
- , error: function () {
- layer.close(index);
- layer.alert(get_MessageError("[0000-1-002]鎺ュ彛璇锋眰澶辫触!", sessionStorage["HTranSlate"]), { icon: 5 });
- }
- })
- }
- //#endregion
-
- //鍏抽敭浠舵竻鍗�
+ //琛ㄦ牸鍒濆鍖�
function set_InitGrid() {
option= {
elem: '#mainTable_SN'
@@ -310,21 +200,24 @@
, totalRow: true
, cellMinWidth: 120
, data: []
- , height: 285
+ , height: 'full-180'
, limit: 10
, cols: [[
{ type: 'numbers', title: '搴忓彿' }
+ , { field: 'HBarCodeID', title: '鏉＄爜ID', hide: true }
, { field: '宸ュ崟鏉＄爜', title: '宸ュ崟鏉＄爜' }
, { field: 'DSN', title: 'DSN' }
]]
}
+ table.render(option);
+
option2 = {
elem: '#mainTable_Bind'
, page: false
, totalRow: true
, cellMinWidth: 120
, data: []
- , height: 385
+ , height: 'full-410'
, limit: 10
, cols: [[
{ type: 'numbers', title: '搴忓彿' }
@@ -333,129 +226,56 @@
, { field: '鍏抽敭浠舵潯鐮�', title: '鍏抽敭浠舵潯鐮�' }
]]
}
- table.render(option);
table.render(option2);
- }
-
- //鏉＄爜鍥炶溅鏌ヨ
- function txtHICMOBillNoDown(HBarCode) {
-
- var HProcExchBillNo = $("#HProcExchBillNo").val();
- var indexs = layer.load();
- $.ajax({
- type: "GET",
- url: GetWEBURL() + "/Cj_SingleStation/SNHBardCodeList",
- async: false,
- data: { "HBarCode": HBarCode, "HProcExchBillNo": HProcExchBillNo, "user": sessionStorage["HUserName"], "HOrgID": sessionStorage["OrganizationID"] },
- dataType: "json",
- success: function (data1) {
- if (data1.count == 1) {
- layer.close(indexs);
- var index = layer.load();
-
- $.ajax({
- type: "GET",
- url: GetWEBURL() + "/Cj_SingleStation/HBardCodeSNList",
- async: false,
- data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"] },
- dataType: "json",
- success: function (data1) {
- if (data1.count == 1) {
- layer.close(index);
- $("#HBarCode_P").val(HBarCode);
- if (AllowLoadData()) {
- //淇濆瓨鏁版嵁
- set_AddAssemblyBill();
- }
- }
- else {
- layer.close(index);
- layer.msg(get_MessageError(data1.Message, sessionStorage["HTranSlate"]), { icon: 5, btn: [get_MessageError('[0000-2-008]纭', sessionStorage["HTranSlate"])], time: 100000, offset: 't', skin: 'layui-layer-lan', title: get_MessageError("[0000-2-009]娓╅Θ鎻愮ず", sessionStorage["HTranSlate"]) });
- }
- $("#HBarCodeSN").val("");
- },
- error: function (err) {
- layer.close(index);
- layer.msg(get_MessageError("閿欒:" + err, sessionStorage["HTranSlate"]), { icon: 5, btn: [get_MessageError('[0000-2-008]纭', sessionStorage["HTranSlate"])], time: 100000, offset: 't', skin: 'layui-layer-lan', title: get_MessageError("[0000-2-009]娓╅Θ鎻愮ず", sessionStorage["HTranSlate"]) });
- }
- });
- }
- else {
- layer.close(indexs);
- layer.msg(get_MessageError(data1.Message, sessionStorage["HTranSlate"]));
- }
- //鍏夋爣璺宠浆鍒癝N鏉＄爜鏂囨湰妗嗕笂
- //$("#HBarCodeSN").focus();
- $("#HBarCodeSN").val("");
- },
- error: function (err) {
- layer.close(indexs);
- layer.msg(get_MessageError("閿欒:" + err, sessionStorage["HTranSlate"]), { icon: 5, btn: [get_MessageError('[0000-2-008]纭', sessionStorage["HTranSlate"])], time: 100000, offset: 't', skin: 'layui-layer-lan', title: get_MessageError("[0000-2-009]娓╅Θ鎻愮ず", sessionStorage["HTranSlate"]) });
- }
- });
}
//鍔犺浇缃戞牸
function get_Display() {
var ajaxLoad = layer.load();
$.ajax({
- url: GetWEBURL() + '/Cg_POOrderBill/list',
+ url: GetWEBURL() + '/Cj_SingleStation/UnbindBarInfo',
async: false,
type: "GET",
- data: { "sWhere": '', "user": sessionStorage["HUserName"] },
+ data: { "HBarCodeIDs": HBarCodeID, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
- var data = [];//鍒楀瓧娈垫暟鎹�
- var col = [];
- var titleData=[]
- var totalArray = ["鏁伴噺", "鍏宠仈鏁伴噺", "鏈叧鑱旀暟閲�", "鎵撳嵃鏉＄爜鏁伴噺", "鏈墦鍗版潯鐮佹暟閲�", "瀹炴敹鏁伴噺", "閲戦"];
- //缁欑┖鐨勬暟缁勮祴鍊�
- for (var key in data1.list) {
- data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ var data_SN = data1.data.h_p_Sc_UnbindBarInfo; //閲嶅伐SN鐮佷俊鎭�
+ var data_Bind = data1.data.h_p_Sc_UnbindBarInfo1; //鍏抽敭浠剁粦瀹氫俊鎭�
+ var data_ICMO = data1.data.h_p_Sc_UnbindBarInfo2; //鐢熶骇璁㈠崟淇℃伅
+
+ var OptionData_SN = [];
+ var OptionData_Bind = [];
+ for (var i = 0; i < data_SN.length; i++) {
+ OptionData_SN.push({
+ "HBarCodeID": data_SN[i].HItemID, "宸ュ崟鏉＄爜": data_SN[i].HBarCode, "DSN": data_SN[i].HBarCode
+ });
}
- //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
- col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
- for (var i = 0; i < data.length; i++) {
- // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
- if ($.inArray(data[i].name, titleData) > -1) {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
- }
- else if ($.inArray(data[i].name, totalArray) > -1) { //璁＄畻鍒�
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
- } else if (data[i].name == '鍗曟嵁鍙�') {//娣诲姞瓒呴摼鎺�
- col.push({
- field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�', templet: function (d) {
- return '<span style="color: blue;">' + d.鍗曟嵁鍙� + '</span>'
- }, style: 'cursor: pointer;'
- });
- } else if (data[i].name == '褰撳墠瀹℃牳椤圭洰') {//娣诲姞瓒呴摼鎺�
- col.push({
- field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '褰撳墠瀹℃牳椤圭洰', templet: function (d) {
- return '<span style="color: blue;">' + d.褰撳墠瀹℃牳椤圭洰 + '</span>'
- }, style: 'cursor: pointer;'
- });
- } else {
- switch (data[i].Type) {
- //int
- case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + (data[i].name == "琛屽叧闂棩鏈�" ? "琛屽叧闂汉" : data[i].name) + " ==''?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
- break;
- default:
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
- }
- }
- }
- option.cols = [col]
- option.data = data1.data;
-
-
-
- //鍒锋柊琛ㄦ牸鏁版嵁
- DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, []);
-
+ option.data = OptionData_SN;
table.render(option);
+
+ for (var i = 0; i < data_Bind.length; i++) {
+ OptionData_Bind.push({
+ "鐗╂枡浠ｇ爜": data_Bind[i].鍏抽敭浠剁墿鏂欎唬鐮�, "鐗╂枡鍚嶇О": data_Bind[i].鍏抽敭浠剁墿鏂欏悕绉�, "鍏抽敭浠舵潯鐮�": data_Bind[i].鍏抽敭浠舵潯鐮�
+ })
+ }
+ option2.data = OptionData_Bind;
+ table.render(option2);
+
+
+ if (data_ICMO.length > 0) {
+ $("#HICMOInterID").val(data_ICMO[0].HICMOInterID);
+ $("#HICMOEntryID").val(data_ICMO[0].HICMOEntryID);
+ $("#HICMOBillNo").val(data_ICMO[0].鐢熶骇璁㈠崟鍙�);
+
+ var Organization = "";
+ for (var i = 0; i < data_ICMO.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data_ICMO[i].宸ュ簭ID + '">' + data_ICMO[i].宸ュ簭鍚嶇О + '</option>';
+ }
+ $("#HProcID").append(Organization);
+ form.render('select');
+ }
+
layer.close(ajaxLoad);
- //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
} else {
layer.close(ajaxLoad);
layer.alert(data1.code + data1.Message, { icon: 5 });
@@ -467,6 +287,32 @@
});
}
+ //瑙ｉ櫎鍖呰鍏崇郴銆佹媶闄ょ墿鏂�(1:瑙ｉ櫎鍖呰鍏崇郴锛�2.鎷嗛櫎鐗╂枡)
+ function get_DelRelation(HType) {
+ var ajaxLoad = layer.load();
+ var HProcID = $("#HProcID").val();
+ var HICMOInterID = $("#HICMOInterID").val();
+ var HICMOEntryID = $("#HICMOEntryID").val();
+ $.ajax({
+ url: GetWEBURL() + '/Cj_SingleStation/DelRelation',
+ async: false,
+ type: "GET",
+ data: { "HBarCodeIDs": HBarCodeID, "HICMOInterID": HICMOInterID, "HICMOEntryID": HICMOEntryID, "HProcID": HProcID, "HType": HType, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ layer.alert(data1.Message, { icon: 1 });
+ layer.close(ajaxLoad);
+ } else {
+ layer.alert(data1.Message, { icon: 5 });
+ layer.close(ajaxLoad);
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
//闈炵┖楠岃瘉
function AllowLoadData() {
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_UnbindList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_UnbindList.html"
index 7c8ac05..08cb73c 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_UnbindList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_UnbindList.html"
@@ -342,7 +342,7 @@
function get_Display(sWhere) {
var ajaxLoad = layer.load();
$.ajax({
- url: GetWEBURL() + '/Sc_KeyElementBinding/list',
+ url: GetWEBURL() + '/Cj_SingleStation/UnbindBarList',
async: false,
type: "GET",
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
@@ -364,15 +364,7 @@
}
else if ($.inArray(data[i].name, totalArray) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
- } else if (data[i].name == '鍗曟嵁鍙�') {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�', filter: true});
- }
- else if (data[i].name == '閰嶄欢鏉＄爜') {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '閰嶄欢鏉＄爜', filter: true });
- }
- else if (data[i].name == '鏃ユ湡') {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' }, sort: true, width: 200 });
- }
+ }
else {
switch (data[i].Type) {
//int
@@ -394,8 +386,8 @@
, page: true
, totalRow: true
, cellMinWidth: 90
- , limit: 50
- , limits: [50, 500, 5000, 20000]
+ , limit: 200
+ , limits: [50, 200, 500, 5000, 20000]
, done: function (res, curr, count) {
soulTable.render(this);
}
@@ -511,7 +503,7 @@
sWhere += " and 鐢熶骇璁㈠崟鍙� like '%" + HICMOBillNo + "%'";
}
if (HBarcode_SN) {
- sWhere += " and SN鐮� like '%" + HBarcode_SN + "%'";
+ sWhere += " and DSN like '%" + HBarcode_SN + "%'";
}
if (HBarcode_ZB) {
sWhere += " and 鏍堟澘鐮� like '%" + HBarcode_ZB + "%'";
@@ -572,8 +564,10 @@
, data = checkStatus.data;
if (checkStatus.data.length >= 1) {
HSN = [];
+ HBarCodeID = [];
for (var i = 0; i < data.length; i++) {
- HSN.push(data[i].浜у搧鏉＄爜);
+ HSN.push(data[i].DSN);
+ HBarCodeID.push(data[i].HBarInterID);
}
layer.open({
@@ -584,7 +578,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: './Cj_ProcessItemStationPlatform_UnbindEdit.html?OperationType=3&HBarcode_SN=' + HSN.toString()
+ , content: './Cj_ProcessItemStationPlatform_UnbindEdit.html?OperationType=3&HBarcode_SN=' + HSN.toString() + '&HBarCodeID=' + HBarCodeID.toString()
, resize: false,
end: function () {
//鍒锋柊椤甸潰,
--
Gitblit v1.9.1