From bdc4e1bddd257f1fb04854e8654149b7d9f4975d Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 20 十一月 2023 12:02:54 +0800
Subject: [PATCH] 1
---
WebTM/views/车间管理/单品过站/Cj_ProcessItemBGA.html | 32 +
WebTM/views/车间管理/单品过站/Cj_ProcessItemStationPlatform.html | 56 ++-
WebTM/views/WMS扫码模块/销售出库/Kf_SellOutBill_QiaoYi_PDA.html | 79 +---
WebTM/views/车间管理/单品过站/Cj_ProcessItemBGA_PJGH.html | 20
WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatForm.html | 2
WebTM/views/WMS扫码模块/销售出库/Kf_SellOutBillList_QiaoYi_PDA.html | 473 +++++++++++++++++++++++++++++++
WebTM/views/公共页面/Kf_ChaoBaoEditDlg.html | 74 +---
WebTM/views/index_Mobile.html | 48 --
WebTM/layuiadmin/Scripts/webConfig.js | 4
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html | 6
WebTM/views/车间管理/单品过站/Cj_CollectionOfSingleProductDefects.html | 66 +++-
WebTM/WebTM.csproj | 1
12 files changed, 652 insertions(+), 209 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 720228c..7402e52 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -220,6 +220,7 @@
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇绠＄悊\鐢熶骇缁勬墭鍗昞Sc_PackUnionBill_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇璋冩嫧\璋冩嫧鎹㈡墭\Kf_MoveStockBill_HuanTuo_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇璋冩嫧\璋冩嫧鎹㈡墭\Kf_MoveStockBillList_HuanTuo_PDA.html" />
+ <Content Include="views\WMS鎵爜妯″潡\閿�鍞嚭搴揬Kf_SellOutBillList_QiaoYi_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\閿�鍞嚭搴揬Kf_SellOutBill_QiaoYi_PDA.html" />
<Content Include="views\浜轰簨绠＄悊\寮傚父鍙嶉鍗昞OA_ErrMsgBackBillList_PDA.html" />
<Content Include="views\浜轰簨绠＄悊\寮傚父鍙嶉鍗昞OA_ErrMsgBackBill_PDA.html" />
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 987ad69..7be662b 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -3,9 +3,9 @@
//var WEBURL = "http://192.168.16.80:8011/"; //鍔炲叕瀹ゆ湇鍔″櫒
//var WEBURL = "http://localhost:8081/SWEAPI/"; //ch鏈湴*/
//var WEBURL = "http://61.164.86.218:8099/ABAPI/";
-/* var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�*/
+ 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:81/API/"; //闄堥洴闈欐湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆
//var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList_QiaoYi_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList_QiaoYi_PDA.html"
new file mode 100644
index 0000000..2a7c966
--- /dev/null
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList_QiaoYi_PDA.html"
@@ -0,0 +1,473 @@
+锘�<!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>
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-tab" lay-filter="tab-Kf_SellOutBillList_QiaoYi_PDA">
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <li lay-id="1" style="padding:1px;">缂撳瓨鍒楄〃</li>
+ <li lay-id="2" style="padding:1px;">宸蹭笂浼犲垪琛�</li>
+ </ul>
+ <div class="layui-tab-content">
+ <!--缂撳瓨鍒楄〃-->
+ <div class="layui-tab-item">
+ <div class="layui-row">
+ <div class="layui-col-xs12">
+ <div class="layui-form-item" style="padding:0px;margin:0px"></div>
+ <table class="layui-hide" id="dj-table" lay-filter="dj-table"></table>
+ </div>
+ </div>
+ </div>
+ <!--宸蹭笂浼犲垪琛�-->
+ <div class="layui-tab-item">
+ <div class="layui-form-item" style="padding: 0px; margin: 0px">
+ <div class="layui-row">
+ <div class="layui-col-xs2">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁鍙�</label>
+ </div>
+ <div class="layui-col-xs10">
+ <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs2">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">婧愬崟鍗曞彿</label>
+ </div>
+ <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>
+ <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px;">
+ <div class="layui-col-xs6">
+ <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdQuery" class="layui-btn" id="cmdQuery">鏌ヨ</button>
+ </div>
+ <div class="layui-col-xs4">
+ <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdRescind" class="layui-btn" id="cmdRescind">鎾ら攢</button>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs12">
+ <div class="layui-form-item" style="padding:0px;margin:0px"></div>
+ <table class="layui-hide" id="Uploaded-table" lay-filter="Uploaded-table"></table>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
+ <div class="layui-row">
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdModify" class="layui-btn" id="cmdModify">缂栬緫</button>
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdDelete" class="layui-btn" id="cmdDelete">鍒犻櫎</button>
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdRefresh" class="layui-btn" id="cmdRefresh">鍒锋柊</button>
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdCancel" class="layui-btn" id="cmdCancel">閫�鍑�</button>
+ </div>
+ </div>
+ </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>
+ </form>
+ </div>
+ </div>
+ </div>
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element;
+ var HBillType = '1205'
+ var HMaker = sessionStorage["HUserName"]
+ var HStockOrgID = sessionStorage["OrganizationID"] //缁勭粐ID
+ var HBillNo = $('#HBillNo').val()
+ var HSourceBillNo = $('#HSourceBillNo').val()
+ var listOption = []; //缂撳瓨鍒楄〃
+ var Uploadedoption = []; //宸蹭笂浼犲垪琛�
+ var columns = "";
+ var Uploadedcolumns = "";
+ var HModName = "Kf_SellOutBillList_QiaoYi_PDA";
+ var titleData = []; //涓嶉渶瑕佹樉绀虹殑瀛楁
+ var UploadedtitleData = []; //涓嶉渶瑕佹樉绀虹殑瀛楁
+
+ //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+ if (sessionStorage.login != "login") {
+ layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+ icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+ }, function () { window.location.href = "../../user/login.html"; });
+ }
+
+ //澶辫触鎻愮ず闊�
+ function playSound() {
+ console.log("playSound");
+ var audio = document.getElementById("cs");
+ audio.play();
+ }
+ //鎴愬姛鎻愮ず闊�
+ function playSound_OK() {
+ console.log("playSound_OK");
+ var audio = document.getElementById("cs2");
+ audio.play();
+ }
+
+ //#region 鍒濆鍖栫晫闈�
+
+ set_ClearBill();
+
+ function set_ClearBill() {
+ //榛樿鏄剧ず椤甸潰
+ element.tabChange('tab-Kf_SellOutBillList_QiaoYi_PDA', '1');
+ set_InitGrid(); //鍒濆鍖栬〃鏍�
+ //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+ DisTempEntryList();
+ //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+ DisUploadedList();
+ }
+
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ //缂撳瓨鍒楄〃
+ listOption = {
+ elem: '#dj-table'
+ //, toolbar: '#toolbarDemo'
+ //, totalRow: true
+ , height: 'full-50'
+ , cellMinWidth: 90
+ , limit: 50
+ };
+
+ //宸蹭笂浼犲垪琛�
+ Uploadedoption = {
+ elem: '#Uploaded-table'
+ //, toolbar: '#toolbarDemo'
+ //, totalRow: true
+ , height: 'full-50'
+ , cellMinWidth: 90
+ , limit: 50
+ };
+ }
+
+ //#endregion
+
+
+ //#region 缂栬緫鍔熻兘鎺т欢
+
+ form.on('submit(cmdModify)', function () {
+ var checkStatus = table.checkStatus('dj-table')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/TempList_Modify_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": data[0].HInterID, "HBillNo": data[0].鍗曟嵁鍙�, "HBillType": HBillType },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '閿�鍞嚭搴撳崟'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../WMS鎵爜妯″潡/閿�鍞嚭搴�/Kf_SellOutBill_QiaoYi_PDA.html?OperationType=2&HInterID=' + data[0].HInterID, 'yes']
+ , resize: false
+ , cancel: function () {
+ $(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ else {
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.msg("閿欒" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+ else {
+ layer.msg('璇峰厛閫変腑涓�琛屾暟鎹紒');
+ }
+ });
+
+ //#endregion
+
+
+ //#region 鍒犻櫎鍔熻兘鎺т欢
+
+ form.on('submit(cmdDelete)', function () {
+ var checkStatus = table.checkStatus('dj-table')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ layer.confirm("纭瑕佸垹闄ら�変腑琛屾墍鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�", { title: "鍒犻櫎纭" }, function (index) {
+ layer.load(3)
+ $.ajax(
+ {
+ type: "Get",
+ url: GetWEBURL() + "/WEBSController/set_DelPonderationBillMain_Temp_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": data[0].HInterID, "HBillType": HBillType },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+ //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+ DisTempEntryList();
+ });
+ }
+ else {
+ playSound();
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ layer.closeAll("loading");
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ }
+ });
+
+ //#endregion
+
+
+ //#region 鍒锋柊鍔熻兘鎺т欢
+
+ form.on('submit(cmdRefresh)', function () {
+ //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+ DisTempEntryList();
+ });
+
+ //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+ function DisTempEntryList() {
+ layer.load(3)
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + '/WEBSController/GetKf_PonderationBillMain_TempList_New_Json',
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HBillType": HBillType, "HMaker": HMaker, "HStockOrgID": HStockOrgID },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in result.list) {
+ //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+ data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
+ //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+ var patrn = new RegExp(/^h/i);
+ if (patrn.test(result.list[key].ColmCols)) {
+ titleData[key] = result.list[key].ColmCols;
+ }
+ }
+
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'radio', fixed: 'left' });
+ for (var i = 0; i < data.length; i++) {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ 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 + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 150 });
+ break;
+ default:
+
+ if (data[i].name == '鍗曟嵁鍙�' || data[i].name == '缁勭粐' || data[i].name == '婧愬崟鍗曞彿' || data[i].name == '鍗曟嵁鍐呯爜') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 150 });
+ } else {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center' });
+ }
+ }
+ }
+ }
+ columns = col;
+ listOption.cols = [columns];
+ listOption.data = result.data;
+ //listOption.totalRow = true;
+ table.render(listOption);
+ }
+ else {
+ //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ }
+ });
+ layer.closeAll("loading");
+ }
+
+ //#endregion
+
+
+ //#region 閫�鍑哄姛鑳芥帶浠�
+
+ form.on('submit(cmdCancel)', function () {
+ layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+ parent.location.href = "../../../views/index_Mobile.html";
+ });
+ })
+
+ //#endregion
+
+
+ //#region 鏌ヨ鍔熻兘鎺т欢
+
+ form.on('submit(cmdQuery)', function () {
+ HBillNo = $("#HBillNo").val();
+ HSourceBillNo = $("#HSourceBillNo").val();
+ //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+ DisUploadedList();
+ });
+
+ //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+ function DisUploadedList() {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + '/WEBSController/GetKf_ICStockBillQueryList_Json',
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HBillType": HBillType, "HBillNo": HBillNo, "HSourceBillNo": HSourceBillNo },
+ success: function (result) {
+ if (result.count == 1) {
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in result.list) {
+ //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+ data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
+ //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+ var patrn = new RegExp(/^h/i);
+ if (patrn.test(result.list[key].ColmCols)) {
+ UploadedtitleData[key] = result.list[key].ColmCols;
+ }
+ }
+
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'radio', fixed: 'left' });
+ for (var i = 0; i < data.length; i++) {
+ if ($.inArray(data[i].name, UploadedtitleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ 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 + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+ break;
+ default:
+
+ if (data[i].name == '鏁伴噺') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 80 });
+ } else {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 150 });
+ }
+ }
+ }
+ }
+ Uploadedcolumns = col;
+ Uploadedoption.cols = [Uploadedcolumns];
+ Uploadedoption.data = result.data;
+ //Uploadedoption.totalRow = true;
+ table.render(Uploadedoption);
+ }
+ else {
+ //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ }
+ });
+ }
+
+ //#endregion
+
+
+ //#region 鎾ゆ秷鍔熻兘鎺т欢
+
+ form.on('submit(cmdRescind)', function () {
+ var checkStatus = table.checkStatus('Uploaded-table')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ layer.load(3)
+ $.ajax(
+ {
+ type: "Get",
+ url: GetWEBURL() + "/WEBSController/DeleteICStockBillAndWMS_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": data[0].HInterID, "HBillNo": data[0].鍗曟嵁鍙�, "HBillType": HBillType },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+ element.tabChange('tab-Kf_SellOutBillList_QiaoYi_PDA', '1');
+ //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+ DisTempEntryList();
+ //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+ DisUploadedList();
+ });
+ }
+ else {
+ playSound();
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ layer.closeAll("loading");
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛岃褰曪紝杩涜鎾ら攢锛�');
+ }
+ });
+
+ //#endregion
+
+ });
+ </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_QiaoYi_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_QiaoYi_PDA.html"
index 8d29daa..d83d8be 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_QiaoYi_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_QiaoYi_PDA.html"
@@ -122,7 +122,8 @@
</div>
<div class="layui-col-xs10">
<div class="layui-col-xs12">
- <input type="text" name="HSupName" id="HSupName" lay-verify="HSupName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+ <input type="text" name="HSupName" id="HSupName" lay-verify="HSupName" autocomplete="off" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" readonly>
+ <!--<input type="text" name="HSupName" id="HSupName" lay-verify="HSupName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">-->
<input type="hidden" name="HSupID" id="HSupID" lay-verify="HSupID" value="0" autocomplete="off" class="layui-input">
</div>
<!--<div class="layui-col-xs1">
@@ -233,7 +234,6 @@
</div>
</div>
</div>
-
</div>
</div>
<div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
@@ -377,7 +377,7 @@
, limit: 3000
, totalRow: true
, cols: [[
- { field: 'HBarCode', title: '鏉＄爜缂栧彿', width: 220, totalRow: true }
+ { field: 'HBarCode', title: '鏉＄爜缂栧彿', width: 220 }
, { field: 'HQty', title: '鏁伴噺', width: 80, totalRow: true }
, { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
, { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
@@ -459,6 +459,8 @@
success: function (d) {
$("#HInterID").val(d.data[0].HInterID);
$("#HBillNo").val(d.data[0].HBillNo);
+ HInterID = $('#HInterID').val()
+ HBillNo = $('#HBillNo').val()
$("#HMainSourceBillType").val(d.data[0].HSourceBillType == null ? "1402" : d.data[0].HSourceBillType);
//鑾峰彇婧愬崟绫诲瀷
if (d.data[0].HSourceBillType == "1402") {
@@ -844,7 +846,12 @@
layer.confirm(data.Message, {
icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板','鍏抽棴'],
btn2: function () {
- parent.location.href = "../../../views/index_Mobile.html";
+ if (OperationType == 2) {
+ parent.location.href = "../../WMS鎵爜妯″潡/閿�鍞嚭搴�/Kf_SellOutBillList_QiaoYi_PDA.html";
+ }
+ else {
+ parent.location.href = "../../../views/index_Mobile.html";
+ }
}//鍏抽棴
}
, function () {
@@ -935,7 +942,6 @@
layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
- layer.close(index)
layer.closeAll("loading");
})
}
@@ -950,7 +956,13 @@
form.on('submit(cmdCancel)', function () {
layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
- parent.location.href = "../../../views/index_Mobile.html";
+ if (OperationType == 2) {
+ var index = parent.layer.getFrameIndex(window.name);
+ parent.layer.close(index);
+ }
+ else {
+ parent.location.href = "../../../views/index_Mobile.html";
+ }
});
})
@@ -1013,24 +1025,20 @@
//鎵弿婧愬崟鏉＄爜
$('#HSourceBillNo').on('keydown', function (event) {
if (event.keyCode == 13) {
- layer.load(3)
GetMeesageBySourceBillNo();
- layer.closeAll("loading");
}
});
//婧愬崟鎸夐挳
form.on('submit(HSourceBillNo-BT)', function (data) {
- layer.load(3)
GetMeesageBySourceBillNo();
- layer.closeAll("loading");
});
//鎵弿婧愬崟鏉＄爜
function GetMeesageBySourceBillNo(obj) {
var HSourceBillNo = $('#HSourceBillNo').val()
var HSourceBillType = $("#HMainSourceBillType").val()
-
+ layer.load(3)
$.ajax({
type: "GET",
url: GetWEBURL() + "/WEBSController/Get_SourceBarCode_SellOut_Json",
@@ -1065,6 +1073,7 @@
}
}
});
+ layer.closeAll("loading");
}
//#endregion
@@ -1075,19 +1084,15 @@
//鎵弿鏉＄爜
$('#HBarCode').on('keydown', function (event) {
if (event.keyCode == 13) {
- layer.load(3)
GetMeesageByBarCode();
$("#HBarCode").focus(); //鑾峰彇鍏夋爣
- layer.closeAll("loading");
}
});
//鏉＄爜鎸夐挳
form.on('submit(HBarCode-BT)', function (data) {
- layer.load(3)
GetMeesageByBarCode();
$("#HBarCode").focus(); //鑾峰彇鍏夋爣
- layer.closeAll("loading");
});
//鎵潯鐮�
@@ -1101,6 +1106,7 @@
var sSourceBillNo = $("#HSourceBillNo").val()
var sSourceBillType = $("#HMainSourceBillType").val()
+ layer.load(3)
if (HDeleteFlag == "*") {
if (sBarCode == "") {
layer.msg("璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�", { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
@@ -1253,6 +1259,7 @@
}
});
}
+ layer.closeAll("loading");
}
//#endregion
@@ -1282,7 +1289,7 @@
}
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
- col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+ col.push({ type: 'radio', fixed: 'left', totalRowText: '鍚堣' });
for (var i = 0; i < data.length; i++) {
if ($.inArray(data[i].name, titleData) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
@@ -1307,17 +1314,6 @@
}
}
columns = col;
-
- //璁剧疆璧嬪�煎垪瀹�
- var colWidth = getColumnsWidth();
- if (colWidth == "" || colWidth == []) {
-
- }
- else {
- $.each(columns, function (x, m) {
- m["width"] = colWidth[x];
- });
- }
listOption.cols = [columns];
listOption.data = result.data.Materlist;
listOption.totalRow = true;
@@ -1332,35 +1328,6 @@
}
});
}
-
- //#region 鑾峰彇鍒楀
- function getColumnsWidth() {
- var result = [];
- var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
- //鑾峰彇鍒楀
- $.ajax({
- type: "Get",
- url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidthList',
- async: false,
- dataType: "json",
- data: { "colNum": colNum, "Name": HModName },
- success: function (data1) {
- if (data1.code == 1) {
- result = data1.data;
- }
- else if (data1.code == -1) {
-
- }
- else {
- layer.alert(data1.Message, { icon: 5 });
- }
- }, error: function (e) {
- layer.alert(e.Message, { icon: 5 });
- }
- });
- return result;
- }
- //#endregion
//#endregion
diff --git a/WebTM/views/index_Mobile.html b/WebTM/views/index_Mobile.html
index 5da5b80..3d96b98 100644
--- a/WebTM/views/index_Mobile.html
+++ b/WebTM/views/index_Mobile.html
@@ -690,6 +690,12 @@
</a>
</dd>
<dd>
+ <a lay-href="WMS鎵爜妯″潡/閿�鍞嚭搴�/Kf_SellOutBillList_QiaoYi_PDA.html" style="color: aqua;">
+ <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+ 閿�鍞嚭搴撶紦瀛樺垪琛ㄢ�斾箶涓�
+ </a>
+ </dd>
+ <dd>
<a lay-href="棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_CheckList_New.html" style="color: aqua;">
<img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
閿�鍞嚭搴撴牎楠岀紦瀛樺垪琛�
@@ -755,48 +761,6 @@
鎹㈡墭璋冩嫧鍗曠紦瀛樺垪琛�
</a>
</dd>
- <!--<dd>
- <a lay-href="" style="color: aqua;">
- <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
- 鍒嗘寮忚皟鍑虹紦瀛樺垪琛╪ull
- </a>
- </dd>
- <dd>
- <a lay-href="" style="color: aqua;">
- <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
- 鍒嗘寮忚皟鍏ョ紦瀛樺垪琛╪ull
- </a>
- </dd>
- <dd>
- <a lay-href="" style="color: aqua;">
- <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
- 閲囪喘閫�鏂欑紦瀛樺垪琛╪ull
- </a>
- </dd>
- <dd>
- <a lay-href="" style="color: aqua;">
- <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
- 鐢熶骇閫�搴撶紦瀛樺垪琛╪ull
- </a>
- </dd>
- <dd>
- <a lay-href="" style="color: aqua;">
- <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
- 鐢熶骇閫�鏂欑紦瀛樺垪琛╪ull
- </a>
- </dd>
- <dd>
- <a lay-href="" style="color: aqua;">
- <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
- 閿�鍞��璐х紦瀛樺垪琛╪ull
- </a>
- </dd>
- <dd>
- <a lay-href="" style="color: aqua;">
- <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
- 鍒拌揣鐐规暟缂撳瓨鍒楄〃null
- </a>
- </dd>-->
</dl>
</li>
<!-- 绯荤粺绠＄悊 -->
diff --git "a/WebTM/views/\345\205\254\345\205\261\351\241\265\351\235\242/Kf_ChaoBaoEditDlg.html" "b/WebTM/views/\345\205\254\345\205\261\351\241\265\351\235\242/Kf_ChaoBaoEditDlg.html"
index c271668..d089338 100644
--- "a/WebTM/views/\345\205\254\345\205\261\351\241\265\351\235\242/Kf_ChaoBaoEditDlg.html"
+++ "b/WebTM/views/\345\205\254\345\205\261\351\241\265\351\235\242/Kf_ChaoBaoEditDlg.html"
@@ -167,7 +167,7 @@
set_InitGrid(); //鍒濆鍖栬〃鏍�
//鍏夋爣榛樿鍦ㄦ潯鐮佷綅缃笂
- var pFocus = $("#HBarCode");
+ var pFocus = $("#HQty");
pFocus.focus(); //鑾峰彇鍏夋爣
pFocus.select();
}
@@ -185,7 +185,7 @@
};
}
- //#region 浠庣紦瀛樺垪琛ㄤ腑杩斿洖淇℃伅
+ //#region 浠庢壂鐮佹ā鍧楄烦杞繑鍥炰俊鎭�
function getUrlVars() {
var vars = [], hash;
var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
@@ -209,10 +209,19 @@
//#endregion
- //鍒ゆ柇鏄惁鏂板锛岃幏鍙栨渶澶у崟鎹彿
if (HInterID != 0) {
- $("#HBarCode").select();
- $("#HBarCode").focus(); //鑾峰彇鍏夋爣
+ //杩斿洖鐗╂枡淇℃伅
+ $("#HBarCode").val(HMaterID);
+ var sBarCode = $('#HBarCode').val()
+ if (sBarCode == 0) {
+ $('#HBarCode').val("");
+ $("#HBarCode").select();
+ $("#HBarCode").focus(); //鑾峰彇鍏夋爣
+ }
+ else {
+ GetBarCode();
+ $("#HQty").focus(); //鑾峰彇鍏夋爣
+ }
//鏄剧ず琛ㄤ綋鏄庣粏
DisBillEntryList();
}
@@ -222,9 +231,7 @@
return;
}
-
//#endregion
-
//#region 鍔熻兘鎺т欢
@@ -262,7 +269,6 @@
layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
- layer.close(index)
layer.closeAll("loading");
})
}
@@ -289,19 +295,15 @@
//鎵弿鏉＄爜
$('#HBarCode').on('keydown', function (event) {
if (event.keyCode == 13) {
- layer.load(3)
GetBarCode();
$("#HQty").focus(); //鑾峰彇鍏夋爣
- layer.closeAll("loading");
}
});
//鏉＄爜鎸夐挳
form.on('submit(HBarCode-BT)', function (data) {
- layer.load(3)
GetBarCode();
$("#HQty").focus(); //鑾峰彇鍏夋爣
- layer.closeAll("loading");
});
//鎵潯鐮�
@@ -312,6 +314,7 @@
layer.msg("鏉＄爜涓虹┖锛岃鎵弿鏉＄爜锛�", { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
+ layer.load(3)
$.ajax({
type: "GET",
url: GetWEBURL() + "/WEBSController/GetBarCode_Json",
@@ -337,6 +340,7 @@
layer.msg("閿欒锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
+ layer.closeAll("loading");
}
//#endregion
@@ -345,9 +349,7 @@
//娣诲姞鎸夐挳
form.on('submit(cmdAdd)', function (data) {
- layer.load(3)
GetMeesageByBarCode();
- layer.closeAll("loading");
});
//灏嗘潯鐮佷俊鎭啓鍏ユ潯鐮佷复鏃惰〃
@@ -364,6 +366,7 @@
layer.msg("鏁伴噺涓嶅厑璁稿皬浜�0锛岃杈撳叆鏁伴噺锛�", { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
+ layer.load(3)
$.ajax({
type: "GET",
url: GetWEBURL() + "/WEBSController/Get_BarCode_Json",
@@ -387,6 +390,7 @@
layer.msg("閿欒锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
+ layer.closeAll("loading");
}
//#endregion
@@ -416,7 +420,7 @@
}
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
- col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+ col.push({ type: 'radio', fixed: 'left', totalRowText: '鍚堣' });
for (var i = 0; i < data.length; i++) {
if ($.inArray(data[i].name, titleData) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
@@ -439,17 +443,6 @@
}
}
columns = col;
-
- ////璁剧疆璧嬪�煎垪瀹�
- //var colWidth = getColumnsWidth();
- //if (colWidth == "" || colWidth == []) {
-
- //}
- //else {
- // $.each(columns, function (x, m) {
- // m["width"] = colWidth[x];
- // });
- //}
listOption.cols = [columns];
listOption.data = result.data;
listOption.totalRow = true;
@@ -466,35 +459,6 @@
}
});
}
-
- //#region 鑾峰彇鍒楀
- function getColumnsWidth() {
- var result = [];
- var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
- //鑾峰彇鍒楀
- $.ajax({
- type: "Get",
- url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidthList',
- async: false,
- dataType: "json",
- data: { "colNum": colNum, "Name": HModName },
- success: function (data1) {
- if (data1.code == 1) {
- result = data1.data;
- }
- else if (data1.code == -1) {
-
- }
- else {
- layer.alert(data1.Message, { icon: 5 });
- }
- }, error: function (e) {
- layer.alert(e.Message, { icon: 5 });
- }
- });
- return result;
- }
- //#endregion
//#endregion
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
index afb067b..75debf4 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
@@ -693,9 +693,9 @@
if (!isNaN(HDeptID) && HDeptName == 0) {
HDeptName = HDeptID;
}
- if (!isNaN(HDeptID)) {
- HStatus = "寮�宸�";
- }
+ //if (!isNaN(HDeptID)) {
+ // HStatus = "寮�宸�";
+ //}
if (HSF) {//鍒ゆ柇鎵撳嵃鐘舵��
if (HSF == "鍏ㄩ儴") {
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
index b129f69..f34d79b 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
@@ -751,7 +751,7 @@
columns.push({ field: '璁㈠崟浜よ揣鏈�', title: '璁㈠崟浜よ揣鏈�', width: 150, templet: "<div>{{d.璁㈠崟浜よ揣鏈� =='1900-01-01' ?'':layui.util.toDateString(d.璁㈠崟浜よ揣鏈�, 'yyyy-MM-dd')}}</div>", sort: true });
columns.push({ field: '璁㈠崟闇�姹傛暟閲�', title: '璁㈠崟闇�姹傛暟閲�', width: 150, sort: true });
columns.push({ field: '寮�宸ヤ綑閲�', title: '寮�宸ヤ綑閲�', width: 150, sort: true });
- columns.push({ field: '灏忔椂浜ц兘', title: '灏忔椂浜ц兘', width: 150, sort: true });
+ columns.push({ field: '灏忔椂浜ц兘', title: '灏忔椂浜ц兘', width: 150, sort: true, edit: 'text' });
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 });
columns.push({ field: '鏈�杩熷畬宸ユ棩鏈�', title: '鏈�杩熷畬宸ユ棩鏈�', width: 150, templet: "<div>{{d.鏈�杩熷畬宸ユ棩鏈� =='' ?'':layui.util.toDateString(d.鏈�杩熷畬宸ユ棩鏈�, 'yyyy-MM-dd')}}</div>", sort: true });
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/Cj_CollectionOfSingleProductDefects.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/Cj_CollectionOfSingleProductDefects.html"
index 5ff26ad..351b414 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/Cj_CollectionOfSingleProductDefects.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/Cj_CollectionOfSingleProductDefects.html"
@@ -168,6 +168,7 @@
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" lay-verify="HMaterNumber" value="" style="background-color:#efefef4d;">
<input type="hidden" class="layui-input" name="HMaterID" lay-verify="HMaterID" id="HMaterID" value="0">
+ <input type="hidden" class="layui-input" name="HProdOrgID" lay-verify="HProdOrgID" id="HProdOrgID" value="0">
</div>
</div>
<div class="layui-inline">
@@ -315,10 +316,12 @@
var params = getUrlVars();
var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 1娣诲姞 淇濆瓨 2澶嶅埗 3 缂栬緫 4娣诲姞瀛愬伐鑹鸿矾绾�
var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+ var HProcExchBillNo = params[params[2]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
//鍒跺崟浜�
$("#HMaker").val(sessionStorage["HUserName"]);
$("#hmakedate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HProdOrgID").val(sessionStorage["OrganizationID"]);
//鍒ゆ柇鏄惁鏂板
if (OperationType == 1) {
@@ -455,40 +458,65 @@
//鏉＄爜鍥炶溅鏌ヨ
function txtHBarCode_KeyDown(HBarCode) {
- var index = layer.load();
+ var indexs = layer.load();
$.ajax({
type: "GET",
- url: GetWEBURL() + "/Cj_SingleStation/HBardCodeList",
- async: true,
- data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"]},
+ 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(index);
- $("#HICMOBillNo").val(data1.data[0]["鐢熶骇璁㈠崟"]);
- $("#HICMOInterID").val(data1.data[0]["HICMOInterID"]);
- $("#HICMOEntryID").val(data1.data[0]["HICMOEntryID"]);
- $("#HProcExchBillNo").val(data1.data[0]["宸ュ簭娴佽浆鍗�"]);
- $("#HProcExchInterID").val(data1.data[0]["HSourceInterID"]);
- $("#HProcExchEntryID").val(data1.data[0]["HProcExchEntryID"]);
- $("#HMaterNumber").val(data1.data[0]["鐗╂枡缂栫爜"]);
- $("#HMaterID").val(data1.data[0]["HMaterID"]);
- $("#HMaterName").val(data1.data[0]["鐗╂枡鍚嶇О"]);
- $("#HModel").val(data1.data[0]["瑙勬牸鍨嬪彿"]);
- $("#HBarCode").val(data1.data[0]["鏉＄爜"]);
-
+ layer.close(indexs);
+ var index = layer.load();
+
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Cj_SingleStation/HBardCodeList",
+ async: false,
+ data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"] },
+ dataType: "json",
+ success: function (data1) {
+ if (data1.count == 1) {
+ layer.close(index);
+ $("#HICMOBillNo").val(data1.data[0]["鐢熶骇璁㈠崟"]);
+ $("#HICMOInterID").val(data1.data[0]["HICMOInterID"]);
+ $("#HICMOEntryID").val(data1.data[0]["HICMOEntryID"]);
+ $("#HProcExchBillNo").val(data1.data[0]["宸ュ簭娴佽浆鍗�"]);
+ $("#HProcExchInterID").val(data1.data[0]["HSourceInterID"]);
+ $("#HProcExchEntryID").val(data1.data[0]["HProcExchEntryID"]);
+ $("#HMaterNumber").val(data1.data[0]["鐗╂枡缂栫爜"]);
+ $("#HMaterID").val(data1.data[0]["HMaterID"]);
+ $("#HMaterName").val(data1.data[0]["鐗╂枡鍚嶇О"]);
+ $("#HModel").val(data1.data[0]["瑙勬牸鍨嬪彿"]);
+ $("#HBarCode").val(data1.data[0]["鏉＄爜"]);
+
+ }
+ else {
+ layer.close(index);
+ layer.msg(data1.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ $("#HBarCodeSN").val("");
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
}
else {
- layer.close(index);
+ layer.close(indexs);
layer.msg(data1.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
$("#HBarCodeSN").val("");
},
error: function (err) {
- layer.close(index);
+ layer.close(indexs);
layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
+
+
}
//涓嶈壇鍘熷洜閫夋嫨椤甸潰
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/Cj_ProcessItemBGA.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/Cj_ProcessItemBGA.html"
index 0655584..b7df8e6 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/Cj_ProcessItemBGA.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/Cj_ProcessItemBGA.html"
@@ -371,12 +371,17 @@
// NG淇濆瓨
form.on('submit(NGSave)', function (data) {
- get_Save(data,"NG");
+ if (AllowLoadData()) {
+ get_Save(data, "NG");
+ }
+
});
// OK淇濆瓨
form.on('submit(OKSave)', function (data) {
- get_Save(data,"OK");
+ if (AllowLoadData()) {
+ get_Save(data, "OK");
+ }
});
//#endregion
@@ -760,6 +765,8 @@
var HSourceBillNo = $("#HSourceBillNo").val();
var HSourceBillType = $("#HSourceBillType").val();
var HProcExchBillNo = $("#HProcExchBillNo").val();
+ var HProcExchInterID = $("#HProcExchInterID").val();
+ var HProcExchEntryID = $("#HProcExchEntryID").val();
var HProcess = $("#HProcess").val();
var HICMOInterID = $("#HICMOInterID").val();
var HICMOBillNo = $("#HICMOBillNo").val();
@@ -778,6 +785,8 @@
, 'HSourceBillType': HSourceBillType
, 'HBarCode': HBarCode
, 'HProcExchBillNo': HProcExchBillNo
+ , 'HProcExchInterID': HProcExchInterID
+ , 'HProcExchEntryID': HProcExchEntryID
, 'HProcess': HProcess
, 'HICMOInterID': HICMOInterID
, 'HICMOBillNo': HICMOBillNo
@@ -808,7 +817,7 @@
function get_Save(data, HResult) {
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache["mainTable"]);
- var sMainSub = sMainStr + ';' + sSubStr + ";" + sSubStr+ ";" + sessionStorage["HUserName"] + ";" + HResult;
+ var sMainSub = sMainStr + ';' + sSubStr + ";" + sessionStorage["HUserName"] + ";" + HResult;
var index = layer.load();
$.ajax({
@@ -841,6 +850,23 @@
});
}
+ //闈炵┖楠岃瘉
+ function AllowLoadData(data) {
+
+ //var HBarCode = $("#HBarCode").val();
+ //if (HBarCode == "") {
+ // layer.msg("浜у搧SN涓嶈兘涓虹┖!")
+ // return false;
+ //}
+
+ var HBadReasonID = $("#HBadReasonID").val();
+ if (HBadReasonID == 0) {
+ layer.msg("涓嶈壇鍘熷洜涓嶈兘涓虹┖!")
+ return false;
+ }
+ return true;
+ }
+
//#endregion
});
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/Cj_ProcessItemBGA_PJGH.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/Cj_ProcessItemBGA_PJGH.html"
index f09a84b..070d666 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/Cj_ProcessItemBGA_PJGH.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/Cj_ProcessItemBGA_PJGH.html"
@@ -102,6 +102,8 @@
<input type="hidden" name="HSupID" id="HSupID" lay-verify="HSupID" value="0">
<input type="hidden" name="HBatchNo" id="HBatchNo" lay-verify="HBatchNo">
<input type="hidden" name="HProcExchBillNo" id="HProcExchBillNo" lay-verify="HProcExchBillNo">
+ <input type="hidden" name="HProcExchEntryID" id="HProcExchEntryID" lay-verify="HProcExchEntryID">
+ <input type="hidden" name="HProcExchInterID" id="HProcExchInterID" lay-verify="HProcExchInterID">
<input type="hidden" name="HProcess" id="HProcess" lay-verify="HProcess">
<input type="hidden" name="HICMOInterID" id="HICMOInterID" lay-verify="HICMOInterID">
<input type="hidden" name="HICMOBillNo" id="HICMOBillNo" lay-verify="HICMOBillNo">
@@ -198,6 +200,8 @@
$("#HBillNo").val(datajson.HBillNo);
$("#HBillNo_bak").val(datajson.HBillNo);
$("#HProcExchBillNo").val(datajson.HProcExchBillNo);
+ $("#HProcExchInterID").val(datajson.HProcExchInterID);
+ $("#HProcExchEntryID").val(datajson.HProcExchEntryID);
$("#HICMOInterID").val(datajson.HICMOInterID);
$("#HICMOBillNo").val(datajson.HICMOBillNo);
$("#HICMOEntryID").val(datajson.HICMOEntryID);
@@ -270,7 +274,7 @@
//鏌ヨ鏉＄爜缁戝畾鐨勮繑淇褰�
get_RepairRecord();
//鏌ヨ鐗╂枡娓呭崟鏁版嵁
- get_BomList($("#HProcExchBillNo").val());
+ get_BomList();
}
//鏌ヨ
@@ -508,13 +512,13 @@
}
//娴佽浆鍗℃煡璇㈠叧閿欢娓呭崟
- function get_BomList(HBarCode) {
+ function get_BomList() {
var index = layer.load();
$.ajax({
type: "GET",
- url: GetWEBURL() + "/Cj_SingleStation/HBardCodeBomList",
+ url: GetWEBURL() + "/Cj_SingleStation/AssemHBardCodeBomList",
async: false,
- data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"] },
+ data: { "HProcExchInterID": $("#HProcExchInterID").val(), "HProcExchEntryID": $("#HProcExchEntryID").val(), "HMaterSN": $("#HMaterSN").val(), "user": sessionStorage["HUserName"] },
dataType: "json",
success: function (data1) {
if (data1.count == 1) {
@@ -549,9 +553,8 @@
, { field: '閰嶄欢鍚嶇О', title: '閰嶄欢鍚嶇О' }
, { field: '閰嶄欢瑙勬牸', title: '閰嶄欢瑙勬牸' }
, { field: '閰嶄欢鏁伴噺', title: '閰嶄欢鏁伴噺' }
+ , { field: 'HBarCode', title: '褰撳墠閰嶄欢鐮�' }
, { field: 'HBatchNo', title: '褰撳墠鎵规' }
- , { field: 'BomHInterID', title: 'BomHInterID', hide: true }
- , { field: 'BomHEntryID', title: 'BomHEntryID', hide: true }
, { field: 'HICMOInterID', title: 'HICMOInterID', hide: true }
, { field: 'HICMOEntryID', title: 'HICMOEntryID', hide: true }
, { field: 'HICMOBillNo', title: 'HICMOBillNo', hide: true }
@@ -559,7 +562,7 @@
, { field: 'HProcExchEntryID', title: 'HProcExchEntryID', hide: true }
, { field: 'HProcExchBillNo', title: 'HProcExchBillNo', hide: true }
, { field: 'HMaterID', title: 'HMaterID', hide: true }
- , { field: 'HBarCode', title: 'HBarCode', hide: true }
+ //, { field: 'HBarCode', title: 'HBarCode', hide: true }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo2' }
]]
}
@@ -597,8 +600,7 @@
var HResult = "閰嶄欢";
var sMainStr = JSON.stringify(data1.field);
var sSubStr = JSON.stringify(table.cache["mainTable2"][KNum]);
- var sSubStr2 = JSON.stringify(table.cache["mainTable2"]);
- var sMainSub = sMainStr + ';' + sSubStr + ';' + sSubStr2 + ";" + sessionStorage["HUserName"] + ";" + HResult;
+ var sMainSub = sMainStr + ';' + sSubStr + ";" + sessionStorage["HUserName"] + ";" + HResult;
var index = layer.load();
$.ajax({
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/Cj_ProcessItemStationPlatform.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/Cj_ProcessItemStationPlatform.html"
index 5222e51..58f206b 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/Cj_ProcessItemStationPlatform.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/Cj_ProcessItemStationPlatform.html"
@@ -603,6 +603,7 @@
$.ajax({
url: GetWEBURL() + '/Cj_SingleStation/BadRecordsList',
type: "GET",
+ async: false,
data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
@@ -631,6 +632,7 @@
$.ajax({
url: GetWEBURL() + '/Cj_SingleStation/HGRecordsList',
type: "GET",
+ async: false,
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
@@ -651,37 +653,52 @@
//鏉＄爜鍥炶溅鏌ヨ
function txtHBarCode_KeyDown(HBarCode) {
-
- var index = layer.load();
+ var HProcExchBillNo = $("#HProcExchBillNo").val();
+ var indexs = layer.load();
$.ajax({
type: "GET",
- url: GetWEBURL() + "/Cj_SingleStation/HBardCodeAccessoryList",
+ url: GetWEBURL() + "/Cj_SingleStation/SNHBardCodeList",
async: false,
- data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"]},
+ data: { "HBarCode": HBarCode, "HProcExchBillNo": HProcExchBillNo, "user": sessionStorage["HUserName"], "HOrgID": sessionStorage["OrganizationID"] },
dataType: "json",
success: function (data1) {
if (data1.count == 1) {
- layer.close(index);
- var HProcExchBillNo = $("#HProcExchBillNo").val();
- //if (data1.data[0]["HSourceBillNo"] != HProcExchBillNo) {
- // return layer.msg("鎵爜閿欒,璇烽噸鏂版壂!");
- //} else {
- // $("#HBarCode_P").val(HBarCode);
- // layer.msg("鎵爜鎴愬姛!");
- //}
+ layer.close(indexs);
+ var index = layer.load();
- $("#HBarCode_P").val(HBarCode);
- //淇濆瓨鏁版嵁
- set_AddAssemblyBill();
+ $.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);
+ //淇濆瓨鏁版嵁
+ set_AddAssemblyBill();
+ }
+ else {
+ layer.close(index);
+ layer.msg(data1.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ $("#HBarCodeSN").val("");
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
}
else {
- layer.close(index);
+ layer.close(indexs);
layer.msg(data1.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
$("#HBarCodeSN").val("");
},
error: function (err) {
- layer.close(index);
+ layer.close(indexs);
layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
@@ -822,6 +839,7 @@
layer.confirm('鏄惁瑕佹妸褰撳墠鎵规:' + option.data[i]["HBatchNo"] + '鏇挎崲鎴愭壒娆�:' + data1.data[0]["HBatchNo"], function (index) {
layer.close(index);
option.data[i]["HBatchNo"] = data1.data[0]["HBatchNo"];
+ option.data[i]["閰嶄欢鏁伴噺"] = data1.data[0]["HQty"];
option.data[i]["HBarCode"] = HBarCode;
table.render(option);
});
@@ -829,6 +847,7 @@
}
if (data1.data[0]["HMaterNumber"] == option.data[i]["閰嶄欢浠ｇ爜"]) {
option.data[i]["HBatchNo"] = data1.data[0]["HBatchNo"];
+ option.data[i]["閰嶄欢鏁伴噺"] = data1.data[0]["HQty"];
option.data[i]["HBarCode"] = HBarCode;
KNum += 1;
table.render(option);
@@ -1049,7 +1068,7 @@
, area: ['100%', '100%']//澶у皬
, title: '宸ュ簭涓嶈壇姹囨姤'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../杞﹂棿绠＄悊/鍗曞搧杩囩珯/Cj_CollectionOfSingleProductDefects.html?OperationType=1&linterid=' + $("#HInterID").val(), 'yes']
+ , content: ['../../杞﹂棿绠＄悊/鍗曞搧杩囩珯/Cj_CollectionOfSingleProductDefects.html?OperationType=1&linterid=' + $("#HInterID").val() + '&HProcExchBillNo=' + $("#HProcExchBillNo").val(), 'yes']
, end: function () {
get_BadRecords($("#HBardCodeProcExchBillNo").val());
}
@@ -1084,7 +1103,6 @@
get_AddBomTempList();
var HBardCodeProcExchBillNo = $("#HBardCodeProcExchBillNo").val();
get_BomList(HBardCodeProcExchBillNo);
- get_BadRecords(HBardCodeProcExchBillNo);
//鏌ヨ鍚堟牸璁板綍
get_HGRecords();
//鏌ヨ涓嶈壇璁板綍
--
Gitblit v1.9.1