Amkor/Groupware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

금일입고 메일 전송 기능 수정

Browse Source 
파트리스트 구매등록 오류 수정
구매신청 날짜 칸 더블클릭시 선택창 추가
This commit is contained in:
chi
2021-02-18 10:12:07 +09:00
parent fc25ac4cca
commit f942419d52
30 changed files with 1529 additions and 401 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
SubProject/FPJ0000/FPJ0000.csproj
View File

@@ -272,6 +272,9 @@
<Compile Include="Project\fProjectPartListEdit.Designer.cs">
<DependentUpon>fProjectPartListEdit.cs</DependentUpon>
</Compile>
<Compile Include="Purchase.cs">
<DependentUpon>Model1.tt</DependentUpon>
</Compile>
<Compile Include="SaveCost\fSaveCostReport.cs">
<SubType>Form</SubType>
</Compile>

1
SubProject/FPJ0000/Model1.Context.cs
View File

@@ -37,5 +37,6 @@ namespace FPJ0000
public virtual DbSet<EETGW_SaveCost> EETGW_SaveCost { get; set; }
public virtual DbSet<MailData> MailData { get; set; }
public virtual DbSet<MailForm> MailForm { get; set; }
public virtual DbSet<Purchase> Purchase { get; set; }
}
}

120
SubProject/FPJ0000/Model1.edmx
View File

