From d1fa80751413742e01d41cc1b8af1f3149a228d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sun, 27 Dec 2020 21:58:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=95=86=E5=93=81=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 erp_web/pages/materials/material.html | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/erp_web/pages/materials/material.html b/erp_web/pages/materials/material.html
index 1112fb6b..dd0b12b6 100644
--- a/erp_web/pages/materials/material.html
+++ b/erp_web/pages/materials/material.html
@@ -1604,12 +1604,22 @@
             var meList = $("#materialExtendData").datagrid('getRows');
             var unit = $("#Unit").val();
             var manyUnitselected = $("#manyUnit").find("option:selected").text();
+            var manyUnitInfo = manyUnitselected.substring(0, manyUnitselected.indexOf("("));
+            var unitArr = manyUnitInfo.split(",");
             if(!unit) {
                 //此时为多单位
                 if (meList.length<2){
                     $.messager.alert('提示',"多单位的商品条码行数至少要有两行，请再新增一行条码信息！",'warning');
                     return;
                 }
+                if(meList[0].CommodityUnit != unitArr[0]) {
+                    $.messager.alert('提示','条码之后的单位填写有误，单位<b>' + meList[0].CommodityUnit + '</b>请修改为<b>' + unitArr[0] + '</b>！','warning');
+                    return;
+                }
+                if(meList[1].CommodityUnit != unitArr[1]) {
+                    $.messager.alert('提示','条码之后的单位填写有误，单位<b>' + meList[1].CommodityUnit + '</b>请修改为<b>' + unitArr[1] + '</b>！','warning');
+                    return;
+                }
             }
             for(var i=0; i<meList.length; i++) {
                 var commodityUnit = meList[i].CommodityUnit;
@@ -1619,8 +1629,6 @@
                         return;
                     }
                 } else if(manyUnitselected) {
-                    var manyUnitInfo = manyUnitselected.substring(0, manyUnitselected.indexOf("("));
-                    var unitArr = manyUnitInfo.split(",");
                     if(commodityUnit != unitArr[0] && commodityUnit != unitArr[1]) {
                         $.messager.alert('提示', '条码之后的单位填写有误，单位<b>' + commodityUnit + '</b>请修改为' +
                             '<b>' + unitArr[0]+ '</b>或<b>' + unitArr[1]+ '</b>！', 'warning');