From ce06ec1e6eedbfc3581ff40225e161e4defe5699 Mon Sep 17 00:00:00 2001
From: zhaoaomin <18366680202@163.com>
Date: Fri, 22 Sep 2023 16:51:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=B9=BF=E6=96=99=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E5=8A=A0=E5=B7=A5=E5=8E=82=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 shangjian/.vs/BL/v17/.suo                     | Bin 804864 -> 804864 bytes
 .../Model/OrderPrepare/MaterialPlanModel.cs   |   1 +
 shangjian/XGL/App.config                      |   4 ++--
 shangjian/XGL/Views/LanJu_Prepare.xaml.cs     |   1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/shangjian/.vs/BL/v17/.suo b/shangjian/.vs/BL/v17/.suo
index d45fbda521611e31c73af8e2e20ded4524a35569..77933eaa636f004bacc2c49f9fc07993775cab0e 100644
GIT binary patch
delta 445
zcmXBPPbdUY90&0EjW>2?7Ez0p15w&2j1*Rink^jsJIF;MSG6mpTy~s9Va6-ZVH4Z7
zSyGt8TpXMzIpD%k967ltwY$EPSD$|Uey?xu_bl76Y{Tv($ua8NNs^>Hc!nsNe&~fh
zXn`Kg8&FNu2kCO{o0PZC$#cU^$Y;cgIJ}XCc()qj!_532*eo1wM#jI5pbj9r2@3EV
z7N;aPlm;sDN#%@M-MmsVvG)^kBg3zho>9{?a(bcS>a?4b4g_|@{Gi<I9A&umWeEF4
z>k^~mn(i(w^KEWbAy)ZHS(&EjRt#-X(zD*lqU<z9_sk6Y^q)L2SE}>aC4~iY7%agP
z<hc>6r92;rt!n<R{wa6X+kzFi^cy0{D>_6>e5?k0#KkW~yt!XGrtAU9`vr>Ay_YD^
zE@e}s@0ZD;YCjdgmsQX}hl1nOyJq~F#KNpRCf@4w8gaw)Chu`mt)Y!n&L=|&Fi@Zr
P0-%Bhx|hlY7Z3jckiwfe

delta 624
zcmWm9O=#0_7zXe>X|kqWDP<HHSg~#(;>K*j!>l?~I@rO(XvdH-@PmRLRGfI4po4`;
zK}x%5U(q0?hhT9|w1>#>;AIL!WllxC$Q0d0!LR9@Qs<MvkLP{g|4Z`ESTQ+POcoPR
zOUd<JK1ESBkq$*k(N5~79kiJSc(#$5W`=NQ^gHy(@m)td>Lcn+XziR@aV@H?@v*wK
z0j-_8R#9thZDXPHcnfnkGfxd~>w$L4N(3U-9zA092c}S~H*{bB-Pjp4o%i;)S)&^!
zst1h8bj9#q`-ns9MtV5sHE}jQ^pu{EH=ASH{M1+GV|qplG)^T=QI?pqRHWzhl4j@?
zP19?7L+{8s)*Cb4v-sjQ7kd+Xzp?m4KWHm0(@*+EEA*RI=@0#-f4tENW|+MHU8^?^
z`@-dv8ZDU#H|^j)s;3K12CAbXQ#OsV*fm7t<XL}<+%wT8)eIKo+y_LhTbJVUxermX
zvj{nZNXfpTV2jLT(Iw$oq~*{@>_<iNSse5R^UfqRS$v3?ySRewkgFy_GBxfuWZHyn
zEzfnjomcPzGNPi-T`2qGxcpW%pvr9%9kNtF&an}cBUKE#m23VU$Z!FM*sI8uhngqc
d`Mj|X7kFV($wwOL)I@$VC_q8it~KYb{|E4$#9IIW

diff --git a/shangjian/XGL.Model/Model/OrderPrepare/MaterialPlanModel.cs b/shangjian/XGL.Model/Model/OrderPrepare/MaterialPlanModel.cs
index cc643f0..5876a1d 100644
--- a/shangjian/XGL.Model/Model/OrderPrepare/MaterialPlanModel.cs
+++ b/shangjian/XGL.Model/Model/OrderPrepare/MaterialPlanModel.cs
@@ -10,6 +10,7 @@ namespace XGL.Models.Model.OrderPrepare
     {
         public string reqCode { get; set; }
         public string reqTime { get; set; }
+        public string factory { get; set; }
         public string planNo { get; set; }
         public List<skuInfo> data { get; set; }
     }
diff --git a/shangjian/XGL/App.config b/shangjian/XGL/App.config
index 63cb808..d313696 100644
--- a/shangjian/XGL/App.config
+++ b/shangjian/XGL/App.config
@@ -8,11 +8,11 @@
   </configSections>
   <appSettings> 
 	  <!--车间编码-->
-	  <add key="SiteCode" value="BPZ01"/>
+	  <add key="SiteCode" value="1000"/>
 	  <!--设备编码-->
 	  <add key="DeviceCode" value="C1"/>
 	  <!--上位机类型 0:工单准备，1：成型机\shoupei，2：烘房-->
-	  <add key="ClientMode" value="1"/>
+	  <add key="ClientMode" value="0"/>
     <!--上位机类型 1 上件 ，2 排空区  0下件区-->
     <add key="PostType" value="1"/>
     <!--线体编码-->
diff --git a/shangjian/XGL/Views/LanJu_Prepare.xaml.cs b/shangjian/XGL/Views/LanJu_Prepare.xaml.cs
index 260301c..4fa7680 100644
--- a/shangjian/XGL/Views/LanJu_Prepare.xaml.cs
+++ b/shangjian/XGL/Views/LanJu_Prepare.xaml.cs
@@ -218,6 +218,7 @@ namespace XGL.Views
 
             materialPlanModel.reqCode = CommonFunc.Common.GetUUID();
             materialPlanModel.reqTime = DateTime.Now.ToString();
+            materialPlanModel.factory = Utils.GetAppSetting("SiteCode");
             materialPlanModel.planNo = orderID;