@@ -150,6 +150,45 @@
<Property Name="exceptmail" Type="varchar(max)" />
<Property Name="exceptmailcc" Type="varchar(max)" />
</EntityType>
<EntityType Name="Purchase">
<Key>
<PropertyRef Name="idx" />
</Key>
<Property Name="idx" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
<Property Name="gcode" Type="varchar" MaxLength="10" Nullable="false" />
<Property Name="pdate" Type="varchar" MaxLength="10" />
<Property Name="state" Type="varchar" MaxLength="30" />
<Property Name="process" Type="varchar" MaxLength="30" />
<Property Name="receive" Type="varchar" MaxLength="50" />
<Property Name="sc" Type="varchar" MaxLength="30" />
<Property Name="request" Type="varchar" MaxLength="50" />
<Property Name="sid" Type="varchar" MaxLength="50" />
<Property Name="pumname" Type="nvarchar" MaxLength="200" />
<Property Name="pumidx" Type="int" />
<Property Name="pumscale" Type="varchar" MaxLength="200" />
<Property Name="pumunit" Type="varchar" MaxLength="50" />
<Property Name="pumqty" Type="int" />
<Property Name="pumprice" Type="decimal" Precision="18" Scale="0" />
<Property Name="pumamt" Type="decimal" Precision="18" Scale="0" />
<Property Name="supply" Type="varchar" MaxLength="200" />
<Property Name="supplyidx" Type="int" />
<Property Name="project" Type="varchar(max)" />
<Property Name="projectidx" Type="int" />
<Property Name="asset" Type="varchar" MaxLength="50" />
<Property Name="manuproc" Type="varchar" MaxLength="50" />
<Property Name="edate" Type="varchar" MaxLength="10" />
<Property Name="indate" Type="varchar" MaxLength="10" />
<Property Name="po" Type="varchar" MaxLength="50" />
<Property Name="dept" Type="nvarchar" MaxLength="500" />
<Property Name="bigo" Type="nvarchar" MaxLength="500" />
<Property Name="import" Type="bit" />
<Property Name="isdel" Type="bit" />
<Property Name="orderno" Type="varchar" MaxLength="50" />
<Property Name="place" Type="varchar" MaxLength="20" />
<Property Name="wuid" Type="varchar" MaxLength="20" Nullable="false" />
<Property Name="wdate" Type="smalldatetime" Nullable="false" />
<Property Name="inqty" Type="int" />
</EntityType>
<EntityType Name="UserGroup">
<Key>
<PropertyRef Name="dept" />
@@ -277,6 +316,7 @@
<EntitySet Name="HolidayLIst" EntityType="Self.HolidayLIst" Schema="dbo" store:Type="Tables" />
<EntitySet Name="MailData" EntityType="Self.MailData" Schema="dbo" store:Type="Tables" />
<EntitySet Name="MailForm" EntityType="Self.MailForm" Schema="dbo" store:Type="Tables" />
<EntitySet Name="Purchase" EntityType="Self.Purchase" Schema="dbo" store:Type="Tables" />
<EntitySet Name="UserGroup" EntityType="Self.UserGroup" Schema="dbo" store:Type="Tables" />
<EntitySet Name="Users" EntityType="Self.Users" Schema="dbo" store:Type="Tables" />
<EntitySet Name="vGroupUser" EntityType="Self.vGroupUser" store:Type="Views" store:Schema="dbo">
@@ -446,6 +486,7 @@
<EntitySet Name="EETGW_SaveCost" EntityType="EEModel.EETGW_SaveCost" />
<EntitySet Name="MailData" EntityType="EEModel.MailData" />
<EntitySet Name="MailForm" EntityType="EEModel.MailForm" />
<EntitySet Name="Purchase" EntityType="EEModel.Purchase" />
</EntityContainer>
<EntityType Name="HolidayLIst">
<Key>
@@ -622,6 +663,45 @@
<Property Name="exceptmail" Type="String" MaxLength="Max" FixedLength="false" Unicode="false" />
<Property Name="exceptmailcc" Type="String" MaxLength="Max" FixedLength="false" Unicode="false" />
</EntityType>
<EntityType Name="Purchase">
<Key>
<PropertyRef Name="idx" />
</Key>
<Property Name="idx" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
<Property Name="gcode" Type="String" Nullable="false" MaxLength="10" FixedLength="false" Unicode="false" />
<Property Name="pdate" Type="String" MaxLength="10" FixedLength="false" Unicode="false" />
<Property Name="state" Type="String" MaxLength="30" FixedLength="false" Unicode="false" />
<Property Name="process" Type="String" MaxLength="30" FixedLength="false" Unicode="false" />
<Property Name="receive" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
<Property Name="sc" Type="String" MaxLength="30" FixedLength="false" Unicode="false" />
<Property Name="request" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
<Property Name="sid" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
<Property Name="pumname" Type="String" MaxLength="200" FixedLength="false" Unicode="true" />
<Property Name="pumidx" Type="Int32" />
<Property Name="pumscale" Type="String" MaxLength="200" FixedLength="false" Unicode="false" />
<Property Name="pumunit" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
<Property Name="pumqty" Type="Int32" />
<Property Name="pumprice" Type="Decimal" Precision="18" Scale="0" />
<Property Name="pumamt" Type="Decimal" Precision="18" Scale="0" />
<Property Name="supply" Type="String" MaxLength="200" FixedLength="false" Unicode="false" />
<Property Name="supplyidx" Type="Int32" />
<Property Name="project" Type="String" MaxLength="Max" FixedLength="false" Unicode="false" />
<Property Name="projectidx" Type="Int32" />
<Property Name="asset" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
<Property Name="manuproc" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
<Property Name="edate" Type="String" MaxLength="10" FixedLength="false" Unicode="false" />
<Property Name="indate" Type="String" MaxLength="10" FixedLength="false" Unicode="false" />
<Property Name="po" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
<Property Name="dept" Type="String" MaxLength="500" FixedLength="false" Unicode="true" />
<Property Name="bigo" Type="String" MaxLength="500" FixedLength="false" Unicode="true" />
<Property Name="import" Type="Boolean" />
<Property Name="isdel" Type="Boolean" />
<Property Name="orderno" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
<Property Name="place" Type="String" MaxLength="20" FixedLength="false" Unicode="false" />
<Property Name="wuid" Type="String" Nullable="false" MaxLength="20" FixedLength="false" Unicode="false" />
<Property Name="wdate" Type="DateTime" Nullable="false" Precision="0" />
<Property Name="inqty" Type="Int32" />
</EntityType>
</Schema>
</edmx:ConceptualModels>
<!-- C-S mapping content -->
@@ -892,6 +972,46 @@
</MappingFragment>
</EntityTypeMapping>
</EntitySetMapping>
<EntitySetMapping Name="Purchase">
<EntityTypeMapping TypeName="EEModel.Purchase">
<MappingFragment StoreEntitySet="Purchase">
<ScalarProperty Name="inqty" ColumnName="inqty" />
<ScalarProperty Name="wdate" ColumnName="wdate" />
<ScalarProperty Name="wuid" ColumnName="wuid" />
<ScalarProperty Name="place" ColumnName="place" />
<ScalarProperty Name="orderno" ColumnName="orderno" />
<ScalarProperty Name="isdel" ColumnName="isdel" />
<ScalarProperty Name="import" ColumnName="import" />
<ScalarProperty Name="bigo" ColumnName="bigo" />
<ScalarProperty Name="dept" ColumnName="dept" />
<ScalarProperty Name="po" ColumnName="po" />
<ScalarProperty Name="indate" ColumnName="indate" />
<ScalarProperty Name="edate" ColumnName="edate" />
<ScalarProperty Name="manuproc" ColumnName="manuproc" />
<ScalarProperty Name="asset" ColumnName="asset" />
<ScalarProperty Name="projectidx" ColumnName="projectidx" />
<ScalarProperty Name="project" ColumnName="project" />
<ScalarProperty Name="supplyidx" ColumnName="supplyidx" />
<ScalarProperty Name="supply" ColumnName="supply" />
<ScalarProperty Name="pumamt" ColumnName="pumamt" />
<ScalarProperty Name="pumprice" ColumnName="pumprice" />
<ScalarProperty Name="pumqty" ColumnName="pumqty" />
<ScalarProperty Name="pumunit" ColumnName="pumunit" />
<ScalarProperty Name="pumscale" ColumnName="pumscale" />
<ScalarProperty Name="pumidx" ColumnName="pumidx" />
<ScalarProperty Name="pumname" ColumnName="pumname" />
<ScalarProperty Name="sid" ColumnName="sid" />
<ScalarProperty Name="request" ColumnName="request" />
<ScalarProperty Name="sc" ColumnName="sc" />
<ScalarProperty Name="receive" ColumnName="receive" />
<ScalarProperty Name="process" ColumnName="process" />
<ScalarProperty Name="state" ColumnName="state" />
<ScalarProperty Name="pdate" ColumnName="pdate" />
<ScalarProperty Name="gcode" ColumnName="gcode" />
<ScalarProperty Name="idx" ColumnName="idx" />
</MappingFragment>
</EntityTypeMapping>
</EntitySetMapping>
</EntityContainerMapping>
</Mapping>
</edmx:Mappings>

