~
This commit is contained in:
DESKTOP-E401PHE\Administrator
parent
7ca0b281d7
commit
a664e47800
|
|
@ -1943,13 +1943,12 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
|
|||
ItemHeight = 24
|
||||
ParentFont = False
|
||||
TabOrder = 5
|
||||
Text = #36890#29992#26631#31614
|
||||
Text = #36890#29992'85'
|
||||
OnChange = SLbNameChange
|
||||
Items.Strings = (
|
||||
#36890#29992#26631#31614
|
||||
#36890#29992#26631#31614'('#20928#37325')'
|
||||
#36890#29992#26631#31614'('#27611#37325')'
|
||||
#36890#29992#26631#31614'('#38271#24230')')
|
||||
#36890#29992'85'
|
||||
#36890#29992'86('#27611#37325')'
|
||||
#36890#29992'86('#20928#37325')')
|
||||
end
|
||||
object Button9: TButton
|
||||
Left = 190
|
||||
|
|
@ -2823,7 +2822,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
|
|||
Color = clSkyBlue
|
||||
TabOrder = 7
|
||||
object Label2: TLabel
|
||||
Left = 684
|
||||
Left = 740
|
||||
Top = 4
|
||||
Width = 40
|
||||
Height = 19
|
||||
|
|
@ -2859,7 +2858,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
|
|||
Visible = False
|
||||
end
|
||||
object Label25: TLabel
|
||||
Left = 346
|
||||
Left = 451
|
||||
Top = 4
|
||||
Width = 40
|
||||
Height = 19
|
||||
|
|
@ -2887,7 +2886,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
|
|||
Visible = False
|
||||
end
|
||||
object Label38: TLabel
|
||||
Left = 178
|
||||
Left = 247
|
||||
Top = 4
|
||||
Width = 40
|
||||
Height = 19
|
||||
|
|
@ -2929,7 +2928,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
|
|||
Visible = False
|
||||
end
|
||||
object Label47: TLabel
|
||||
Left = 515
|
||||
Left = 568
|
||||
Top = 4
|
||||
Width = 60
|
||||
Height = 19
|
||||
|
|
|
|||
|
|
@ -426,6 +426,7 @@ type
|
|||
procedure On1202(var Message: Tmessage); message 1202;
|
||||
procedure On1302(var Message: Tmessage); message 1302;
|
||||
function JsXj(str1: string): string;
|
||||
function NewRoundTo(value: Double; ws: Integer): Double;
|
||||
public
|
||||
fmanage, ftest: string;
|
||||
{ Public declarations }
|
||||
|
|
@ -443,6 +444,16 @@ uses
|
|||
U_SCPersonColor, U_SysLogOrder;
|
||||
|
||||
{$R *.dfm}
|
||||
function TfrmMJManageNewFDNewSF.NewRoundTo(value: Double; ws: Integer): Double;
|
||||
var
|
||||
iLen: Integer;
|
||||
E: Extended;
|
||||
begin
|
||||
iLen := StrToInt('1' + stringOfChar('0', ws));
|
||||
E := StrToFloat(FloatToStr(value));
|
||||
Result := Ceil(E * iLen) / iLen;
|
||||
end;
|
||||
|
||||
procedure TfrmMJManageNewFDNewSF.PrtBaoData(FBaoid: string);
|
||||
var
|
||||
fPrintFile: string;
|
||||
|
|
@ -886,7 +897,7 @@ begin
|
|||
with CDS_MJCD do
|
||||
begin
|
||||
Append;
|
||||
FieldByName('cdname').Value := Trim(TButton(Fbtn).Caption);
|
||||
FieldByName('cdname').value := Trim(TButton(Fbtn).Caption);
|
||||
Post;
|
||||
end;
|
||||
end;
|
||||
|
|
@ -896,7 +907,7 @@ begin
|
|||
with CDS_MJCD do
|
||||
begin
|
||||
Append;
|
||||
FieldByName('cdname').Value := Trim(TSpeedButton(Fbtn).Hint);
|
||||
FieldByName('cdname').value := Trim(TSpeedButton(Fbtn).Hint);
|
||||
Post;
|
||||
end;
|
||||
end;
|
||||
|
|
@ -919,9 +930,9 @@ begin
|
|||
with CDS_MJCD do
|
||||
begin
|
||||
Edit;
|
||||
FieldByName(FColumn).Value := Trim(FieldByName(FColumn).AsString) + Trim(TButton(Fbtn).Caption);
|
||||
FieldByName(FColumn).value := Trim(FieldByName(FColumn).AsString) + Trim(TButton(Fbtn).Caption);
|
||||
if Trim(fieldbyname('CDQtyS').AsString) <> '' then
|
||||
Fieldbyname('CDQty').Value := Trim(fieldbyname('CDQtyS').AsString);
|
||||
Fieldbyname('CDQty').value := Trim(fieldbyname('CDQtyS').AsString);
|
||||
Post;
|
||||
end;
|
||||
end;
|
||||
|
|
@ -1048,13 +1059,13 @@ begin
|
|||
Edit;
|
||||
if Length(CDS_MJCD.FieldByName(FColumn).AsString) = 1 then
|
||||
begin
|
||||
FieldByName(FColumn).Value := null;
|
||||
FieldByName('CDQty').Value := 0;
|
||||
FieldByName(FColumn).value := null;
|
||||
FieldByName('CDQty').value := 0;
|
||||
end
|
||||
else
|
||||
begin
|
||||
FieldByName(FColumn).Value := Copy(Trim(FieldByName(FColumn).AsString), 1, Length(Trim(FieldByName(FColumn).AsString)) - 1);
|
||||
FieldByName('CDQty').Value := FieldByName(FColumn).Value;
|
||||
FieldByName(FColumn).value := Copy(Trim(FieldByName(FColumn).AsString), 1, Length(Trim(FieldByName(FColumn).AsString)) - 1);
|
||||
FieldByName('CDQty').value := FieldByName(FColumn).value;
|
||||
end;
|
||||
Post;
|
||||
end;
|
||||
|
|
@ -1198,89 +1209,93 @@ begin
|
|||
FieldByName('MainId').value := Trim(FMainId);
|
||||
FieldByName('SubId').value := Trim(FSubId);
|
||||
FieldByName('APId').value := Trim(FAPId);
|
||||
FieldByName('MJID').Value := Trim(maxno);
|
||||
FieldByName('MJStr2').Value := 'δÈë¿â';
|
||||
FieldByName('MJBanZu').Value := Trim(FBanZu);
|
||||
FieldByName('MJstr3').Value := Trim(MJstr3.Text);
|
||||
FieldByName('MJstr4').Value := Trim(MJstr4.Text);
|
||||
FieldByName('MJstr5').Value := Trim(MJstr5.Text);
|
||||
FieldByName('mjxh').Value := Trim(mjxh.Text);
|
||||
FieldByName('MJID').value := Trim(maxno);
|
||||
FieldByName('MJStr2').value := 'δÈë¿â';
|
||||
FieldByName('MJBanZu').value := Trim(FBanZu);
|
||||
FieldByName('MJstr3').value := Trim(MJstr3.Text);
|
||||
FieldByName('MJstr4').value := Trim(MJstr4.Text);
|
||||
FieldByName('MJstr5').value := Trim(MJstr5.Text);
|
||||
FieldByName('mjxh').value := Trim(mjxh.Text);
|
||||
// FieldByName('BaoNO').Value := Trim(BaoNO.Text);
|
||||
FieldByName('MJTypeOther').Value := Trim(Label9.Caption);
|
||||
FieldByName('MJStr1').Value := Trim(Label13.Caption);
|
||||
FieldByName('MJTypeOther').value := Trim(Label9.Caption);
|
||||
FieldByName('MJStr1').value := Trim(Label13.Caption);
|
||||
|
||||
FieldByName('PM').Value := Trim(PM.Text);
|
||||
FieldByName('KH').Value := Trim(KH.Text);
|
||||
FieldByName('YS').Value := Trim(YS.Text);
|
||||
FieldByName('HX').Value := Trim(HX.Text);
|
||||
FieldByName('SH').Value := Trim(SH.Text);
|
||||
FieldByName('PM').value := Trim(PM.Text);
|
||||
FieldByName('KH').value := Trim(KH.Text);
|
||||
FieldByName('YS').value := Trim(YS.Text);
|
||||
FieldByName('HX').value := Trim(HX.Text);
|
||||
FieldByName('SH').value := Trim(SH.Text);
|
||||
if Edit12.Text <> '' then
|
||||
begin
|
||||
FieldByName('DingMaFlag').Value := '¶¨³¤';
|
||||
FieldByName('DingMaFlag').value := '¶¨³¤';
|
||||
end;
|
||||
if Edit10.Text <> '' then
|
||||
begin
|
||||
FieldByName('DaoXuFlag').Value := '¾íºÅµ¹Ðò';
|
||||
FieldByName('DaoXuFlag').value := '¾íºÅµ¹Ðò';
|
||||
end;
|
||||
FieldByName('QuhaoFlag').Value := Trim(ComboBox2.Text);
|
||||
FieldByName('QuhaoFlag').value := Trim(ComboBox2.Text);
|
||||
if (FDC <> 0) and (Edit12.text <> '') then
|
||||
begin
|
||||
FieldByName('MJLen').Value := FDC;
|
||||
FieldByName('MJLen').value := FDC;
|
||||
end
|
||||
else
|
||||
begin
|
||||
FieldByName('MJLen').Value := format('%.' + trim(fxsws) + 'f', [(StrToFloatdef(trim(MJLen.Text), 0) / FPRTmachi) - StrToFloatdef(trim(MJQty2.Text), 0) + fjc]);
|
||||
FieldByName('MJLen').value := format('%.' + trim(fxsws) + 'f', [(StrToFloatdef(trim(MJLen.Text), 0) / FPRTmachi) - StrToFloatdef(trim(MJQty2.Text), 0) + fjc]);
|
||||
|
||||
end;
|
||||
|
||||
FieldByName('MJQty1').Value := StrToFloatdef(trim(MJQty1.Text), 0);
|
||||
FieldByName('MJQty2').Value := StrToFloatdef(trim(MJQty2.Text), 0);
|
||||
FieldByName('MJQty3').Value := StrToFloatdef(trim(MJQty3.Text), 0);
|
||||
FieldByName('MJBZD').Value := StrToFloatdef(trim(MJBZD.Text), 0);
|
||||
FieldByName('MJQty4').Value := StrToFloatdef(trim(MJQty4.Text), 0) + fjZ;
|
||||
FieldByName('MJQty1').value := StrToFloatdef(trim(MJQty1.Text), 0);
|
||||
FieldByName('MJQty2').value := StrToFloatdef(trim(MJQty2.Text), 0);
|
||||
FieldByName('MJQty3').value := StrToFloatdef(trim(MJQty3.Text), 0);
|
||||
FieldByName('MJBZD').value := StrToFloatdef(trim(MJBZD.Text), 0);
|
||||
FieldByName('MJQty4').value := StrToFloatdef(trim(MJQty4.Text), 0) + fjZ;
|
||||
// SLL := NEWroundto((strtofloatdef(trim(MJMaoZ.Text), 0) + fjz + StrToFloatdef(trim(MJBZD.Text), 0)), strtointdef(fxsws1, 0));
|
||||
FieldByName('MJMaoZ').value := NEWroundto((strtofloatdef(trim(MJMaoZ.Text), 0) + fjz + StrToFloatdef(trim(MJBZD.Text), 0)), strtointdef(fxsws1, 0));
|
||||
|
||||
if Trim(MJFK.Text) <> '' then
|
||||
begin
|
||||
FieldByName('MJFK').Value := MJFK.Text;
|
||||
end;
|
||||
if Trim(MJMaoZ.Text) <> '' then
|
||||
begin
|
||||
FieldByName('MJMaoZ').Value := StrToFloat(MJMaoZ.Text) + fjz + StrToFloatdef(trim(MJBZD.Text), 0);
|
||||
FieldByName('MJFK').value := MJFK.Text;
|
||||
end;
|
||||
// if Trim(MJMaoZ.Text) <> '' then
|
||||
// begin
|
||||
// FieldByName('MJMaoZ').value := format('%.' + trim(fxsws1) + 'f', [StrToFloat(MJMaoZ.Text) + fjz + StrToFloatdef(trim(MJBZD.Text), 0)]);
|
||||
// end;
|
||||
|
||||
if Trim(MJSJKZ.Text) <> '' then
|
||||
begin
|
||||
FieldByName('MJSJKZ').Value := MJSJKZ.Text;
|
||||
FieldByName('MJSJKZ').value := MJSJKZ.Text;
|
||||
end;
|
||||
FieldByName('MJType').Value := '';
|
||||
FieldByName('MJType').value := '';
|
||||
if Trim(Edit3.Text) <> '' then
|
||||
begin
|
||||
FieldByName('MJType').Value := 'ÕýÆ·';
|
||||
FieldByName('MJType').value := 'ÕýÆ·';
|
||||
end;
|
||||
if Trim(Edit4.Text) <> '' then
|
||||
begin
|
||||
FieldByName('MJType').Value := '´ÎÆ·';
|
||||
FieldByName('MJType').value := '´ÎÆ·';
|
||||
end;
|
||||
FieldByName('MJStr1').Value := Trim(Label13.Caption);
|
||||
FieldByName('MJStr1').value := Trim(Label13.Caption);
|
||||
|
||||
if Trim(FMJID) = '' then
|
||||
begin
|
||||
FieldByName('Filler').Value := Trim(DName);
|
||||
FieldByName('Filler').value := Trim(DName);
|
||||
end
|
||||
else
|
||||
begin
|
||||
FieldByName('Editer').Value := Trim(DName);
|
||||
FieldByName('EditTime').Value := SGetServerDateTime(ADOTmp);
|
||||
FieldByName('Editer').value := Trim(DName);
|
||||
FieldByName('EditTime').value := SGetServerDateTime(ADOTmp);
|
||||
end;
|
||||
if Trim(SCXFlag) <> '' then
|
||||
begin
|
||||
FieldByName('JTType').Value := Trim(SCXFlag);
|
||||
FieldByName('JTType').value := Trim(SCXFlag);
|
||||
end;
|
||||
|
||||
FieldByName('MJTypeOther').Value := Trim(Label9.Caption);
|
||||
FieldByName('MJTypeOther').value := Trim(Label9.Caption);
|
||||
|
||||
if trim(fbaotype) = '手动打包' then
|
||||
begin
|
||||
FieldByName('baoNO').Value := Trim(baono.text);
|
||||
FieldByName('baoID').Value := Trim(baoID.Text);
|
||||
FieldByName('baoNO').value := Trim(baono.text);
|
||||
FieldByName('baoID').value := Trim(baoID.Text);
|
||||
end;
|
||||
|
||||
Post;
|
||||
|
|
@ -1673,21 +1688,21 @@ begin
|
|||
Append
|
||||
else
|
||||
Edit;
|
||||
FieldByName('MJId').Value := Trim(FMJID);
|
||||
FieldByName('MCID').Value := Trim(maxno);
|
||||
FieldByName('MJId').value := Trim(FMJID);
|
||||
FieldByName('MCID').value := Trim(maxno);
|
||||
SSetSaveDataCDSNew(ADOCmd, Tv2, CDS_MJCD, 'WFB_MJJY_CD', 0);
|
||||
FieldByName('KouFenType').Value := CDS_MJCD.fieldbyname('KouFenType').Value;
|
||||
FieldByName('KouFenType').value := CDS_MJCD.fieldbyname('KouFenType').value;
|
||||
Post;
|
||||
end;
|
||||
CDS_MJCD.Edit;
|
||||
CDS_MJCD.FieldByName('MCID').Value := Trim(maxno);
|
||||
CDS_MJCD.FieldByName('MCID').value := Trim(maxno);
|
||||
Next;
|
||||
end;
|
||||
end;
|
||||
with CDS_MJID do
|
||||
begin
|
||||
Append;
|
||||
FieldByName('MJID').Value := Trim(FMJID);
|
||||
FieldByName('MJID').value := Trim(FMJID);
|
||||
Post;
|
||||
end;
|
||||
with ADOCmd do
|
||||
|
|
@ -2111,7 +2126,7 @@ begin
|
|||
sql.Add('select * from CK_BanCP_CRID');
|
||||
Open;
|
||||
end;
|
||||
CRID := ADOCmd.fieldbyname('CRID').Value;
|
||||
CRID := ADOCmd.fieldbyname('CRID').value;
|
||||
if GetLSNo(ADOCmd, MaxCkNo, 'JR', 'CK_BanCP_CR', 4, 1) = False then
|
||||
begin
|
||||
ADOCmd.Connection.RollbackTrans;
|
||||
|
|
@ -2128,34 +2143,34 @@ begin
|
|||
with ADOCmd do
|
||||
begin
|
||||
Append;
|
||||
FieldByName('MainId').Value := Trim(FMainId);
|
||||
FieldByName('SubId').Value := Trim(FSubId);
|
||||
FieldByName('APID').Value := Trim(FAPID);
|
||||
FieldByName('MJID').Value := Trim(CDS_MJID.fieldbyname('MJId').AsString);
|
||||
FieldByName('BCID').Value := Trim(MaxCkNo);
|
||||
FieldByName('CRTime').Value := SGetServerDateTime(ADOTmp);
|
||||
FieldByName('CRFlag').Value := 'Èë¿â';
|
||||
FieldByName('CRType').Value := '¼ìÑéÈë¿â';
|
||||
FieldByName('MainId').value := Trim(FMainId);
|
||||
FieldByName('SubId').value := Trim(FSubId);
|
||||
FieldByName('APID').value := Trim(FAPID);
|
||||
FieldByName('MJID').value := Trim(CDS_MJID.fieldbyname('MJId').AsString);
|
||||
FieldByName('BCID').value := Trim(MaxCkNo);
|
||||
FieldByName('CRTime').value := SGetServerDateTime(ADOTmp);
|
||||
FieldByName('CRFlag').value := 'Èë¿â';
|
||||
FieldByName('CRType').value := '¼ìÑéÈë¿â';
|
||||
//FieldByName('JTType').Value:=Trim(XJFlag);
|
||||
FieldByName('CRID').Value := CRID;
|
||||
FieldByName('CRID').value := CRID;
|
||||
if Trim(MJMaoZ.Text) <> '' then
|
||||
begin
|
||||
FieldByName('KGQty').Value := StrToFloat(MJMaoZ.Text);
|
||||
FieldByName('KGQty').value := StrToFloat(MJMaoZ.Text);
|
||||
end;
|
||||
if Trim(MJLen.Text) <> '' then
|
||||
begin
|
||||
FieldByName('Qty').Value := StrToFloat(MJLen.Text);
|
||||
FieldByName('Qty').value := StrToFloat(MJLen.Text);
|
||||
end;
|
||||
FieldByName('QtyUnit').Value := Trim(Label9.Caption);
|
||||
FieldByName('Filler').Value := Trim(DName);
|
||||
FieldByName('FillTime').Value := SGetServerDateTime(ADOTmp);
|
||||
FieldByName('QtyUnit').value := Trim(Label9.Caption);
|
||||
FieldByName('Filler').value := Trim(DName);
|
||||
FieldByName('FillTime').value := SGetServerDateTime(ADOTmp);
|
||||
if Trim(Edit3.Text) <> '' then
|
||||
begin
|
||||
FieldByName('CPType').Value := 'ÕýÆ·';
|
||||
FieldByName('CPType').value := 'ÕýÆ·';
|
||||
end;
|
||||
if Trim(Edit4.Text) <> '' then
|
||||
begin
|
||||
FieldByName('CPType').Value := '´ÎÆ·';
|
||||
FieldByName('CPType').value := '´ÎÆ·';
|
||||
end;
|
||||
Post;
|
||||
end;
|
||||
|
|
@ -2169,18 +2184,18 @@ begin
|
|||
with ADOCmd do
|
||||
begin
|
||||
Append;
|
||||
FieldByName('CRID').Value := CRID;
|
||||
FieldByName('BCID').Value := Trim(MaxCkNo);
|
||||
FieldByName('MJID').Value := Trim(CDS_MJID.fieldbyname('MJID').AsString);
|
||||
FieldByName('CRID').value := CRID;
|
||||
FieldByName('BCID').value := Trim(MaxCkNo);
|
||||
FieldByName('MJID').value := Trim(CDS_MJID.fieldbyname('MJID').AsString);
|
||||
if Trim(MJMaoZ.Text) <> '' then
|
||||
begin
|
||||
FieldByName('KCKGQty').Value := StrToFloat(MJMaoZ.Text);
|
||||
FieldByName('KCKGQty').value := StrToFloat(MJMaoZ.Text);
|
||||
end;
|
||||
if Trim(MJLen.Text) <> '' then
|
||||
begin
|
||||
FieldByName('KCQty').Value := StrToFloat(MJLen.Text);
|
||||
FieldByName('KCQty').value := StrToFloat(MJLen.Text);
|
||||
end;
|
||||
FieldByName('KCQtyUnit').Value := Trim(Label9.Caption);
|
||||
FieldByName('KCQtyUnit').value := Trim(Label9.Caption);
|
||||
Post;
|
||||
end;
|
||||
end;
|
||||
|
|
@ -2199,17 +2214,17 @@ begin
|
|||
if Trim(mvalue) <> '' then
|
||||
begin
|
||||
CDS_MJCD.Edit;
|
||||
CDS_MJCD.FieldByName('CDQty').Value := mvalue;
|
||||
CDS_MJCD.FieldByName('CDQty').value := mvalue;
|
||||
CDS_MJCD.Post;
|
||||
end
|
||||
else
|
||||
begin
|
||||
CDS_MJCD.Edit;
|
||||
CDS_MJCD.FieldByName('CDQty').Value := 0;
|
||||
CDS_MJCD.FieldByName('CDQty').value := 0;
|
||||
CDS_MJCD.Post;
|
||||
end;
|
||||
CDS_MJCD.Edit;
|
||||
CDS_MJCD.FieldByName('CDQtyS').Value := mvalue;
|
||||
CDS_MJCD.FieldByName('CDQtyS').value := mvalue;
|
||||
except
|
||||
Application.MessageBox('非法数字！', '提示', 0);
|
||||
end;
|
||||
|
|
@ -2317,7 +2332,7 @@ begin
|
|||
if Trim(Order_MJ.fieldbyname('SubId').AsString) <> fsj then
|
||||
begin
|
||||
Edit;
|
||||
FieldByName('SSel').Value := False;
|
||||
FieldByName('SSel').value := False;
|
||||
end;
|
||||
Next;
|
||||
end;
|
||||
|
|
@ -2357,18 +2372,18 @@ begin
|
|||
with CDS_MJCD do
|
||||
begin
|
||||
Append;
|
||||
FieldByName('cdname').Value := Trim(FCDName);
|
||||
FieldByName('CDbeg').Value := Trim(Edit1.Text);
|
||||
FieldByName('CDEnd').Value := Trim(Edit2.Text);
|
||||
FieldByName('KouFenQty').Value := RadioGroup1.ItemIndex + 1;
|
||||
FieldByName('JBQty').Value := strtofloatdef(trim(Edit8.Text), 0);
|
||||
FieldByName('cdname').value := Trim(FCDName);
|
||||
FieldByName('CDbeg').value := Trim(Edit1.Text);
|
||||
FieldByName('CDEnd').value := Trim(Edit2.Text);
|
||||
FieldByName('KouFenQty').value := RadioGroup1.ItemIndex + 1;
|
||||
FieldByName('JBQty').value := strtofloatdef(trim(Edit8.Text), 0);
|
||||
if Trim(CDQty.Text) <> '' then
|
||||
begin
|
||||
FieldByName('CDQty').Value := StrToFloat(CDQty.Text);
|
||||
FieldByName('CDQty').value := StrToFloat(CDQty.Text);
|
||||
end
|
||||
else
|
||||
begin
|
||||
FieldByName('CDQty').Value := 0;
|
||||
FieldByName('CDQty').value := 0;
|
||||
end;
|
||||
|
||||
Post;
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user