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 @@ - - - - - - - diff --git a/T01贸易生产计划/TradePlan.identcache b/T01贸易生产计划/TradePlan.identcache deleted file mode 100644 index 4860ffe..0000000 Binary files a/T01贸易生产计划/TradePlan.identcache and /dev/null differ 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