From 69cd9f59a0fabf12f8c9147fcba7f69817a870b3 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期一, 06 十一月 2023 23:40:59 +0800
Subject: [PATCH] 更新仓内抓拍2

---
 igds-web/src/main/resources/static/admin/inout/out-weight.js |   65 +++++++++++++++++++++++++++-----
 1 files changed, 55 insertions(+), 10 deletions(-)

diff --git a/igds-web/src/main/resources/static/admin/inout/out-weight.js b/igds-web/src/main/resources/static/admin/inout/out-weight.js
index ac45a64..5edb8da 100644
--- a/igds-web/src/main/resources/static/admin/inout/out-weight.js
+++ b/igds-web/src/main/resources/static/admin/inout/out-weight.js
@@ -264,7 +264,7 @@
     var index = layer.load();
     $.ajax({
         type: "POST",
-        url: "../../inout/api/ic-card-num",
+        url: "../../inout/api/get-icCard",
         dataType: "json",
         contentType: "application/json;charset=UTF-8",
         data: param,
@@ -388,10 +388,11 @@
     });
 }
 
-// 鎵撳嵃杩囩鍗�
+
+// 鐐瑰嚮鎵撳嵃锛岀郴缁熷垽鏂槸鍚﹀凡缁忔墽琛屽畬鎴愶紝濡傛灉宸茬粡瀹屾垚锛岀洿鎺ユ墦鍗帮紝濡傛灉鏈畬鎴愬垯鍏堟墽琛屽畬鎴�
 function printBill() {
     if (!recordData) {
-        layer.alert("娌℃湁鑾峰彇鍒颁笟鍔℃暟鎹紝涓嶆敮鎸佹墦鍗帮紒");
+        alertError("娌℃湁鑾峰彇鍒颁笟鍔℃暟鎹紝鎵撳嵃琚嫆缁濓紒");
         return;
     }
     // 浠庡悗鍙拌幏鍙栨ā鐗堝苟鎵撳嵃
@@ -399,7 +400,27 @@
     // 鍚堝苟鏇存柊鐣跺墠缂栬緫鏁版嵁
     Object.assign(recordData, data);
 
-    printBillStep2();
+    var index = layer.load();
+    $.ajax({
+        type: "POST",
+        url: "../../basic/inout/report/bill-weight",
+        dataType: "json",
+        contentType: "application/json;charset=UTF-8",
+        data: JSON.stringify(recordData),
+        success: function (result) {
+            layer.close(index);
+            if (result.code != "0000") {
+                alertError(result.msg);
+            } else {
+                layer.msg("寮�濮嬫覆鏌撴墦鍗板崟鈥︹��");
+                printWeight(result.data);
+            }
+        },
+        error: function () {
+            layer.close(index);
+            alertError("鑾峰彇鎵撳嵃妯＄増澶辫触锛岃鑱旂郴绠＄悊鍛樻煡鐪嬪師鍥�");
+        }
+    });
 }
 
 // 鐐瑰嚮鎵撳嵃锛屽厛鎵ц绯荤粺榛樿鎵ц瀹屾垚鍗″洖鏀�
@@ -407,7 +428,7 @@
     var index = layer.load();
     $.ajax({
         type: "POST",
-        url: "../../basic/inout-report/inout-bill-weight",
+        url: "../../basic/inout-report/bill-weight",
         dataType: "json",
         contentType: "application/json;charset=UTF-8",
         data: JSON.stringify(recordData),
@@ -457,6 +478,31 @@
     // delDisabled();
 }
 
+//鏄剧ず璐ㄦ淇℃伅
+function showCheck() {
+    if (!recordData) {
+        alertError("娌℃湁涓氬姟鏁版嵁淇℃伅锛屾墽琛岃鎷掔粷");
+        return;
+    }
+
+    // 鑾峰彇鍖栭獙椤逛俊鎭�
+    // flushCheckItem();
+
+    layer.open({
+        type: 1,
+        title: "璐ㄦ璇︾粏",
+        offset: ['120px', '100px'],
+        area: ['1000px', '520px'],
+        shade: 0,
+        content: $('#checkDetail'),
+        btnAlign: 'c',
+        btn: ['鍙栨秷'],
+        yes: function () {
+            layer.closeAll();
+        },
+        closeBtn: 0
+    });
+}
 
 function flushPage() {
     layer.confirm('纭畾瑕佸埛鏂伴〉闈㈠悧锛�', {icon: 3, title: '鎻愮ず'}, function (index) {
@@ -599,7 +645,6 @@
         fileName: snapData.fileName3
     }];
     recordData.files = files;
-    console.log("out-weight,submit")
     var index = layer.load();
     $.ajax({
         type: "POST",
@@ -624,10 +669,10 @@
     });
 
     //浠ヤ笅閫昏緫涓哄鍔犱竴涓闊抽�氱煡鐨勮皟鐢ㄦ柟娉曪紝涓嶈�冭檻杩斿洖缁撴灉
-    var curWeight = recordData.fullWeight;
-    if (InoutProgress.WEIGHT_EMPTY == recordData.progress) {
-        curWeight = recordData.emptyWeight;
-    }
+    // var curWeight = recordData.fullWeight;
+    // if (InoutProgress.WEIGHT_EMPTY == recordData.progress) {
+    //     curWeight = recordData.emptyWeight;
+    // }
     // var param = {
     //     sort: $("#scaleName").val(),
     //     weight: curWeight,

--
Gitblit v1.9.3