From c8715a2ca1069a0df32b87d825967b4b54f122d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Thu, 23 Apr 2020 23:47:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=95=86=E5=93=81=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=EF=BC=8C=E8=A7=A3=E5=86=B3=E5=8D=95=E4=BD=8D=E4=B8=8D?=
 =?UTF-8?q?=E4=B8=80=E8=87=B4=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 erp_web/pages/materials/material.html | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/erp_web/pages/materials/material.html b/erp_web/pages/materials/material.html
index 345f8af4..66ff541e 100644
--- a/erp_web/pages/materials/material.html
+++ b/erp_web/pages/materials/material.html
@@ -1646,6 +1646,26 @@
         function accept(objInfo) {
             append(0);
             removeit();
+            //判断单位是否填写正确
+            var meList = $("#materialExtendData").datagrid('getRows');
+            var unit = $("#Unit").val();
+            var manyUnitselected = $("#manyUnit").find("option:selected").text();
+            for(var i=0; i<meList.length; i++) {
+                var commodityUnit = meList[i].CommodityUnit;
+                if(unit) {
+                    if(commodityUnit != unit) {
+                        $.messager.alert('提示', '单位<b>' + commodityUnit + '</b>不包含在<b>' + unit + '</b>中！', 'warning');
+                        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>' + manyUnitInfo+ '</b>中！', 'warning');
+                        return;
+                    }
+                }
+            }
             if ($("#materialExtendData").datagrid('getChanges').length) {
                 if (!CheckData())
                     return false;