From 0128a07d7a0b6aac2b17d4ce92f69be27596054c Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期四, 26 十二月 2024 14:18:45 +0800
Subject: [PATCH] 1.寄存领料单优化
---
js/CangKuManage_js/GS_JCLLD.js | 127 +++++++++++++++++++++++++++++++++++++++---
1 files changed, 118 insertions(+), 9 deletions(-)
diff --git a/js/CangKuManage_js/GS_JCLLD.js b/js/CangKuManage_js/GS_JCLLD.js
index 60b25cf..df535ba 100644
--- a/js/CangKuManage_js/GS_JCLLD.js
+++ b/js/CangKuManage_js/GS_JCLLD.js
@@ -281,13 +281,20 @@
function GetBarInfoLL() {
if (event.keyCode == 13) {
//濡傛灉鏈緭鍏ユ潯鐮侊紝璺冲嚭鏂规硶
- if ($("#DAB001").val() == "") {
+ if ($("#DAB001").val() == "" ) {
$("#DAB001").focus();
playerAudio("NG");
mui.toast("璇峰厛鎵弿鐗╂枡鏉＄爜!");
return;
}
-
+
+ if ($("#DEPOTSE").val() == "" ) {
+
+ playerAudio("NG");
+ mui.toast("璇ュ伐鍗曠嚎鍒瘎瀛樺簱浣嶆湭缁存姢!");
+ return;
+ }
+
//鐢ㄦ埛ID
var currentSession = app.loadconfig(app.CONFIG_CURRENT_SESSION);
var user_id = currentSession.user_id; //currentSession.user_id;
@@ -329,7 +336,7 @@
$("#JCSL").val(data.data.JCNUM); //濉叆鍙戞枡鏁伴噺
$("#DAB020").val(data.data.DAB020); //濉叆鐗╂枡缂栫爜
$("#model").val(data.data.MSG); //濉叆鐗╂枡缂栫爜
- //mui("#FLSL")[0].focus();
+ mui("#SFSL")[0].focus();
}
},
@@ -366,18 +373,27 @@
mui.alert("璇疯緭鍏ユ纭殑鏁板瓧锛�")
return;
}
+ var txtSL = parseFloat($("#txtSL").val());
+ var SFSL = parseFloat($("#SFSL").val());
+ console.log("txtSL:", txtSL);
+ console.log("SFSL:", SFSL);
// 姣旇緝鏁板�煎ぇ灏�
- if ($("#txtSL").val() < $("#SFSL").val()) {
+ if (txtSL < SFSL) {
+ console.log($("#txtSL").val());
+ console.log( $("#SFSL").val());
+ console.log("1");
mui.alert("瀹炲彂鏁颁笉鑳藉ぇ浜庢潯鐮佹暟");
return;
};
- if ($("#txtSL").val() > $("#SFSL").val()) {
+ if (txtSL > SFSL && SFSL > 0) {
+ // console.log("2");
PrintSplit();
};
CreateSCLLD();
- GetBarInfoLL();
- GetBarInfoDGDSS();
+ GETGDINFO_SX();
+ //GetBarInfoLL();
+ //GetBarInfoDGDSS();
//GETGDINFO_SX();
// if (txtSLValue <= FLSLValue) {
// // txtSL鐨勫�煎皬浜嶧LSL鐨勫��
@@ -408,6 +424,9 @@
var user_id = currentSession.user_id; //currentSession.user_id;
// var user_id = "admin";
//console.log(1);
+ console.log("寮�濮嬮鏂欙紝棰嗘枡鏉＄爜锛�");
+ console.log($("#DAB001").val());
+
$.ajax({
url: app.API_URL_HEADER + "/XKYDHD/CreateSCLLD",
@@ -447,6 +466,7 @@
// $("#txtSL").val(data.data.txtSL);//濉叆鏉＄爜鏁伴噺
// $("#FLSL").val(data.data.FLSL);//濉叆鏉＄爜鏁伴噺
//mui("#FLSL")[0].focus();
+ console.log("棰嗘枡鎴愬姛锛侊紒锛�");
playerAudio("OK");
mui.toast("棰嗘枡鎴愬姛");
@@ -466,7 +486,7 @@
var user_id = currentSession.user_id; //currentSession.user_id;
// var user_id = "admin";
$.ajax({
- url: app.API_URL_HEADER + "/XKYDHD/PrintSplit",
+ url: app.API_URL_HEADER + "/XKYDHD/PrintSplit_NEW",
data: {
DAB001: $("#DAB001").val(),
@@ -499,7 +519,9 @@
var str = data.data.BARID.toString();
console.log(str); // 灏咮ARID杞崲涓哄瓧绗︿覆骞舵墦鍗拌緭鍑�
- $("#DAB001").val($("#DAB001").val() + '-' + str);
+ $("#DAB001").val(data.data.NEWBAR.toString());
+ console.log("鎷嗗垎鍚庢潯鐮侊細");
+ console.log($("#DAB001").val());
printByIds(str);
console.log("鎵撳嵃鎴愬姛锛侊紒");
playerAudio("OK");
@@ -516,6 +538,93 @@
+// 鐩存帴鍊掑啿浠撻鏂�
+ $('#direct').click(function is_CreateSCLLD_D() {
+
+ var DFSLValue = parseFloat($("#DFSL").val());
+ var JCSLValue = parseFloat($("#JCSL").val());
+
+ if($("#JCSL").val() == ""){
+ playerAudio("NG");
+ mui.toast("璇峰厛鎵弿鐗╂枡鏉＄爜锛侊紒锛�");
+ return;
+ }
+ if(JCSLValue == 0) {
+ playerAudio("NG");
+ mui.toast("瀵勫瓨浠撴暟閲忎负0锛屾棤娉曠洿鎺ラ鏂欙紒锛侊紒");
+ return;
+ }
+
+ $("#SFSL").val(Math.min(DFSLValue, JCSLValue));
+ CreateSCLLD_D();
+ GETGDINFO_SX();
+});
+
+
+ function CreateSCLLD_D() {
+ //鐢ㄦ埛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);
+ console.log("寮�濮嬮鏂欙紝棰嗘枡鏉＄爜锛�");
+ console.log($("#DAB001").val());
+
+ $.ajax({
+ url: app.API_URL_HEADER + "/XKYDHD/CreateSCLLD_D",
+
+ data: {
+ DAB001: $("#DAB001").val(),
+ DAB020: $("#DAB020").val(),
+ DAA001: $("#txtGD").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));
+ 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(""); //鍏堟竻绌轰竴涓嬫暟鎹簮
+ $("#DAB020").val(""); //鍏堟竻绌轰竴涓嬫暟鎹簮
+ $("#model").val(""); //鍏堟竻绌轰竴涓嬫暟鎹簮
+ // $("#txtSL").val(data.data.txtSL);//濉叆鏉＄爜鏁伴噺
+ // $("#FLSL").val(data.data.FLSL);//濉叆鏉＄爜鏁伴噺
+ //mui("#FLSL")[0].focus();
+ console.log("棰嗘枡鎴愬姛锛侊紒锛�");
+
+ playerAudio("OK");
+ mui.toast("棰嗘枡鎴愬姛");
+
+ }
+ },
+ error: function(xhr, type, errorThrown) {
+ console.log(2);
+ alert("鑾峰彇鏁版嵁寮傚父锛�" + JSON.stringify(errorThrown));
+ }
+ });
+ };
+
+
+
function BarcodePutInStorageHint() {
$.ajax({
url: app.API_URL_HEADER + app.API_METHOD_ESP,
--
Gitblit v1.9.3