1
SubProject/FPJ0000/Model1.edmx.diagram
View File

@@ -17,6 +17,7 @@
<EntityTypeShape EntityType="EEModel.EETGW_SaveCost" Width="1.5" PointX="3.375" PointY="9.75" />
<EntityTypeShape EntityType="EEModel.MailData" Width="1.5" PointX="9.375" PointY="4.75" />
<EntityTypeShape EntityType="EEModel.MailForm" Width="1.5" PointX="9.375" PointY="10.75" />
<EntityTypeShape EntityType="EEModel.Purchase" Width="1.5" PointX="11.375" PointY="0.75" />
</Diagram>
</edmx:Diagrams>
</edmx:Designer>

81
SubProject/FPJ0000/Project/fProjectPartToPurchase.cs
View File

@@ -13,7 +13,7 @@ namespace FPJ0000
{
BindingSource bsModel;
int ProjectIndex = -1;
public fProjectPartToPurchase(int pidx,string sortkey)
public fProjectPartToPurchase(int pidx, string sortkey)
{
InitializeComponent();
this.ProjectIndex = pidx;
@@ -29,13 +29,13 @@ namespace FPJ0000
this.listView1.SuspendLayout();
this.listView1.Items.Clear();
var orderdata = dt
.OrderBy(t => string.Concat( (t.bbuy ? "1":"0"), t.ItemName));
.OrderBy(t => string.Concat((t.bbuy ? "1" : "0"), t.ItemName));
foreach (dsPRJ.ProjectsPartRow dr in orderdata)
{
var lvitem = this.listView1.Items.Add(dr.ItemGroup);
lvitem.Tag = dr;
lvitem.Checked = dr.bbuy ? false : true;
lvitem.Checked = dr.bbuy ? false : true;
lvitem.SubItems.Add(dr.option1);
lvitem.SubItems.Add(dr.ItemSid);
lvitem.SubItems.Add(dr.ItemName);
@@ -47,9 +47,9 @@ namespace FPJ0000
Boolean bbuy = dr.bbuy;
var supplyname = dr.ItemSupply.Trim();
if(dr.qtybuy == dr.qty)
if (dr.qtybuy == dr.qty)
{
//동일하면 보기 편하게 표시하지 않는다.
lvitem.SubItems.Add("--");
@@ -355,59 +355,52 @@ namespace FPJ0000
int iCnt = 0;
//데이터를 넣는다
var db = new EEEntities();
foreach (ListViewItem item in this.listView1.CheckedItems)
{
var dr = item.Tag as dsPRJ.ProjectsPartRow;
//insert query
var SQL =
" insert into purchase(asset,dept,manuproc,gcode,pdate,state,process,request,sid,pumname,pumidx,pumscale,pumunit," +
" pumqty,pumprice,pumamt,supply,supplyidx,project,projectidx,bigo,import,wuid,wdate,orderno)" +
" values( '{asset}','{dept}','{manuproc}','{gcode}', '{pdate}','{State}','{process}' ,'{userNo}','{ItemSid}'," +
" '{ItemName}','{Item}','{ItemModel}','{ItemUnit}','{qty}','{price}','{amt}','{ItemSupply}','{ItemSupplyidx}','{projectname}','{Project}'," +
" '{memo}',1 ,'{wuid}', getdate(),'{orderno}')" ;
SQL = SQL.Replace("{asset}", this.cbEQModel.Text);
SQL = SQL.Replace("{dept}", this.cbEQManu.Text);
SQL = SQL.Replace("{manuproc}", this.cbManuProc.Text);
SQL = SQL.Replace("{gcode}", FCOMMON.info.Login.gcode);
SQL = SQL.Replace("{orderno}", tbOrderNo.Text.Trim());
SQL = SQL.Replace("{wuid}", FCOMMON.info.Login.no);
SQL = SQL.Replace("{projectname}", tbProject.Text.Trim());
SQL = SQL.Replace("{userNo}", userNo.Trim());
SQL = SQL.Replace("{process}", cbProcess.Text.Trim());
SQL = SQL.Replace("{State}", cmbState.Text.Trim());
SQL = SQL.Replace("{pdate}", dtPdate.Value.ToShortDateString());
SQL = SQL.Replace("{ItemSid}", dr.ItemSid.Replace(" ","").Trim());
SQL = SQL.Replace("{ItemName}", dr.ItemName.Trim());
SQL = SQL.Replace("{Item}", dr.Item.ToString());
SQL = SQL.Replace("{ItemModel}", dr.ItemModel);
SQL = SQL.Replace("{ItemUnit}", dr.ItemUnit);
SQL = SQL.Replace("{price}", dr.price.ToString());
if(radioButton1.Checked)
var newdr = new Purchase();
newdr.asset = cbEQModel.Text.Trim();
newdr.dept = cbEQModel.Text.Trim();
newdr.manuproc = cbManuProc.Text.Trim();
newdr.gcode = FCOMMON.info.Login.gcode;
newdr.pdate = dtPdate.Value.ToShortDateString();
newdr.state = cmbState.Text.Trim();
newdr.process = cbProcess.Text.Trim();
newdr.request = userNo.Trim();
newdr.sid = dr.ItemSid.Replace(" ", "").Trim();
newdr.pumname = dr.ItemName.Trim();
newdr.pumidx = dr.Item;
newdr.pumscale = dr.ItemModel;
newdr.pumunit = dr.ItemUnit;
newdr.pumprice = dr.price;
if (radioButton1.Checked)
{
SQL = SQL.Replace("{qty}", dr.qty.ToString()); //일반수량이 아닌 필요수량으로
SQL = SQL.Replace("{amt}", dr.amt.ToString());
newdr.pumqty = dr.qty; //SQL = SQL.Replace("{qty}", dr.qty.ToString()); //일반수량이 아닌 필요수량으로
newdr.pumamt = dr.amt; //SQL = SQL.Replace("{amt}", dr.amt.ToString());
}
else
{
//실제 구매에 필요한 수량으로 처리
SQL = SQL.Replace("{qty}", dr.qtybuy.ToString()); //일반수량이 아닌 필요수량으로
SQL = SQL.Replace("{amt}", (dr.qtybuy * dr.price).ToString());
newdr.pumqty = dr.qtybuy;
newdr.pumamt = dr.qtybuy * dr.price;
}
SQL = SQL.Replace("{ItemSupply}", dr.ItemSupply);
SQL = SQL.Replace("{ItemSupplyidx}", dr.ItemSupplyidx.ToString());
SQL = SQL.Replace("{Project}", dr.Project.ToString());
SQL = SQL.Replace("{memo}", dr.memo);
newdr.supply = dr.ItemSupply.Trim();
newdr.supplyidx = dr.ItemSupplyidx;
newdr.project = tbProject.Text.Trim();
newdr.projectidx = int.Parse(tbProjectIndex.Text);
newdr.bigo = dr.memo.Trim();
newdr.import = true;
newdr.wuid = FCOMMON.info.Login.no;
newdr.wdate = DateTime.Now;
newdr.orderno = tbOrderNo.Text.Trim();
db.Purchase.Add(newdr);
// Console.WriteLine(SQL);
fProg.IncProgress();
var cnt = FCOMMON.DBM.ExecuteNonQuery(SQL);
db.SaveChanges();
}
FCOMMON.Util.MsgI(string.Format("{0}건의 자료가 생성 되었습니다.\n\n구매등록 화면에서 내용을 확인하세요.", itemCount));

52
SubProject/FPJ0000/Purchase.cs Normal file
View File

@@ -0,0 +1,52 @@
//------------------------------------------------------------------------------
// <auto-generated>
// 이 코드는 템플릿에서 생성되었습니다.
//
// 이 파일을 수동으로 변경하면 응용 프로그램에서 예기치 않은 동작이 발생할 수 있습니다.
// 이 파일을 수동으로 변경하면 코드가 다시 생성될 때 변경 내용을 덮어씁니다.
// </auto-generated>
//------------------------------------------------------------------------------
namespace FPJ0000
{
using System;
using System.Collections.Generic;
public partial class Purchase
{
public int idx { get; set; }
public string gcode { get; set; }
public string pdate { get; set; }
public string state { get; set; }
public string process { get; set; }
public string receive { get; set; }
public string sc { get; set; }
public string request { get; set; }
public string sid { get; set; }
public string pumname { get; set; }
public Nullable<int> pumidx { get; set; }
public string pumscale { get; set; }
public string pumunit { get; set; }
public Nullable<int> pumqty { get; set; }
public Nullable<decimal> pumprice { get; set; }
public Nullable<decimal> pumamt { get; set; }
public string supply { get; set; }
public Nullable<int> supplyidx { get; set; }
public string project { get; set; }
public Nullable<int> projectidx { get; set; }
public string asset { get; set; }
public string manuproc { get; set; }
public string edate { get; set; }
public string indate { get; set; }
public string po { get; set; }
public string dept { get; set; }
public string bigo { get; set; }
public Nullable<bool> import { get; set; }
public Nullable<bool> isdel { get; set; }
public string orderno { get; set; }
public string place { get; set; }
public string wuid { get; set; }
public System.DateTime wdate { get; set; }
public Nullable<int> inqty { get; set; }
}
}