From 64039917a53b780ec7c7fe3e04f9b08134f3a3eb Mon Sep 17 00:00:00 2001
From: "DESKTOP-E401PHE\\Administrator" <rightsoft@163.com>
Date: Fri, 21 Nov 2025 09:32:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E8=8B=B1=E6=96=87=E6=88=90?=
 =?UTF-8?q?=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 T01贸易生产计划/ProjectGroup1.groupproj.local |   7 -------
 T01贸易生产计划/TradePlan.identcache          | Bin 4287 -> 0 bytes
 T03贸易布匹检验/U_MachRollMain.pas            |   4 +++-
 3 files changed, 3 insertions(+), 8 deletions(-)
 delete mode 100644 T01贸易生产计划/ProjectGroup1.groupproj.local
 delete mode 100644 T01贸易生产计划/TradePlan.identcache

diff --git a/T01贸易生产计划/ProjectGroup1.groupproj.local b/T01贸易生产计划/ProjectGroup1.groupproj.local
deleted file mode 100644
index 74c5a92..0000000
--- a/T01贸易生产计划/ProjectGroup1.groupproj.local
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<BorlandProject>
-	<Transactions/>
-	<Default.Personality>
-		<Projects ActiveProject="D:\Dp10RepoV1\项目代码\D10myOukai\T01贸易生产计划\TradePlan.dproj"/>
-	</Default.Personality>
-</BorlandProject>
diff --git a/T01贸易生产计划/TradePlan.identcache b/T01贸易生产计划/TradePlan.identcache
deleted file mode 100644
index 4860ffe0287224a7a63f38e9340a6d1532526de3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4287
zcmcIn%Wl&^6zvB=aiB<uU2BsjZ62nMOIulrruNhsbv$E@$AauYV!@i0hhPB}3lNKL
zK!{TDH=$|&0^6aMJf1Xm9U@hVqTX}g=iFIZSXj8B-M2Kqrffi;Zq_V6+{MVQDV75R
z<Pyv5uYdqHAodr15Jdl<em1g(7e^=K_s65tPveizEUl(^!xb=~#I<@#?fm=Cv$qH1
z!w;ihpU;nv{=9e@;r1ACppF628Qnu%gxBW*-vYZ38xV`&oAUsVV^=ArtV#4R7ytIW
zTujQNK@JcO#6;FAc}ZKa==dycZ1kll?6RU<JbgDl{4)OfX7u|Y>Z*=x9x`b9m;y(P
z_I5Vfbk=$U24OuUR{R$lJB?0%&FFTnWp4I;h6vZ4J<)t=iuZKVA0gt<$92lQ$xkA{
z%~=5Psx*n8ABOd;W$9f(1nGbQPmHKh5I5haWHZ{pH(+jZ3o$|q1v$gj($SngAD#ZN
z>QQD;0~|^=b@s?a?TY4ZN86T>)SYZd>BOZyx1X#s<fvi5siy|H{kl8FJ~Odq-x(6%
zAv@4;j%wOjgwm~Fg*-xyhf-{QuOf1~{f0e&PKcrCU}xSACL|`h*(&TtnFxtMIY}M{
zz%WoL;SAVZGDo+vPSQaT8oAMnC`b(OVb->E3zGm<z?>#A`2K%E*BY@JN%HO%j{S<_
zPQfnTxT`JzVDAGrIRvCSTD16iic6Syg+4J5aWOP_Bnz%s{G!{LM_=X~*aHs|F4wy9
zWOyl|2{r4nh>6k86d)JVU4S<M6D>>ephOe2f@74glNmrJnai1C95Y@E47(xMl1o&~
zXfF3*JlHZNYhF8D6;nQFl07QPxl<5z+QobYy;ZIT<p3wKOBial2u?KE7zQos%4E3e
z{SzGrpoK_|JB^AJT{o9Ioo?K&rsq?ZTeza+(^F=!XM0OB4@K+x@3xU3RBrp_8!T2Q
zal@|9U@G-|K!%cl&58|6Z<gfYC0ku3>me2T^x}(;^l9^SZ;G*SCB*qL7zBtC$+<AM
z$7MUjbv~3OS^Dljdwp{D?N$6fi*+SZ7)jj4PX)Q0U+S%FmP!YlJ}4h}(Nl5=Wp9JO
DF)VAu

diff --git a/T03贸易布匹检验/U_MachRollMain.pas b/T03贸易布匹检验/U_MachRollMain.pas
index 107b24b..8c5047c 100644
--- a/T03贸易布匹检验/U_MachRollMain.pas
+++ b/T03贸易布匹检验/U_MachRollMain.pas
@@ -332,7 +332,7 @@ type
     FCIID, FOperationStatus, FCIFName, FWorkshop: string;
     FBCIOID, FOrderNo, FMainId, FSubId, FPCId, FConNo, FConMId, fBuyConNo, FConSId: string;
     FBatchNO, FLenUnit, FC_Code, FC_Name, FC_EName, FC_Spec, FC_Width, FC_GramWeight: string;
-    FC_Color, FC_EColor, FC_ColorNo, FC_StyleNo, FC_Composition,FC_EComposition, FC_Pattern, FC_CustPattern, FC_ColorDepth: string;
+    FC_Color, FC_EColor, FC_ColorNo, FC_StyleNo, FC_Composition, FC_EComposition, FC_Pattern, FC_CustPattern, FC_ColorDepth: string;
     Faddwet, faddlen: double;
     FFtyPCId, FGangNo, FRulePieceNo, FRulePackNo, FCDUnit: string;
     FPieceNo: Integer;
@@ -1296,6 +1296,7 @@ begin
   FC_EColor := '';
   FC_StyleNo := '';
   FC_Composition := '';
+  FC_EComposition := '';
   FC_Width := '';
   FC_GramWeight := '';
   FC_Pattern := '';
@@ -2893,6 +2894,7 @@ begin
       fieldbyName('C_ColorNo').value := FC_ColorNo;
 //      fieldbyName('C_StyleNo').value := FC_StyleNo;
       fieldbyName('C_Composition').value := FC_Composition;
+      fieldbyName('C_EComposition').value := FC_EComposition;
       if dxLayoutItem_width.ActuallyVisible then
         fieldbyName('C_Width').value := trim(C_width.Text)
       else