From 1649e7d012690b0a2563c3c336ded364d0a5737e Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期六, 16 十一月 2024 13:57:19 +0800
Subject: [PATCH] 1.合并寄存领料 2.报检单优化 3.高冲寄存领料单优化 4.入库检，巡检界面优化
---
pages/CangKuManage/GS_GCJCLLD.html | 2
js/CangKuManage_js/GS_WOBJ.js | 2
pages/CangKuManage/GS_HBJCLLD_NEW.html | 59 +++++----
pages/CangKuManage/RKJ_check.html | 2
pages/CangKuManage/XJ_check_add_HBGD.html | 2
js/CangKuManage_js/GS_HBJCLLD_NEW.js | 252 ++++++++++++++++++++++++-----------------
pages/CangKuManage/XJ_check_add.html | 2
7 files changed, 190 insertions(+), 131 deletions(-)
diff --git a/js/CangKuManage_js/GS_HBJCLLD_NEW.js b/js/CangKuManage_js/GS_HBJCLLD_NEW.js
index b324f1f..d8709c1 100644
--- a/js/CangKuManage_js/GS_HBJCLLD_NEW.js
+++ b/js/CangKuManage_js/GS_HBJCLLD_NEW.js
@@ -14,9 +14,9 @@
//鍒濆鍖栵紝榛樿鐒︾偣
mui.plusReady(function(){
app.init();
- mui("#txtGD")[0].focus();
+ mui("#HBLLD")[0].focus();
console.log("杩炴帴娴嬭瘯锛�");
- //initBluetooth();
+ initBluetooth();
//SetBillNo();
$('#info').height($(window).height()- $("#row001").height() - $("#div001").height()- $("#div002").height() - 70);
});
@@ -103,75 +103,39 @@
tbody.appendChild(tr);
+
+ $(function() {
+ // 灏嗘爣棰樿鐨勮儗鏅鑹茶缃负鐏拌壊
+ $('tr:first-child th').css('background-color', 'gray');
+
+ // 閬嶅巻琛ㄦ牸鐨勬瘡涓�琛岋紝闄や簡鏍囬琛�
+ $('tr').each(function() {
+ // 鑾峰彇瀹炵洏鏁伴噺鍗曞厓鏍肩殑鍊�
+ var $cell = $(this).find('td:nth-child(3)');
+ var quantity = parseInt($cell.text());
+
+ // 鍒ゆ柇瀹炵洏鏁伴噺鏄惁涓�0
+ if (quantity == 0) {
+ // 璁剧疆琛岀殑鑳屾櫙棰滆壊涓洪粍鑹�
+ $(this).css('background-color', 'greenyellow');
+ }else
+ {
+ $(this).css('background-color', 'beige');
+ }
+ });
+ });
}
};
//鎵弿鎸囦护宸ュ崟澶勭悊鏂规硶
-function GetBarInfoDGD(){
- console.log(2);
- if(event.keyCode == 13) {
- //濡傛灉鏈緭鍏ユ潯鐮侊紝璺冲嚭鏂规硶
- if($("#DGD").val() == "") {
- $("#DGD").focus();
- playerAudio("NG");
- mui.toast("璇峰厛杈撳叆宸ュ崟!");
- return;
- }
- $.ajax({
- url: app.API_URL_HEADER + "/XKYDHD/GetGSDGD",
- data: {
- DGD: $("#DGD").val()
- },
- DataType: "json",
- type: "post",
- async: false,
- success: function(data){
-
- if (data.status === 0) {
- console.log(data);
- /// console.log(JSON.stringify(response));
- var selectElement = document.getElementById('txtGD');
- selectElement.innerHTML = "";
- matterTable = data.data.matterTable;
-
-
- for (var i = 0; i < matterTable.length; i++) {
- var option = document.createElement("option");
- option.value = matterTable[i]["DAA001"];
- option.text = matterTable[i]["DAA001"];
- selectElement.appendChild(option);
- }
- selectElement.value = matterTable[0]["DAA001"];
- GETGDINFO_SX();
- } else {
- playerAudio("NG");
- mui.toast("澶辫触!"+data.message);
- alert("鑾峰彇鏁版嵁寮傚父锛�" + data.message);
- }
-
- },
- error: function(xhr, type, errorThrown) {
-
- mui.toast("鑾峰彇鏁版嵁寮傚父锛�" + JSON.stringify(errorThrown));
- alert("鑾峰彇鏁版嵁寮傚父锛�");
- }
- });
- //鐢ㄦ埛ID
- // var currentSession = app.loadconfig(app.CONFIG_CURRENT_SESSION);
- //var user_id =$("#txtBillNo").val(); //currentSession.user_id;
- //var mun=$("#txtSL").val();
- //GETGDINFO_SX();
- // var user_id = "admin";
-
- }
-};
+
function GetBarInfoDGDSS(){
console.log(2);
if(event.keyCode == 13) {
//濡傛灉鏈緭鍏ユ潯鐮侊紝璺冲嚭鏂规硶
- if($("#DGD").val() == "") {
- $("#DGD").focus();
+ if($("#HBLLD").val() == "") {
+ $("#HBLLD").focus();
playerAudio("NG");
mui.toast("璇峰厛杈撳叆宸ュ崟!");
return;
@@ -179,7 +143,7 @@
$.ajax({
url: app.API_URL_HEADER + "/XKYDHD/GetGSDGDSS",
data: {
- DGD: $("#DGD").val(),
+ DGD: $("#HBLLD").val(),
ITEM: $("#DAB020").val()
},
DataType: "json",
@@ -190,7 +154,7 @@
if (data.status === 0) {
console.log(data);
/// console.log(JSON.stringify(response));
- var selectElement = document.getElementById('txtGD');
+ var selectElement = document.getElementById('HBLLD');
selectElement.innerHTML = "";
matterTable = data.data.matterTable;
@@ -229,7 +193,9 @@
//鎵弿鎸囦护宸ュ崟澶勭悊鏂规硶
function GetBarInfoGD(){
+ if (event.keyCode == 13) {
GETGDINFO_SX();
+ }
};
@@ -240,7 +206,7 @@
url: app.API_URL_HEADER + "/XKYDHD/GetBarInfoHBGD",
data: {
- DAA001: $("#DGD").val(),
+ DAA001: $("#HBLLD").val(),
},
DataType: "json",
type: "post",
@@ -294,7 +260,7 @@
data: {
DAB001: $("#DAB001").val(),
- DAA001: $("#DGD").val(),
+ DAA001: $("#HBLLD").val(),
DEPOT: $("#DEPOT").val(),
DEPOTSE: $("#DEPOTSE").val(),
logID: user_id,//Admin //鍏堝啓姝伙紝渚夸簬璋冭瘯
@@ -317,14 +283,13 @@
} else {
matterTable = data.data.matterTable;
$("#txtSL").val("");//鍏堟竻绌轰竴涓嬫暟鎹簮
- $("#FLSL").val("");//鍏堟竻绌轰竴涓嬫暟鎹簮
+ $("#SFSL").val("");//鍏堟竻绌轰竴涓嬫暟鎹簮
$("#txtSL").val(data.data.txtSL);//濉叆鏉＄爜鏁伴噺
$("#DFSL").val(data.data.FLSL);//濉叆鍙戞枡鏁伴噺
$("#JCSL").val(data.data.JCNUM);//濉叆鍙戞枡鏁伴噺
$("#DAB020").val(data.data.DAB020);//濉叆鐗╂枡缂栫爜
$("#model").val(data.data.MSG);//濉叆鐗╂枡缂栫爜
- //mui("#FLSL")[0].focus();
}
},
@@ -339,32 +304,42 @@
// 鎵弿鏉＄爜澶勭悊鏂规硶
$('#doSure').click(function is_CreateSCLLD() {
-// console.log(223);
- // console.log(FLSLValue);
+ if($("#SFSL").val() == "") {
+ $("#SFSL").focus();
+ playerAudio("NG");
+ mui.toast("璇疯緭鍏ュ疄鍙戞暟閲忥紒锛侊紒");
+ return;
+ }
+ var txtSLValue = parseFloat($("#txtSL").val());
+ var FLSLValue = parseFloat($("#SFSL").val());
+
// 姣旇緝鏁板�煎ぇ灏�
-
- CreateSCLLD();
- //GetBarInfoDGDSS();
- GETGDINFO_SX();
-// if (txtSLValue <= FLSLValue) {
-// // txtSL鐨勫�煎皬浜嶧LSL鐨勫��
-// // console.log("鐢熸垚棰嗘枡鍗�");
-// CreateSCLLD();
-// GETGDINFO_SX();
-// } else if (txtSLValue > FLSLValue) {
-// // txtSL鐨勫�煎ぇ浜嶧LSL鐨勫��
-// //console.log("纭鏄惁鎷嗗垎棰嗘枡");
-// mui.confirm('鏄惁鎷嗗垎璇ユ潯鐮侊紵', '璇风‘璁�', ['纭', '鍙栨秷'], function(e) {
-// if (e.index === 0) {
-// PrintSplit();
-// GETGDINFO_SX();
-// console.log("鍒锋柊鎴愬姛锛�");
-// } else {
-// // 鐢ㄦ埛鐐瑰嚮浜嗗彇娑堟寜閽�
-// mui("#FLSL")[0].focus();
-// }
-// });
- // }
+ if (txtSLValue <= FLSLValue) {
+ // txtSL鐨勫�煎皬浜嶧LSL鐨勫��
+ CreateSCLLD();
+ GETGDINFO_SX();
+ console.log("鐢熸垚棰嗘枡鍗�");
+ // CreateSCLLD();
+ // GETGDINFO_SX();
+ } else if (txtSLValue > FLSLValue) {
+ // txtSL鐨勫�煎ぇ浜嶧LSL鐨勫��
+ //console.log("纭鏄惁鎷嗗垎棰嗘枡");
+ mui.confirm('鏄惁鎷嗗垎璇ユ潯鐮侊紵', '璇风‘璁�', ['纭', '鍙栨秷'], function(e) {
+ if (e.index === 0) {
+ CreateSCLLD_S();
+ GETGDINFO_SX();
+ console.log("鍒锋柊鎴愬姛锛�");
+ mui("#DAB001")[0].focus();
+ $("#DAB001").val("");//鍏堟竻绌轰竴涓嬫暟鎹簮
+ } else {
+ // 鐢ㄦ埛鐐瑰嚮浜嗗彇娑堟寜閽�
+ mui("#SFSL")[0].focus();
+ }
+ });
+ }
+
+
+
});
@@ -381,10 +356,11 @@
data: {
DAB001: $("#DAB001").val(),
DAB020: $("#DAB020").val(),
- DAA001: $("#txtGD").val(),
- FLSL:$("#txtSL").val(),
+ DAA001: $("#HBLLD").val(),
+ FLSL:$("#SFSL").val(),
DEPOT:$("#DEPOT").val(),
DEPOTSE:$("#DEPOTSE").val(),
+ STYPE: $("#stype").val(),
logID: user_id,//Admin //鍏堝啓姝伙紝渚夸簬璋冭瘯
},
@@ -404,13 +380,13 @@
return;
} else {
$("#txtSL").val("");//鍏堟竻绌轰竴涓嬫暟鎹簮
- $("#FLSL").val("");//鍏堟竻绌轰竴涓嬫暟鎹簮
+ $("#SFSL").val("");//鍏堟竻绌轰竴涓嬫暟鎹簮
$("#DFSL").val("");//鍏堟竻绌轰竴涓嬫暟鎹簮
$("#JCSL").val("");//鍏堟竻绌轰竴涓嬫暟鎹簮
$("#DAB001").val("");//鍏堟竻绌轰竴涓嬫暟鎹簮
// $("#txtSL").val(data.data.txtSL);//濉叆鏉＄爜鏁伴噺
- // $("#FLSL").val(data.data.FLSL);//濉叆鏉＄爜鏁伴噺
- mui("#FLSL")[0].focus();
+
+ mui("#SFSL")[0].focus();
playerAudio("OK");
mui.toast("棰嗘枡鎴愬姛");
@@ -424,6 +400,76 @@
});
};
+
+ function CreateSCLLD_S() {
+ //鐢ㄦ埛ID
+ var currentSession = app.loadconfig(app.CONFIG_CURRENT_SESSION);
+ var user_id =currentSession.user_id; //currentSession.user_id;
+ // var user_id = "admin";
+ //console.log(1);
+ $.ajax({
+ url: app.API_URL_HEADER + "/XKYDHD/CreateSCLLDHBJC_S",
+
+ data: {
+ DAB001: $("#DAB001").val(),
+ DAB020: $("#DAB020").val(),
+ DAA001: $("#HBLLD").val(),
+ FLSL:$("#SFSL").val(),
+ DEPOT:$("#DEPOT").val(),
+ DEPOTSE:$("#DEPOTSE").val(),
+ STYPE: $("#stype").val(),
+ logID: user_id,//Admin //鍏堝啓姝伙紝渚夸簬璋冭瘯
+
+ },
+ DataType: "json",
+ type: "post",
+ async: false,
+ //timeout: 15000,
+ success: function(data) {
+ console.log(JSON.stringify(data));
+ //console.log(JSON.stringify(data));
+ if(data.status != 0) {
+ playerAudio("NG");
+ mui.alert(data.message,"","",function(){
+ mui("#DAB001")[0].focus();
+ $("#DAB001").val("");
+ $("#txtSL").val("");//鍏堟竻绌轰竴涓嬫暟鎹簮
+ });
+ return;
+ } else {
+ $("#txtSL").val("");//鍏堟竻绌轰竴涓嬫暟鎹簮
+ $("#SFSL").val("");//鍏堟竻绌轰竴涓嬫暟鎹簮
+ $("#DFSL").val("");//鍏堟竻绌轰竴涓嬫暟鎹簮
+ $("#JCSL").val("");//鍏堟竻绌轰竴涓嬫暟鎹簮
+ $("#DAB001").val("");//鍏堟竻绌轰竴涓嬫暟鎹簮
+ mui("#SFSL")[0].focus();
+
+ playerAudio("OK");
+ mui.toast("棰嗘枡鎴愬姛");
+
+ //console.log(data.data.BARID);
+ console.log("寮�濮嬫墦鍗帮紒锛�");
+
+ var str = data.data.BARID.toString();
+ console.log(str); // 灏咮ARID杞崲涓哄瓧绗︿覆骞舵墦鍗拌緭鍑�
+
+ printByIds(str);
+ console.log("鎵撳嵃鎴愬姛锛侊紒");
+ playerAudio("OK");
+ mui.toast("棰嗘枡鎴愬姛");
+ //initBluetooth();
+
+ }
+ },
+ error: function(xhr, type, errorThrown) {
+ console.log(2);
+ alert("鑾峰彇鏁版嵁寮傚父锛�" + JSON.stringify(errorThrown));
+ }
+ });
+ };
+
+
+
function PrintSplit() {
//鐢ㄦ埛ID
var currentSession = app.loadconfig(app.CONFIG_CURRENT_SESSION);
@@ -435,8 +481,8 @@
data: {
DAB001: $("#DAB001").val(),
DAB020: $("#DAB020").val(),
- DAA001: $("#txtGD").val(),
- FLSL:$("#FLSL").val(),
+ DAA001: $("#HBLLD").val(),
+ FLSL:$("#SFSL").val(),
logID: user_id,//Admin //鍏堝啓姝伙紝渚夸簬璋冭瘯
},
@@ -456,11 +502,11 @@
return;
} else {
$("#txtSL").val("");//鍏堟竻绌轰竴涓嬫暟鎹簮
- $("#FLSL").val("");//鍏堟竻绌轰竴涓嬫暟鎹簮
+ $("#SFSL").val("");//鍏堟竻绌轰竴涓嬫暟鎹簮
$("#txtSL").val(data.data.txtSL);//濉叆鏉＄爜鏁伴噺
- $("#FLSL").val(data.data.FLSL);//濉叆鏉＄爜鏁伴噺
- mui("#FLSL")[0].focus();
+ $("#SFSL").val(data.data.FLSL);//濉叆鏉＄爜鏁伴噺
+ mui("#SFSL")[0].focus();
//console.log(data.data.BARID);
console.log("寮�濮嬫墦鍗帮紒锛�");
diff --git a/js/CangKuManage_js/GS_WOBJ.js b/js/CangKuManage_js/GS_WOBJ.js
index c2f1bba..0a5c168 100644
--- a/js/CangKuManage_js/GS_WOBJ.js
+++ b/js/CangKuManage_js/GS_WOBJ.js
@@ -112,6 +112,8 @@
$("#DAB005").val("");
$("#BJNO").val("");
$("#WONO").val("");
+ mui("#DAB001")[0].focus();
+ $("#DAB001").val("");
} else {
diff --git a/pages/CangKuManage/GS_GCJCLLD.html b/pages/CangKuManage/GS_GCJCLLD.html
index 398186c..a3ab64c 100644
--- a/pages/CangKuManage/GS_GCJCLLD.html
+++ b/pages/CangKuManage/GS_GCJCLLD.html
@@ -4,7 +4,7 @@
<head>
<meta charset="UTF-8">
- <title>瀵勫瓨寮忛鏂�</title>
+ <title>澶у伐鍗曢鏂�</title>
<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black">
diff --git a/pages/CangKuManage/GS_HBJCLLD_NEW.html b/pages/CangKuManage/GS_HBJCLLD_NEW.html
index f06379b..d220339 100644
--- a/pages/CangKuManage/GS_HBJCLLD_NEW.html
+++ b/pages/CangKuManage/GS_HBJCLLD_NEW.html
@@ -42,8 +42,8 @@
</div>
</div> -->
<div class="mui-input-row" id="row001">
- <label>鍚堝苟宸ュ崟</label>
- <input id="DGD" type="text" value="" class="mui-input-clear text-color" placeholder="璇锋壂鎻忓伐鍗�" onkeypress="GetBarInfoGD()" />
+ <label>鍚堝苟棰嗘枡鍗�</label>
+ <input id="HBLLD" type="text" value="" class="mui-input-clear text-color" placeholder="璇锋壂鎻忓伐鍗�" onkeypress="GetBarInfoGD()" />
</div>
<!-- <div class="mui-input-row" id="row001">
<label>鎸囦护宸ュ崟</label>
@@ -76,6 +76,10 @@
<input id="DFSL" type="text" value="" class="mui-input-clear text-color" readonly="readonly" />
</div>
<div class="mui-input-row" id="row001">
+ <label>瀹炲彂鏁伴噺</label>
+ <input id="SFSL" type="text" value="" class="mui-input-clear text-color"/>
+ </div>
+ <div class="mui-input-row" id="row001">
<label>瀵勫瓨浠撴暟閲�</label>
<input id="JCSL" type="text" value="" class="mui-input-clear text-color" readonly="readonly" />
</div>
@@ -83,6 +87,13 @@
<!-- <p id="model" style="font-size: 1.0625rem;color: #000000;"></p> -->
<textarea id='model' type="text" class='input-text' style="height:200px"></textarea>
</div>
+ <div class="mui-input-row" id="row001">
+ <label>鎵ｉ櫎椤哄簭</label>
+ <select id="stype" style="margin:auto; color:#000;font-size: 18px" >
+ <option value="1">浼樺厛鎵ｅ瘎瀛樹粨</option>
+ <option value="2">浼樺厛鎵ｆ潯鐮�</option>
+ </select>
+ </div>
<!-- <div class="mui-input-row" id="row001">
<label>鍙戞枡鏁伴噺</label>
<input id="FLSL" type="text" value="" class="mui-input-clear text-color" placeholder="璇疯緭鍏ュ彂鏂欐暟閲�" onkeypress="is_CreateSCLLD()"/>
@@ -111,8 +122,7 @@
<th>鐗╂枡浠ｇ爜</th>
<th>寰呭彂鏁伴噺</th>
<th>宸插彂鏁伴噺</th>
- <!-- <th>鎺ㄨ崘浠撲綅</th> -->
-
+<!-- <th>鎺ㄨ崘浠撲綅</th> -->
</tr>
</thead>
<tbody>
@@ -122,7 +132,7 @@
</table>
</div>
</div>
- <script type="text/javascript" src="../../js/CangKuManage_js/GS_HBJCLLD.js" ></script>
+ <script type="text/javascript" src="../../js/CangKuManage_js/GS_HBJCLLD_NEW.js" ></script>
<script type="text/javascript" src="../../js/CangKuManage_js/print_template.js" ></script>
<script type="text/javascript" src="../../js/api.js" ></script>
@@ -131,25 +141,26 @@
</html>
<style>
- /* 娣诲姞琛ㄦ牸鏍峰紡 */
- .data-table {
- width: 100%;
- border-collapse: collapse;
- overflow-x: auto; /* 姘村钩婊氬姩鏉� */
- }
-
- .data-table th,
- .data-table td {
- border: 1px solid #ccc;
- padding: 3px;
- text-align: left;
- word-wrap: break-word;
- white-space: pre-wrap;
- text-overflow: ellipsis; /* 鏂囨湰鎴柇鍜岀渷鐣ュ彿 */
- overflow: hidden;
- font-size: 10px;
- }
-
+ /* 娣诲姞琛ㄦ牸鏍峰紡 */
+ .data-table {
+ width: 100%;
+ border-collapse: collapse;
+ overflow-x: auto; /* 姘村钩婊氬姩鏉� */
+ }
+
+
+ .data-table th,
+ .data-table td {
+ border: 1px solid #ccc;
+ padding: 3px;
+ text-align: left;
+ word-wrap: break-word;
+ white-space: pre-wrap;
+ text-overflow: ellipsis; /* 鏂囨湰鎴柇鍜岀渷鐣ュ彿 */
+ overflow: hidden;
+ font-size: 10px;
+ color: black; /* 灏嗗瓧浣撻鑹茶缃负榛戣壊 */
+ }
/* 濯掍綋鏌ヨ */
@media (max-width: 768px) {
.data-table {
diff --git a/pages/CangKuManage/RKJ_check.html b/pages/CangKuManage/RKJ_check.html
index ba327dc..b3b22c7 100644
--- a/pages/CangKuManage/RKJ_check.html
+++ b/pages/CangKuManage/RKJ_check.html
@@ -525,7 +525,7 @@
$("#productName").val(pdata[0].ITEMNAME)
$("#ptype").val(pdata[0].ITEMMODEL)
$("#tuhao").val(pdata[0].WL008)
- $("#BJSL").val(pdata[0].SUMBJNUM)
+ $("#BJSL").val(pdata[0].BJNUM)
//$("#process").val(pdata[0].鐢熶骇宸ュ簭)
$("#checkMan").val(user_id)
diff --git a/pages/CangKuManage/XJ_check_add.html b/pages/CangKuManage/XJ_check_add.html
index 6efdec6..b4fb29c 100644
--- a/pages/CangKuManage/XJ_check_add.html
+++ b/pages/CangKuManage/XJ_check_add.html
@@ -239,7 +239,7 @@
},
})
- var url = 'first_check_input.html?did=' + id +
+ var url = 'XJ_check_input.html?did=' + id +
'&order=' + order;
mui.openWindow({
diff --git a/pages/CangKuManage/XJ_check_add_HBGD.html b/pages/CangKuManage/XJ_check_add_HBGD.html
index 6efdec6..b4fb29c 100644
--- a/pages/CangKuManage/XJ_check_add_HBGD.html
+++ b/pages/CangKuManage/XJ_check_add_HBGD.html
@@ -239,7 +239,7 @@
},
})
- var url = 'first_check_input.html?did=' + id +
+ var url = 'XJ_check_input.html?did=' + id +
'&order=' + order;
mui.openWindow({
--
Gitblit v1.9.3