yiming/17168ERP
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

調整

Browse Source
This commit is contained in:
minom
2026-07-27 06:28:06 +08:00
parent 5f8c5a8430
commit d823cedd3c
7 changed files with 226 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/App_Code/Model/Model.cs
+2
View File
@@ -1554,6 +1554,8 @@ namespace Model
public string u_date { get; set; }
public string u_time { get; set; }
public string addr { get; set; }
public string receipt_date { get; set; }
public string receipt_item { get; set; }
}
}
namespace Model
web/App_Code/Model/Model.edmx
+7 -1
View File
@@ -812,6 +812,8 @@
<Property Name="u_date" Type="varchar" MaxLength="10" />
<Property Name="u_time" Type="varchar" MaxLength="6" />
<Property Name="addr" Type="nvarchar" MaxLength="255" />
<Property Name="receipt_date" Type="varchar" MaxLength="10" />
<Property Name="receipt_item" Type="nvarchar" MaxLength="100" />
</EntityType>
<EntityType Name="receipt_master">
<Key>
@@ -5464,6 +5466,8 @@
<Property Name="u_date" Type="String" MaxLength="10" FixedLength="false" Unicode="false" />
<Property Name="u_time" Type="String" MaxLength="6" FixedLength="false" Unicode="false" />
<Property Name="addr" Type="String" MaxLength="255" FixedLength="false" Unicode="true" />
<Property Name="receipt_date" Type="String" MaxLength="10" FixedLength="false" Unicode="true" />
<Property Name="receipt_item" Type="String" MaxLength="100" FixedLength="false" Unicode="true" />
</EntityType>
<EntityType Name="receipt_master">
<Key>
@@ -6584,7 +6588,9 @@
<EntitySetMapping Name="receipt_detail">
<EntityTypeMapping TypeName="Model.receipt_detail">
<MappingFragment StoreEntitySet="receipt_detail">
<ScalarProperty Name="addr" ColumnName="addr" />
<ScalarProperty Name="receipt_item" ColumnName="receipt_item" />
<ScalarProperty Name="receipt_date" ColumnName="receipt_date" />
<ScalarProperty Name="addr" ColumnName="addr" />
<ScalarProperty Name="u_time" ColumnName="u_time" />
<ScalarProperty Name="u_date" ColumnName="u_date" />
<ScalarProperty Name="u_user" ColumnName="u_user" />
web/App_Code/Model/ViewModel/receipt.cs
+2
View File
@@ -38,5 +38,7 @@ namespace Model.ViewModel
public int? amt { get; set; }
public string caseofficer { get; set; }
public string addr { get; set; }
public string receipt_date { get; set; }
public string receipt_item { get; set; }
}
}
web/App_Code/api/receiptController.cs
+15 -10
View File
@@ -37,20 +37,20 @@ public class receiptController: ApiController
//
}
public string generend_receiptNo(string source)
public string generend_receiptNo(string source,string receipt_date)
{
string start = source + "A";
string no = start + DateTime.Now.ToString("yyyyMMdd");
string start ="1"+ (source=="1"?"A":"B");
string no = start + receipt_date; //DateTime.Now.ToString("yyyyMMdd");
var qry = _db.receipt_detail.Where(x => x.receipt_no.StartsWith(no));
var receipt_no=qry.Select(x => x.receipt_no).Max();
if (!string.IsNullOrEmpty(receipt_no))
{
receipt_no= receipt_no.Remove(0,(start + DateTime.Now.ToString("yyyyMMdd")).Length);
return start + DateTime.Now.ToString("yyyyMMdd")+string.Format("{0:D4}", Int32.Parse(receipt_no)+1);
receipt_no= receipt_no.Remove(0,(start + receipt_date.Replace("-","")).Length);
return start + receipt_date.Replace("-", "") + string.Format("{0:D4}", Int32.Parse(receipt_no)+1);
}
else
{
return start + DateTime.Now.ToString("yyyyMMdd") + "0001";
return start + receipt_date.Replace("-", "") + "0001";
}
}
@@ -94,17 +94,19 @@ public class receiptController: ApiController
receipt_detail dd = new receipt_detail();
if (string.IsNullOrEmpty(pre_no))
{
dd.receipt_no = generend_receiptNo(master.source);
dd.receipt_no = generend_receiptNo(master.source,d.receipt_date.Replace("-",""));
}
else
{
string new_no = pre_no.Remove(0, 10);
dd.receipt_no = master.source + "A" + DateTime.Now.ToString("yyyyMMdd") + string.Format("{0:D4}", Int32.Parse(new_no) + 1);
dd.receipt_no = "1"+(master.source=="1"?"A":"B" )+d.receipt_date.Replace("-","") + string.Format("{0:D4}", Int32.Parse(new_no) + 1);
}
dd.addr = d.addr;
dd.title = d.title;
dd.amt = d.amt;
dd.caseofficer = d.caseofficer;
dd.receipt_date= d.receipt_date;
dd.receipt_item = d.receipt_item;
dd.receipt_num = master.num;
dd.c_date = DateTime.Now.ToString("yyyyMMdd");
dd.c_time = DateTime.Now.ToString("HHmmss");
@@ -119,6 +121,7 @@ public class receiptController: ApiController
dd.title=d.title;
dd.amt=d.amt;
dd.caseofficer=d.caseofficer;
dd.receipt_item=d.receipt_item;
dd.u_time = DateTime.Now.ToString("HHmmss");
dd.u_date = DateTime.Now.ToString("yyyyMMdd");
}
@@ -170,17 +173,19 @@ public class receiptController: ApiController
receipt_detail dd = new receipt_detail();
if (string.IsNullOrEmpty(pre_no))
{
dd.receipt_no = generend_receiptNo(m.source);
dd.receipt_no = generend_receiptNo(m.source, d.receipt_date.Replace("-", ""));
}
else
{
string new_no = pre_no.Remove(0,10);
dd.receipt_no = m.source + "A" + DateTime.Now.ToString("yyyyMMdd") + string.Format("{0:D4}", Int32.Parse(new_no)+1);
dd.receipt_no ="1"+ (m.source=="1"?"A":"B") + d.receipt_date.Replace("-", "") + string.Format("{0:D4}", Int32.Parse(new_no)+1);
}
dd.addr = d.addr;
dd.title = d.title;
dd.amt = d.amt;
dd.caseofficer = d.caseofficer;
dd.receipt_date=d.receipt_date;
dd.receipt_item = d.receipt_item;
dd.receipt_num = m.num;
dd.c_date = DateTime.Now.ToString("yyyyMMdd");
dd.c_time = DateTime.Now.ToString("HHmmss");