From d5a456fee1dd3b6beda90ec6cc1b91814ec2750f Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期四, 24 三月 2022 12:59:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/webapp/static/js/receiveDetl/receiveDetl.js |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/static/js/receiveDetl/receiveDetl.js b/src/main/webapp/static/js/receiveDetl/receiveDetl.js
index 0efd159..3665920 100644
--- a/src/main/webapp/static/js/receiveDetl/receiveDetl.js
+++ b/src/main/webapp/static/js/receiveDetl/receiveDetl.js
@@ -25,7 +25,7 @@
             {type: 'checkbox'}
             ,{field: 'id', align: 'center',title: 'ID', hide:true}
             ,{field: 'hostId', align: 'center',title: '', hide:true}
-            ,{field: 'orderId$', align: 'center',title: '璁㈠崟', width: 185}
+            ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', width: 185}
             ,{field: 'anfme', align: 'center',title: '搴斿叆搴撻噺', width: 100}
             ,{field: 'inQty', align: 'center',title: '宸插叆搴撻噺', width: 100}
             ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜'}
@@ -209,11 +209,22 @@
                 form.val('inDetail',{
                     "remain": remain
                 });
+
                 form.val('inDetail',data);
 
                 form.on('submit(inLoc)',function (data) {
-
                     var loc =  insXmSel.getValue('valueStr');
+                    var storeQty =data.field.remain;
+
+                    if(storeQty> data.field.anfme - data.field.inQty || storeQty<=0){
+                        layer.msg("鏁伴噺涓嶅");
+                        return;
+                    }
+                    if(loc===""){
+                        layer.msg("搴撲綅鍙蜂负绌�");
+                        return;
+                    }
+
                     $.ajax({
                         url: baseUrl+"/receiveDetl/addIn"
                         ,headers: {'token':localStorage.getItem('token')}
@@ -225,6 +236,7 @@
                             layer.closeAll();
                             if(res.code === 200){
                                 layer.msg(res.msg);
+                                tableReload();
                             }
                             if (res.code === 500){
                                 layer.msg(res.msg);

--
Gitblit v1.9.1