From 00a863b6f3aab1bd05bbdc143b8fa4cf72b7416d Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期二, 18 十一月 2025 09:15:06 +0800
Subject: [PATCH] 1
---
WebTM/views/WMS扫码模块/库存查询/KF_ICInventory_Clear_PDA.html | 485 ++++++++++++++++++++++++++
WebTM/views/WMS扫码模块/找货上架单/Kf_MaterialUpperBill_PDA.html | 76 ++++
WebTM/views/系统管理/用户管理/Xt_UserListEdit.html | 2
WebTM/views/车间管理/单品过站_小卫/Cj_ProcessItemStationPlatform_batch.html | 2
WebTM/views/home/console_Mobile.html | 6
WebTM/layuiadmin/Scripts/webConfig.js | 2
WebTM/views/车间管理/单品过站_小卫/Cj_ProcessItemStationPlatform_UnbindList.html | 24
WebTM/views/车间管理/单品过站_小卫/Cj_ProcessItemStationPlatform_generateCaseCode.html | 2
WebTM/views/车间管理/单品过站_小卫/Cj_ProcessItemStationPlatform_UnbindEdit.html | 354 +++++--------------
WebTM/WebTM.csproj | 1
WebTM/views/生产管理/添康三周排产/JIT_DayPlanPlatForm_TK2.html | 72 ++-
WebTM/views/车间管理/单品过站_小卫/Cj_ProcessItemStationPlatform_KeyElement.html | 2
12 files changed, 728 insertions(+), 300 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 6f7f3d9..9a0af3e 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -337,6 +337,7 @@
<Content Include="views\WMS鎵爜妯″潡\瀹㈡埛鏉＄爜鎵弿\Gy_getCusBarCodeBill_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\瀹㈡埛鏉＄爜鎵弿\Gy_getCusBarCodeBillList_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\灏忚溅閿佸畾\Kf_TrolleyPositionBill_PDA.html" />
+ <Content Include="views\WMS鎵爜妯″潡\搴撳瓨鏌ヨ\KF_ICInventory_Clear_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\搴撳瓨鏌ヨ\KF_ICInventory_WorkShopByXJ_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\搴撳瓨鏌ヨ\KF_ICInventory_WorkShopByCLD_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\搴撳瓨鏌ヨ\KF_ICInventoryByWorkShop_PDA.html" />
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index d991508..7c14fff 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -6,7 +6,7 @@
/*var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�*/
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
// var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
- /*var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�*/
+ var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
/* var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�*/
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\272\223\345\255\230\346\237\245\350\257\242/KF_ICInventory_Clear_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\272\223\345\255\230\346\237\245\350\257\242/KF_ICInventory_Clear_PDA.html"
new file mode 100644
index 0000000..c94e0bc
--- /dev/null
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\272\223\345\255\230\346\237\245\350\257\242/KF_ICInventory_Clear_PDA.html"
@@ -0,0 +1,485 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>杞﹂棿涓婃灦搴撳瓨鏌ヨ</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <!--寮曠敤layui鏍峰紡鏂囦欢-->
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <!--寮曠敤layui js鏂囦欢-->
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <style>
+ .layui-col-xs8 {
+ width: 55.666667%;
+ }
+ </style>
+</head>
+<body>
+ <div class="layui-fluid" style="padding:0">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 0px; height:800px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div style="background-color:#0085E8;">
+ <span style="color: white;"><i class="layui-icon layui-icon-form"></i>杞﹂棿涓婃灦搴撳瓨鏌ヨ</span>
+ </div>
+ <div class="layui-form-item" style="margin: 1% 2%;text-align: right;">
+ <button type="button" lay-submit="" lay-filter="cmdDelete" class="layui-btn layui-btn-radius" id="cmdDelete">鍒犻櫎</button>
+ <button type="button" lay-submit="" lay-filter="cmdCancel" class="layui-btn layui-btn-radius layui-btn-danger" id="cmdCancel">閫�鍑�</button>
+ </div>
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <!--<div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>-->
+ <div class="layui-inline">
+ <div class="layui-col-xs2">
+ <label class="layui-form-label" style="width:30px;padding-left:0px;">鐗╂枡浠ｇ爜</label>
+ </div>
+ <div class="layui-col-xs10">
+ <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+ </div>
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-col-xs2">
+ <label class="layui-form-label" style="width:30px;padding-left:0px;">浠撳簱</label>
+ </div>
+ <div class="layui-col-xs10">
+ <div class="layui-col-xs10">
+ <input type="text" name="HWHName" id="HWHName" lay-verify="HWHName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+ <input type="hidden" name="HWHID" id="HWHID" lay-verify="HWHID" value="0" autocomplete="off" class="layui-input">
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" lay-filter="HWHID-BT" class="layui-btn" id="HWHID-BT">...</button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-col-xs2">
+ <label class="layui-form-label" style="width:30px;padding-left:0px;">浠撲綅</label>
+ </div>
+ <div class="layui-col-xs10">
+ <div class="layui-col-xs10">
+ <input type="text" name="HStockPlaceName" id="HStockPlaceName" lay-verify="HStockPlaceName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+ <input type="hidden" name="HStockPlaceID" id="HStockPlaceID" lay-verify="HStockPlaceID" value="0" autocomplete="off" class="layui-input">
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" lay-filter="HSpID-BT" class="layui-btn" id="HSpID-BT">...</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-colla-content" style="padding: 6px; margin-left: 6%;">
+
+ </div>
+ <!--澶辫触鎻愮ず闊�-->
+ <div id="" style="display:none;">
+ <audio id="cs" hidden controls>
+ <source src="../../video/jingbao.wav" type="audio/ogg">
+ </audio>
+ </div>
+ <!--鎴愬姛鎻愮ず闊�-->
+ <div id="" style="display:none;">
+ <audio id="cs2" hidden controls>
+ <source src="../../video/success.wav" type="audio/ogg">
+ </audio>
+ </div>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , laydate = layui.laydate
+ , element = layui.element;
+ var HStockOrgID = sessionStorage["OrganizationID"] //缁勭粐ID
+ var listOption = [];
+ var columns = "";
+ var HModName = "KF_ICInventory_Clear_PDA";
+ var titleData = []; //涓嶉渶瑕佹樉绀虹殑瀛楁
+ var params = get_UrlVars();
+ var OperationType = params[params[0]] == null ? 1 : params[params[0]]; //1涓虹洿鎺ユā鍧楁墦寮� 2涓轰粠鍏朵粬妯″潡璺宠浆鎵撳紑
+ var HMaterNumber = params[params[1]]; //鐗╂枡浠ｇ爜
+
+ //#endregion
+
+ //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+ if (sessionStorage.login != "login") {
+ layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+ icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+ }, function () { window.location.href = "../../user/login.html"; });
+ }
+
+
+ //#region 鍒濆鍖栫晫闈�
+
+ set_ClearBill();
+
+ function set_ClearBill() {
+ set_InitGrid(); //鍒濆鍖栬〃鏍�
+
+ var data = [];
+ listOption.cols = [[
+ { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+ , { field: '浠撳簱', title: '浠撳簱', width: 100 }
+ , { field: '浠撲綅', title: '浠撲綅', width: 100 }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 100 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 100 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
+ , { field: '鎵规', title: '鎵规', width: 100 }
+ , { field: '杈呭姪灞炴��', title: '杈呭姪灞炴��', width: 100 }
+ , { field: '鐢熶骇鏃ユ湡', title: '鐢熶骇鏃ユ湡', width: 100 }
+ , { field: '鏈夋晥鏈熻嚦', title: '鏈夋晥鏈熻嚦', width: 100 }
+ , { field: '缁勭粐', title: '缁勭粐', width: 100 }
+ ]];
+ listOption.data = data;
+ table.render(listOption);
+
+
+ }
+
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ //鏉＄爜淇℃伅
+ listOption = {
+ elem: '#wl-table'
+ //, toolbar: '#toolbarDemo'
+ //, totalRow: true
+ , height: 'full-60'
+ , page: true
+ , cellMinWidth: 90
+ , limit: 50
+ };
+ }
+
+ //#endregion
+
+
+ //#region 鍩虹璧勬枡閫夋嫨
+
+ //#region 浠撳簱
+ //鎵弿浠撳簱鏉＄爜
+ $('#HWHName').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ var HWHName = $('#HWHName').val()
+ if (HWHName == '') {
+ playSound();
+ $("#HWHID").val("0");
+ $("#HWHName").val("");
+ $("#HStockPlaceID").val("0");
+ $("#HStockPlaceName").val("");
+ $("#HStockPlaceName").removeAttr("disabled");
+ $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ layer.msg("浠撳簱鏉＄爜涓虹┖锛�", {
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HWHName").select();
+ $("#HWHName").focus();
+ });
+ return;
+ }
+
+ layer.load(3);
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/GetWarehouse_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HBarCode": HWHName, "HStockOrgID": HStockOrgID },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ $("#HWHID").val(result.data[0].HItemID);
+ $("#HWHName").val(result.data[0].HName);
+ $("#HStockPlaceID").val("0");
+ $("#HStockPlaceName").val("");
+ if (result.data[0].HSPFlag == 0) {
+ $("#HStockPlaceName").attr("disabled", "disabled");
+ $('#HSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ }
+ else {
+ $("#HStockPlaceName").removeAttr("disabled");
+ $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ }
+ element.tabChange('tab-Kf_POStockInBill_PDA', '2');
+ //鍏夋爣鏄剧ず鍒版潯鐮佷笂
+ $("#HBarCode").select();
+ $("#HBarCode").focus();
+ }
+ else {
+ playSound();
+ $("#HWHID").val("0");
+ $("#HWHName").val("");
+ $("#HStockPlaceID").val("0");
+ $("#HStockPlaceName").val("");
+ $("#HStockPlaceName").removeAttr("disabled");
+ $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ layer.msg(result.Message, {
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HWHName").select();
+ $("#HWHName").focus();
+ });
+ }
+ layer.closeAll("loading");
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+ });
+ }
+ });
+
+ //浠撳簱鎸夐挳
+ form.on('submit(HWHID-BT)', function () {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '浠撳簱鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseListNew.html?Type=HWHID&HOrgID=' + HStockOrgID + '', 'yes']
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ });
+
+ //#endregion
+
+ //#region 浠撲綅
+ //鎵弿浠撲綅鏉＄爜
+ $('#HStockPlaceName').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ //浠撳簱鏂囨湰妗嗕负绌烘椂锛屾竻绌哄搴擨D
+ if ($("#HWHName").val() == '') {
+ $("#HWHID").val("0");
+ }
+ var sHWHID = $("#HWHID").val()
+ var HStockPlaceName = $('#HStockPlaceName').val()
+ if (HStockPlaceName == '') {
+ playSound();
+ $("#HWHID").val("0");
+ $("#HWHName").val("");
+ $("#HStockPlaceID").val("0");
+ $("#HStockPlaceName").val("");
+ layer.msg("浠撲綅鏉＄爜涓虹┖锛�", {
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HStockPlaceName").select();
+ $("#HStockPlaceName").focus();
+ });
+ return;
+ }
+
+ layer.load(3);
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/GetStockPlace_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HBarCode": HStockPlaceName, "HWhID": sHWHID, "HStockOrgID": HStockOrgID },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ $("#HStockPlaceName").val(result.data[0].HName);
+ $("#HStockPlaceID").val(result.data[0].HItemID);
+ $("#HWHName").val(result.data[0].HWhName);
+ $("#HWHID").val(result.data[0].HWHID);
+ element.tabChange('tab-Kf_POStockInBill_PDA', '2');
+ //鍏夋爣鏄剧ず鍒版潯鐮佷笂
+ $("#HBarCode").select();
+ $("#HBarCode").focus();
+ }
+ else {
+ playSound();
+ $("#HWHID").val("0");
+ $("#HWHName").val("");
+ $("#HStockPlaceID").val("0");
+ $("#HStockPlaceName").val("");
+ layer.msg(result.Message, {
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HStockPlaceName").select();
+ $("#HStockPlaceName").focus();
+ });
+ }
+ layer.closeAll("loading");
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+ });
+ }
+ });
+
+ //浠撲綅鎸夐挳
+ form.on('submit(HSpID-BT)', function () {
+ //浠撳簱鏂囨湰妗嗕负绌烘椂锛屾竻绌哄搴擨D
+ if ($("#HWHName").val() == '') {
+ $("#HWHID").val("0");
+ }
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '浠撲綅鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceListNew.html?HWhID=' + $("#HWHID").val() + '&Type=HSpID&HOrgID=' + HStockOrgID + '', 'yes']
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ });
+
+ //#endregion
+
+ //#endregion
+
+
+
+
+ //#region 鍔熻兘鎺т欢
+ //鍒犻櫎
+ form.on('submit(cmdDelete)', function () {
+ if (set_ModCheck("CE_MaterialUpperClear") == true) {
+ set_DeleteBill();
+ }
+ })
+
+
+ //#region 閫�鍑�
+ form.on('submit(cmdCancel)', function () {
+ //layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+ if (OperationType == 2) {
+ var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ //parent.location.reload(); //鍒锋柊鐖堕〉闈紝娉ㄦ剰涓�瀹氳鍦ㄥ叧闂綋鍓峣frame灞備箣鍓嶆墽琛屽埛鏂�
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+ }
+ else {
+ parent.location.href = "../../../views/index_Mobile.html";
+ }
+ //});
+ })
+
+ //#endregion
+
+ //澶辫触鎻愮ず闊�
+ function playSound() {
+ console.log("playSound");
+ var audio = document.getElementById("cs");
+ audio.play();
+ audio.onended = function () {
+ // 褰撻煶棰戞挱鎶ュ畬鎴愭椂锛岃皟鐢� pause 鍜岃缃� currentTime 涓� 0 浠ュ仠姝㈡挱鎶ュ苟閲嶇疆
+ audio.pause();
+ audio.currentTime = 0;
+ };
+ }
+ //鎴愬姛鎻愮ず闊�
+ function playSound_OK() {
+ console.log("playSound_OK");
+ var audio = document.getElementById("cs2");
+ audio.play();
+ audio.onended = function () {
+ // 褰撻煶棰戞挱鎶ュ畬鎴愭椂锛岃皟鐢� pause 鍜岃缃� currentTime 涓� 0 浠ュ仠姝㈡挱鎶ュ苟閲嶇疆
+ audio.pause();
+ audio.currentTime = 0;
+ };
+ }
+
+ function set_ModCheck(ModRightNameCheck) {
+ var Permission = false;
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: false,
+ data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ Permission = true;
+ } else {
+ layer.alert("褰撳墠妯″潡娌℃湁鏌ヨ鏉冮檺!", { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ return Permission;
+ }
+ function set_DeleteBill() {
+ if ($("#HStockPlaceID").val() == 0 || $("#HWHID").val() == 0 || $("#HBarCode").val() == "") {
+ return layer.alert("浠撲綅鎴栫墿鏂欐湭閫夋嫨!", { icon: 5 });
+ }
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/KF_ICInventory_WorkShop/ClearHBarCode", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: false,
+ data: { "HBarCode": $("#HBarCode").val(), "HWHID": $("#HWHID").val(), "HSPID": $("#HStockPlaceID").val(), "user": sessionStorage["HUserName"], "HOrgID": HStockOrgID },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.alert("鍒犻櫎鎴愬姛!", { icon: 5 });
+ } else {
+ layer.alert(result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ }
+
+
+ //#endregion
+
+ });
+
+ //浠ヤ笂涓簂ayui妯″潡
+ //姝ゅ鏂规硶娑夊強鍒拌澶栭儴椤甸潰parent.鏂规硶鍚嶈皟鐢ㄧ殑蹇呴』鏀惧湪Layui鏂规硶澶栭儴
+
+ //鐐瑰嚮鎸夐挳閫夋嫨鍚� 杩斿洖浠撳簱淇℃伅
+ function GetHWHValue(obj) {
+ if (obj.length > 0) {
+ $("#HWHName").val(obj[0].HName);
+ $("#HWHID").val(obj[0].HItemID);
+ $("#HStockPlaceName").val("");
+ $("#HStockPlaceID").val("0");
+ if (obj[0].HSPFlag == 0) {
+ $("#HStockPlaceName").attr("disabled", "disabled");
+ $('#HSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ }
+ else {
+ $("#HStockPlaceName").removeAttr("disabled");
+ $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ }
+ }
+ }
+ //鐐瑰嚮鎸夐挳閫夋嫨鍚� 杩斿洖浠撲綅淇℃伅
+ function GetHSpValue(obj) {
+ if (obj.length > 0) {
+ $("#HStockPlaceName").val(obj[0].HName);
+ $("#HStockPlaceID").val(obj[0].HItemID);
+ $("#HWHName").val(obj[0].HWhName);
+ $("#HWHID").val(obj[0].HWHID);
+ }
+ }
+
+ </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\346\211\276\350\264\247\344\270\212\346\236\266\345\215\225/Kf_MaterialUpperBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\346\211\276\350\264\247\344\270\212\346\236\266\345\215\225/Kf_MaterialUpperBill_PDA.html"
index 5f93feb..af29893 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\346\211\276\350\264\247\344\270\212\346\236\266\345\215\225/Kf_MaterialUpperBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\346\211\276\350\264\247\344\270\212\346\236\266\345\215\225/Kf_MaterialUpperBill_PDA.html"
@@ -99,6 +99,19 @@
<div class="layui-form-item" style="padding: 0px; margin: 0px">
<div class="layui-row">
<div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">娴佽浆鍗″彿</label>
+ </div>
+ <div class="layui-col-xs9">
+ <div class="layui-col-xs10">
+ <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+ </div>
+ <!--<div class="layui-col-xs2" style="float: right;">
+ <button type="button" lay-submit="" lay-filter="HSourceBillNo-BT" class="layui-btn" id="HSourceBillNo-BT" style="width: 45px; margin-left: -5px;padding-left:12px">OK</button>
+ </div>-->
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
<label class="layui-form-label" style="width:60px;padding-left:0px;">鏃ユ湡</label>
</div>
<div class="layui-col-xs9">
@@ -161,6 +174,7 @@
<!--闅愯棌瀛楁-->
<input type="hidden" name="HBillType" id="HBillType">
+ <input type="hidden" name="HMainSourceBillNo" id="HMainSourceBillNo" value="">
<!--澶辫触鎻愮ず闊�-->
<div id="" style="display:none;">
<audio id="cs" hidden controls>
@@ -328,7 +342,7 @@
table.render(LowerListOption);
//鍏夋爣榛樿鍦ㄦ潯鐮佷綅缃笂
- var pFocus = $("#HBarCode");
+ var pFocus = $("#HSourceBillNo");
pFocus.select();
pFocus.focus(); //鑾峰彇鍏夋爣
}
@@ -806,6 +820,13 @@
}
});
+ //鎵弿婧愬崟鏉＄爜
+ $('#HSourceBillNo').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ GetMeesageBySourceBillNo();
+ }
+ });
+
//鎵潯鐮�
function GetMeesageByBarCode(obj) {
//浠撳簱銆佷粨浣嶆枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
@@ -944,6 +965,59 @@
}
}
+ //鎵弿婧愬崟鏉＄爜
+ function GetMeesageBySourceBillNo(obj) {
+ var HSourceBillNo = $('#HSourceBillNo').val()
+ if (HSourceBillNo == '') {
+ playSound();
+ layer.msg("娴佽浆鍗″彿涓嶈兘涓虹┖锛岃鎵弿娴佽浆鍗℃潯鐮侊紒", {
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HSourceBillNo").select();
+ $("#HSourceBillNo").focus();
+ });
+ return;
+ }
+ layer.load(3)
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/KF_ICInventory_WorkShop/SearchHBarCode",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HBillNo": HBillNo, "user": sessionStorage["HUserName"], "HOrgID": sessionStorage["OrganizationID"] },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ playSound_OK();
+ $("#HMainSourceBillNo").val(HBillNo);
+ $("#HSourceBillNo").attr("disabled", "disabled");
+ //$('#HSourceBillNo-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ $("#HBarCode").select();
+ $("#HBarCode").focus(); //鑾峰彇鍏夋爣
+
+ }
+ else {
+ playSound();
+ layer.msg(result.Message, {
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+
+ $("#HSourceBillNo").val("");
+ $("#HSourceBillNo").select();
+ $("#HSourceBillNo").focus();
+ });
+ }
+ },
+ error: function (err) {
+ playSound();
+ $("#HSourceBillNo").val("");
+ $("#HSourceBillNo").select();
+ $("#HSourceBillNo").focus();
+ layer.msg("鎺ュ彛閿欒" + err);
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+ });
+ layer.closeAll("loading");
+ }
+
//#endregion
diff --git a/WebTM/views/home/console_Mobile.html b/WebTM/views/home/console_Mobile.html
index 8eedf81..9e22fdc 100644
--- a/WebTM/views/home/console_Mobile.html
+++ b/WebTM/views/home/console_Mobile.html
@@ -255,6 +255,12 @@
<cite style="white-space:pre-wrap">搴撳瓨杞Щ</cite>
</a>
</li>
+ <li class="layui-col-xs3">
+ <a href="../WMS鎵爜妯″潡/搴撳瓨鏌ヨ/KF_ICInventory_Clear_PDA.html" target="main_self_frame">
+ <i class="layui-icon layui-icon-template-1"></i>
+ <cite style="white-space:pre-wrap">搴撳瓨娓呯悊</cite>
+ </a>
+ </li>
</ul>
</div>
</div>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\267\273\345\272\267\344\270\211\345\221\250\346\216\222\344\272\247/JIT_DayPlanPlatForm_TK2.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\267\273\345\272\267\344\270\211\345\221\250\346\216\222\344\272\247/JIT_DayPlanPlatForm_TK2.html"
index f4736e4..09f1d20 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\267\273\345\272\267\344\270\211\345\221\250\346\216\222\344\272\247/JIT_DayPlanPlatForm_TK2.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\267\273\345\272\267\344\270\211\345\221\250\346\216\222\344\272\247/JIT_DayPlanPlatForm_TK2.html"
@@ -33,7 +33,7 @@
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnProZZPC" id="btnProZZPC">缁勮鎺掍骇</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnLockOrder" id="btnLockOrder">閿佸畾宸ュ崟</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnUnlockOrder" id="btnUnlockOrder">瑙ｉ攣宸ュ崟</button>
- <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnPublishDate" id="btnPublishDate">浜ゆ湡鍙戝竷</button>
+ <!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnPublishDate" id="btnPublishDate">浜ゆ湡鍙戝竷</button>-->
</div>
<div class="layui-collapse resizable-container">
<div class="layui-colla-item">
@@ -481,14 +481,21 @@
return layer.msg("鎺掍骇鏁伴噺澶т簬璁㈠崟鏁伴噺!")
}
- if (Date.parse(obj.field) > Date.parse(obj.data.璁″垝缁撴潫鏃ユ湡)) {
- return layer.msg("鎺掍骇鏃ユ湡瓒呭嚭璁″垝缁撴潫鏃ユ湡!");
- }
+ //if (Date.parse(obj.field) > Date.parse(obj.data.璁″垝缁撴潫鏃ユ湡)) {
+ // return layer.msg("鎺掍骇鏃ユ湡瓒呭嚭璁″垝缁撴潫鏃ユ湡!");
+ //}
//淇敼鏁版嵁
obj.update({
"鏃ヨ鍒掓暟閲忔�婚噺": dateHQty,
});
+
+ //鏍￠獙淇敼鍗曞厓鏍兼爣棰樻槸鍚︿负鏃ユ湡鏍煎紡
+ if (isNaN(new Date(obj.field).getTime()) == false) {
+ //鏁版嵁搴撶洿鎺ユ洿鏂颁慨鏀规棩鏈熺殑鎺掍骇鏁伴噺
+ UpdateDayPlanQty(obj.data.hmainid, obj.field, obj.value, obj.data.浜х嚎鎬讳骇鑳�);
+ }
+
})
//#endregion
@@ -569,7 +576,7 @@
obj.update(data);
}
});
- }
+ }
//#endregion
});
@@ -674,7 +681,7 @@
} else {
layer.alert("褰撳墠涓嶄负澶氳溅闂存帓浜фā寮�");
}
-
+
})
//鐢熶骇璁㈠崟閫夊崟
@@ -856,11 +863,11 @@
columns.push({ field: '鏄ㄦ棩鏁伴噺', title: '鏄ㄦ棩鏁伴噺', filter: true });
columns.push({ field: '浼樺厛绾�', title: '浼樺厛绾�', width: 150, edit: 'text', sort: true });
columns.push({ field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮', width: 150, edit: 'text', event: "HSourceID", filter: true });
- columns.push({ field: '瑕佽揣鏃ユ湡', title: '瑕佽揣鏃ユ湡', width: 150, templet: "<div>{{d.瑕佽揣鏃ユ湡 == '' ? '1900-01-01':layui.util.toDateString(d.瑕佽揣鏃ユ湡, 'yyyy-MM-dd')}}</div>", event: "HDeliveryDate", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
- columns.push({ field: '寮�宸ユ棩鏈�', title: '寮�宸ユ棩鏈�', width: 150, templet: "<div>{{d.寮�宸ユ棩鏈� ==null ?'':layui.util.toDateString(d.寮�宸ユ棩鏈�, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
- columns.push({ field: '瀹屽伐鏃ユ湡', title: '瀹屽伐鏃ユ湡', width: 150, templet: "<div>{{d.瀹屽伐鏃ユ湡 ==null ?'':layui.util.toDateString(d.瀹屽伐鏃ユ湡, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
+ columns.push({ field: '瑕佽揣鏃ユ湡', title: '瑕佽揣鏃ユ湡', width: 150, templet: "<div>{{d.瑕佽揣鏃ユ湡 ==null ?'':layui.util.toDateString(d.瑕佽揣鏃ユ湡, 'yyyy-MM-dd')}}</div>", event: "HDeliveryDate", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
+ columns.push({ field: '寮�宸ユ棩鏈�', title: '寮�宸ユ棩鏈�', width: 150, templet: "<div>{{d.寮�宸ユ棩鏈� ==null ?'':layui.util.toDateString(d.寮�宸ユ棩鏈�, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd]' } });
+ columns.push({ field: '瀹屽伐鏃ユ湡', title: '瀹屽伐鏃ユ湡', width: 150, templet: "<div>{{d.瀹屽伐鏃ユ湡 ==null ?'':layui.util.toDateString(d.瀹屽伐鏃ユ湡, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd]' } });
columns.push({ field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿', width: 150 });
-
+
columns.push({ field: '涓氬姟鐘舵��', title: '涓氬姟鐘舵��', width: 150, sort: true, hide: true });
columns.push({ field: '浜х嚎鍏ュ簱鏁伴噺', title: '浜х嚎鍏ュ簱鏁伴噺', width: 150, sort: true, hide: true });
columns.push({ field: '鏈帓鏁伴噺', title: '鍙帓鏁伴噺', width: 150, sort: true, hide: true });
@@ -884,7 +891,7 @@
columns.push({ field: '鐢熶骇鍛ㄦ湡', title: '鐢熶骇鍛ㄦ湡', width: 150, sort: true });
columns.push({ field: '鏈�杩熷紑宸ユ棩鏈�', title: '鏈�杩熷紑宸ユ棩鏈�', width: 150, templet: "<div>{{d.鏈�杩熷紑宸ユ棩鏈� =='' ?'':layui.util.toDateString(d.鏈�杩熷紑宸ユ棩鏈�, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
columns.push({ field: '鏈�杩熷畬宸ユ棩鏈�', title: '鏈�杩熷畬宸ユ棩鏈�', width: 150, templet: "<div>{{d.鏈�杩熷畬宸ユ棩鏈� =='' ?'':layui.util.toDateString(d.鏈�杩熷畬宸ユ棩鏈�, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
-
+
columns.push({ field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 150, sort: true });
columns.push({ field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 150, sort: true });
columns.push({ field: 'hmainid', title: '鏃ヨ鍒掑伐鍗曚富鐮�', width: 150, sort: true });
@@ -1128,6 +1135,26 @@
}
//#endregion
+ //#region 鐩戝惉鍗曞厓鏍兼暟鎹慨鏀规煇涓�澶╃殑鎺掍骇鏁伴噺
+ function UpdateDayPlanQty(HInterID, HMasterDate, HValue, HSumWorkQty) {
+
+ $.ajax({
+ url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/UpdateDayPlanQty',
+ type: "GET",
+ data: { "HWorkBillSortInterID": HInterID, "HMasterDate": HMasterDate, "HQty": HValue, "HSumWorkQty": HSumWorkQty },
+ success: function (data1) {
+ if (data1.count == 1) {
+
+ } else {
+ layer.alert(data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
//#region 娣诲姞鐢熶骇璁㈠崟
function get_btnAddICMO() {
var HDeptID = $("#HWorkShopID").val() == "" ? 0 : $("#HWorkShopID").val();
@@ -1173,7 +1200,7 @@
}
//#endregion
-
+
//#region 娣诲姞鎶ょ悊搴�-妞呮灦鐢熶骇璁㈠崟
function get_btnAddICMO_Batch() {
var HDeptID = "102357,102359" //102357=鎶ょ悊搴� 102359=妞呮灦
@@ -1289,13 +1316,6 @@
option.data = dataPush;
table.render(option);
- //鑾峰彇涓婃柟鎺掍骇鍒楄〃鏁版嵁,鐢ㄤ簬瀵规瘮涓嬫柟鐢熶骇璁㈠崟鍒楄〃锛屽皢涓嬫柟鐢熶骇璁㈠崟鍒楄〃鐩稿悓鐨勬暟鎹笉鏄剧ず
- var compareList = [];
- for (var i = 0; i < option.data.length; i++) {
- var temp = option.data[i]["婧愬崟涓诲唴鐮�"] + "|" + option.data[i]["婧愬崟瀛愬唴鐮�"];
- compareList.push(temp);
- }
-
layer.close(ajaxLoad);
} else {
layer.close(ajaxLoad);
@@ -1318,8 +1338,8 @@
var lastDay = new Date(year, month, 0).getDate(); //褰撴湀鏈�鍚庝竴澶�
var thisDay = new Date().getDay(); //褰撳ぉ鏄湰鏈堢鍑犲ぉ
- var valueList = [7, 21, 28 , 30, 35];
- var titleList = ["7澶�","21澶�","28澶�", "30澶�", "35澶�"];
+ var valueList = [7, 21, 28 , 30, 35,50];
+ var titleList = ["7澶�","21澶�","28澶�", "30澶�", "35澶�", "50澶�"];
var HArrangeProductDayQty_ArrayList = '';
for (var i = 0; i < valueList.length; i++) {
@@ -1330,7 +1350,7 @@
$("#HArrangeProductDayQty").append(HArrangeProductDayQty_ArrayList);
- $("#HArrangeProductDayQty").val("21");
+ $("#HArrangeProductDayQty").val("50");
form.render('select');
}
//#endregion
@@ -1393,7 +1413,7 @@
} else {
//鏍规嵁杞﹂棿鍒犻櫎娌℃湁閿佸畾鐨勬暟鎹�
var sql = "delete from Sc_WorkBillSortBillSub where HLockedSub != 1 and HInterID in (select HInterID from Sc_WorkBillSortBillMain where HWorkShopID=" + HWorkShopID + " and HLockOrder != 1 )";
- }
+ }
$.ajax({
url: GetWEBURL() + '/Gy_SOPBillList/UpDelSQL',
@@ -2352,15 +2372,15 @@
//鏍规嵁閿�鍞鍗曡璐ф棩鏈燂紝閿�鍞鍗曞鏍告棩鏈熸帓搴忔暟缁�
data.sort(function (a, b) {
- // 榛樿鏍规嵁瑕佽揣鏃ユ湡鎺掑簭锛岃璐ф棩鏈熺浉鍚屽垯鎸夌収閿�鍞鍗曞鏍告棩鏈熸帓搴�
+ // 榛樿鏍规嵁鏈�鏃╁紑宸ユ棩鏈熸帓搴忥紝鏈�鏃╁紑宸ユ棩鏈熺浉鍚屽垯鎸夌収閿�鍞鍗曞鏍告棩鏈熸帓搴�
if (new Date(a.瑕佽揣鏃ユ湡) == new Date(b.瑕佽揣鏃ユ湡)) {
return new Date(a.閿�鍞鍗曞鏍告棩鏈�) - new Date(b.閿�鍞鍗曞鏍告棩鏈�)
}
return new Date(a.瑕佽揣鏃ユ湡) - new Date(b.瑕佽揣鏃ユ湡)
});
- for (var i = 0; i < data.length; i++) {
- if ($("#HAutoYX").val == "鏄�") {
+ for (var i = 0; i < data.length; i++) {
+ if ($("#HAutoYX").val() == "鏄�") {
data[i]["浼樺厛绾�"] = ((i + 1) * 5);
} else {
if (data[i]["浼樺厛绾�"] == 0 || data[i]["浼樺厛绾�"] == "") {
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserListEdit.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserListEdit.html"
index b555e1f..f73d19b 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserListEdit.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserListEdit.html"
@@ -733,6 +733,8 @@
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
+ $("#HEmpName").val("");
+ $("#HEmpID").val(0);
//鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
//return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
},
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_KeyElement.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_KeyElement.html"
index f37eea9..87ec336 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_KeyElement.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_KeyElement.html"
@@ -746,7 +746,7 @@
"field": {
"HProcID": $("#HProcID").val(), "HBatchNo": "",
"HGroupID": $("#HGroupID").val(), "HSourceID": $("#HSourceID").val(),
- "HProdOrgID": sessionStorage["OrganizationID"],
+ "HPRDOrgID": sessionStorage["OrganizationID"],
"HEmpID": $("#HEmpID").val(), "HDeptID": $("#HDeptID").val()
}
};
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..2e2dc48 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" id="HICMOInterID" name="HICMOInterID" lay-verify="HICMOInterID" style="display:none;">
+ <input type="text" class="layui-input" id="HICMOEntryID" 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 () {
//鍒锋柊椤甸潰,
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_batch.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_batch.html"
index 4290378..592e0af 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_batch.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_batch.html"
@@ -492,7 +492,7 @@
"field": {
"HProcID": $("#HProcID").val(), "HBatchNo": $("#HBarCode_Batch").val(),
"HGroupID": $("#HGroupID").val(), "HSourceID": $("#HSourceID").val(),
- "HProdOrgID": sessionStorage["OrganizationID"],
+ "HPRDOrgID": sessionStorage["OrganizationID"],
"HEmpID": $("#HEmpID").val(), "HDeptID": $("#HDeptID").val()
}
};
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_generateCaseCode.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_generateCaseCode.html"
index 1386009..a1dec96 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_generateCaseCode.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_generateCaseCode.html"
@@ -465,7 +465,7 @@
"field": {
"HProcID": $("#HProcID").val(), "HBatchNo": "", "HWeight": $("#HWeight").val(),
"HGroupID": $("#HGroupID").val(), "HSourceID": $("#HSourceID").val(),
- "HProdOrgID": sessionStorage["OrganizationID"],
+ "HPRDOrgID": sessionStorage["OrganizationID"],
"HEmpID": $("#HEmpID").val(), "HDeptID": $("#HDeptID").val()
}
};
--
Gitblit v1.9.1