From bf3d0b660dd33948057f4a835a44453aa04738dd Mon Sep 17 00:00:00 2001
From: Leo <novelliou@hotmail.com>
Date: Sun, 4 Jun 2023 18:23:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=89=E7=85=A7=E5=8D=8F=E5=90=8C=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E6=B8=85=E5=8D=95=E4=B8=8B=E6=9D=A5=E7=9A=84=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E4=BF=AE=E6=94=B9=E5=AF=B9=E6=8E=A5=E7=9A=84=E9=85=8D?=
 =?UTF-8?q?=E6=96=B9=E7=89=A9=E6=96=99=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 FactorySystemBll/FormulaBll.cs | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/FactorySystemBll/FormulaBll.cs b/FactorySystemBll/FormulaBll.cs
index fda9107..990284b 100644
--- a/FactorySystemBll/FormulaBll.cs
+++ b/FactorySystemBll/FormulaBll.cs
@@ -114,6 +114,22 @@ namespace FactorySystemBll
                                 }
                             }
 
+                            // 按照协同物料清单下来的逻辑修改配方物料类型
+                            string ftype = formula.FType.ToLower();
+
+                            if (ftype == "a" || ftype == "f")
+                            {
+                                formula.FType = "20";
+                            }
+                            else if (ftype == "b" || ftype == "bb" || ftype == "i" || ftype == "iz")
+                            {
+                                formula.FType = "30";
+                            }
+                            else
+                            {
+                                formula.FType = "40";
+                            }
+
                             TBasicCode bType = typeList.Find(s => s.FName == formula.FType || s.FValue == formula.FType);
                             if (bType != null) formula.FType = bType.FValue;
                             updateList.Add(formula);