SCP
/
SCPFWBTL
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

锦州合并

master
lvzb 4 years ago
parent
ffff469272
commit
579582f3b6
14 changed files with 102 additions and 86 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      .gitignore
  2. 2
      Controller/SCP_EXCEL_CONTROLLER.cs
  3. 20
      Controller/SCP_RECEIVE_CONTROLLER.cs
  4. 2
      Models/ScpEntity/V_TB_INVOICE.cs
  5. 6
      SCP/Views/SupplierData/SCP_ASK.aspx.cs
  6. 6
      SCP/Views/SupplierData/SCP_RECEIVE_LIST.aspx.cs
  7. 4
      SCP/Views/WarehouseData/SCP_RECEIVE.aspx.cs
  8. 31
      SCP/Views/WarehouseData/SCP_RECEIVE_DETAIL.aspx
  9. 19
      SCP/Views/WarehouseData/SCP_RECEIVE_DETAIL.aspx.cs
  10. 36
      SCP/Views/WarehouseData/SCP_RECEIVE_DETAIL.aspx.designer.cs
  11. 2
      SCP/Views/锦州锦恒/SupplierData/SCP_ASN_DETAIL.aspx
  12. 4
      SCP/Views/锦州锦恒/SupplierData/SCP_ASN_DETAIL.aspx.cs
  13. 2
      SCP/Views/锦州锦恒/SupplierData/SCP_SHIP_DETAIL_BARCODE.aspx.cs
  14. 5
      SCP/default.aspx

1
.gitignore
View File

@ -264,3 +264,4 @@ __pycache__/
/SCP/exportfiles/收货审核明细-20180530142739101.xls
/SCP/exportfiles/收货审核明细-20180530142542391.xls
/SCP/exportfiles
/SCP/grf

2
Controller/SCP_EXCEL_CONTROLLER.cs
View File

@ -133,7 +133,7 @@ namespace CK.SCP.Controller
po_detail.到货日期 = DateTime.Now.ToShortDateString();
po_detail.单位 = itm.PoUnit;
po_detail.域名 = _po.Site;
po_detail.站点 = _po.Remark;
po_detail.站点 = _po.SubSite==null? _po.Site: _po.SubSite;
po_detail.计划员 = _po.Buyer;
po_detail.计划员电话 = _po.BuyerPhone;
po_detail.价格 = itm.Price.ToString();

20
Controller/SCP_RECEIVE_CONTROLLER.cs
View File

@ -183,6 +183,10 @@ namespace CK.SCP.Controller
{
q = q.Where(p => p.RecvBillNum.Contains(p_entity.RecvBillNum));
}
if (!string.IsNullOrEmpty(p_entity.ErpRecvBillNum))
{
q = q.Where(p => p.ErpRecvBillNum.Contains(p_entity.ErpRecvBillNum));
}
if (!string.IsNullOrEmpty(p_entity.PoBillNum))
{
q = q.Where(p => p.PoBillNum.Contains(p_entity.PoBillNum));
@ -518,6 +522,10 @@ namespace CK.SCP.Controller
{
q = q.Where(p => p.RecvBillNum == p_entity.RecvBillNum);
}
if (!string.IsNullOrEmpty(p_entity.ErpRecvBillNum))
{
q = q.Where(p => p.ErpRecvBillNum == p_entity.ErpRecvBillNum);
}
if (p_entity.PoLine != 0)
{
q = q.Where(p => p.PoLine == p_entity.PoLine);
@ -526,10 +534,6 @@ namespace CK.SCP.Controller
{
q = q.Where(p => p.PartCode.Contains(p_entity.PartCode));
}
if (!string.IsNullOrEmpty(p_entity.Site))
{
q = q.Where(p => p.PartCode.Contains(p_entity.Site));
}
if (!string.IsNullOrEmpty(p_entity.Batch))
{
q = q.Where(p => p.Batch.Contains(p_entity.Batch));
@ -658,7 +662,7 @@ namespace CK.SCP.Controller
if (p_state == ReceiveState.Check)
{
var _ls = db.V_TB_RECEIVE.Where(p => p_list.Contains(p.RecvBillNum) && p.Site==p_site).ToList();
var _ls = db.V_TB_RECEIVE.Where(p => p_list.Contains(p.ErpRecvBillNum) && p.Site==p_site).ToList();
int count = _ls.Count(p => p.State == (int)ReceiveState.Receive);
if (count == _ls.Count && _ls.Count > 0)
{
@ -666,7 +670,7 @@ namespace CK.SCP.Controller
{
p.OperName = userName;
p.State = (int)ReceiveState.Check;
var _list = db.TB_RECEIVE_DETAIL_QAD.Where(itm => itm.RecvBillNum == p.RecvBillNum && itm.Site == p_site).ToList();
var _list = db.TB_RECEIVE_DETAIL_QAD.Where(itm => itm.ErpRecvBillNum == p.ErpRecvBillNum && itm.Site == p_site).ToList();
_list.ForEach(itm => itm.State = (int)ReceiveState.Check);
db.TB_RECEIVE_DETAIL_QAD.AddOrUpdate(itm => itm.UID, _list.ToArray());
#region 收货审核提醒供应商提起发票申请
@ -707,7 +711,7 @@ namespace CK.SCP.Controller
}
if (p_state == ReceiveState.Reject)
{
var _ls = db.V_TB_RECEIVE.Where(p => p_list.Contains(p.RecvBillNum) && p.Site == p_site).ToList();
var _ls = db.V_TB_RECEIVE.Where(p => p_list.Contains(p.ErpRecvBillNum) && p.Site == p_site).ToList();
int count = _ls.Count(p => p.State == (int)ReceiveState.Receive);
if (count == _ls.Count && _ls.Count > 0)
{
@ -716,7 +720,7 @@ namespace CK.SCP.Controller
p.OperName = userName;
p.State = (int)ReceiveState.Reject;
p.IsDeleted = true;
var _list = db.TB_RECEIVE_DETAIL_QAD.Where(itm => itm.RecvBillNum == p.RecvBillNum && p.Site == p_site).ToList();
var _list = db.TB_RECEIVE_DETAIL_QAD.Where(itm => itm.ErpRecvBillNum == p.ErpRecvBillNum && p.Site == p_site).ToList();
_list.ForEach(itm =>
{
itm.State = (int)ReceiveState.Reject;

2
Models/ScpEntity/V_TB_INVOICE.cs
View File

@ -66,7 +66,7 @@ namespace CK.SCP.Models.ScpEntity
[StringLength(50)]
public string DiscountRemark { get; set; }
public bool IsRed { get; set; }
public decimal? MoldSharingPrice { get; set; } //分摊价格
//public decimal? MoldSharingPrice { get; set; } //分摊价格
public string AskCreateUser { get; set; } //要货看板创建人
/// <summary>
/// 采购价

6
SCP/Views/SupplierData/SCP_ASK.aspx.cs
View File

@ -118,12 +118,8 @@ namespace SCP.Views.SupplierData
CurrentUser.VenderList = new List<string>() { "00000000000" };
}
_entity.UserInVendIds = CurrentUser.VenderList;
_entity.BillStateList = new List<int> { (int)AskState.Confirm, (int)AskState.Release, (int)AskState.Ship, (int)AskState.Receive };
}
//if (CurrentUser.RoleList.Contains("供应商"))
//{
// _entity.BillStateList = new List<int> { (int)AskState.Confirm, (int)AskState.Release, (int)AskState.Ship, (int)AskState.Receive };
//}
SCP_ASK_CONTROLLER.Get_V_TB_ASK_List(_entity, (_ret) => {
if (_ret.State == ReturnStatus.Succeed)
{

6
SCP/Views/SupplierData/SCP_RECEIVE_LIST.aspx.cs
View File

@ -73,9 +73,9 @@ namespace SCP.SupplierData
public void LoadData()
{
// 每页记录数
//Grid_V_TB_RECEIVE_LIST.PageSize = ConfigHelper.PageSize;
//ddlGridPageSize.SelectedValue = ConfigHelper.PageSize.ToString();
//BindData();
Grid_V_TB_RECEIVE_LIST.PageSize = ConfigHelper.PageSize;
ddlGridPageSize.SelectedValue = ConfigHelper.PageSize.ToString();
BindData();
}
private void SearchData(Action<IQueryable<V_TB_RECEIVE_LIST>> p_action)
{

4
SCP/Views/WarehouseData/SCP_RECEIVE.aspx.cs
View File

@ -126,7 +126,7 @@ namespace SCP.WarehouseData
}
protected void Grid1_OnRowDoubleClick(object sender, GridRowClickEventArgs e)
{
string ID = GetSelectedDataKey(Grid_V_TB_RECEIVE, 1);
string ID = GetSelectedDataKey(Grid_V_TB_RECEIVE, 2);
string Site = GetSelectedDataKey(Grid_V_TB_RECEIVE, 4);
string STATE = Grid_V_TB_RECEIVE.Rows[e.RowIndex].Values[0].ToString();
@ -219,7 +219,7 @@ namespace SCP.WarehouseData
return;
}
}
_ls.Add(rowDataKeys[1] as string);
_ls.Add(rowDataKeys[2] as string);
var erpRec = rowDataKeys[2] as string;
if (string.IsNullOrEmpty(erpRec))
{

31
SCP/Views/WarehouseData/SCP_RECEIVE_DETAIL.aspx
View File

@ -18,7 +18,7 @@
</f:Button>
<f:Button ID="btnDelete" runat="server" OnClick="btnDelete_Click" Text="报废收货退货单" Icon="Accept" OnClientClick="if(!confirm('系统管理员是否要删除删除后不能恢复?'))return false;" EnablePostBack="True">
</f:Button>
<f:Button ID="btnBack" runat="server" EnablePostBack="True" Text="" Icon="Cancel" OnClick="btnBack_Click" OnClientClick="if(!confirm('是否取消审核?'))return false;">
<f:Button ID="btnBack" runat="server" EnablePostBack="True" Text="取消审核" Icon="Cancel" OnClick="btnBack_Click" OnClientClick="if(!confirm('是否取消审核?'))return false;">
</f:Button>
</Items>
</f:Toolbar>
@ -28,37 +28,32 @@
<Items>
<f:FormRow runat="server" ColumnWidths="33% 33% 33%" ID="F_PO_DETAIL" Hidden="true">
<Items>
<f:TextBox ID="txtBillNo" runat="server" Label="单据号" Text="" Width="600">
</f:TextBox>
<f:TextBox ID="txtShipBillNo" runat="server" Label="发货单" Text="" Width="600">
</f:TextBox>
<f:TextBox ID="txtPlanBillNo" runat="server" Label="订单号" Text="" Readonly="true" />
<f:TextBox ID="txtState" runat="server" Label="状态" Text="" Readonly="true" />
<f:TextBox ID="txtErpBillNo" runat="server" Label="ERP单据号" Text="" Width="600"/>
<f:TextBox ID="txtBillNo" runat="server" Label="WMS单据号" Text="" Width="600"/>
</Items>
</f:FormRow>
<f:FormRow runat="server" ColumnWidths="33% 33% 33%">
<Items>
<f:TextBox ID="txtState" runat="server" Label="状态" Text="" Readonly="true" />
<f:TextBox ID="txtSupplierName" runat="server" Label="供应商" Text="">
</f:TextBox>
<f:Label runat="server" />
<f:TextBox ID="txtPlanBillNo" runat="server" Label="订单号" Text="" Readonly="true" />
<f:TextBox ID="txtShipBillNo" runat="server" Label="发货单" Text="" Width="600"/>
<f:TextBox ID="txtSupplierName" runat="server" Label="供应商" Text=""/>
</Items>
</f:FormRow>
<f:FormRow runat="server" ColumnWidths="33% 33% 33%">
<Items>
<f:TextBox ID="txtDeliveryAddress" runat="server" Label="地址" Text="">
</f:TextBox>
<f:TextBox ID="txtReceiveTime" runat="server" Label="时间" Text="">
</f:TextBox>
<f:TextBox ID="txtDeliveryAddress" runat="server" Label="地址" Text=""/>
<f:TextBox ID="txtReceiveTime" runat="server" Label="时间" Text=""/>
<f:TextBox ID="txtUserName" runat="server" Label="审核员" Text="" Readonly="true" />
</Items>
</f:FormRow>
<f:FormRow runat="server" ColumnWidths="33% 33% 33%">
<Items>
<f:TextBox ID="txtUserName" runat="server" Label="审核员" Text="" Readonly="true" />
<f:TextBox ID="txtMemo" runat="server" Label="备注" Text="">
</f:TextBox>
<f:TextBox ID="txtMemo" runat="server" Label="备注" Text=""/>
<f:Label ID="TextBox2" runat="server" Text="">
</f:Label>
<f:Label ID="TextBox3" runat="server" Text="">
</f:Label>
</Items>
</f:FormRow>
</Items>

19
SCP/Views/WarehouseData/SCP_RECEIVE_DETAIL.aspx.cs
View File

@ -37,7 +37,7 @@ namespace SCP.WarehouseData
public void LoadData()
{
var _receive = new V_TB_RECEIVE();
_receive.RecvBillNum = GetQueryValue("ID");
_receive.ErpRecvBillNum = GetQueryValue("ID");
_receive.UserInAddress = CurrentUser.FactoryList;
if (GetQueryValue("STATE") != null)
{
@ -50,6 +50,7 @@ namespace SCP.WarehouseData
var _rec = ret.Result.FirstOrDefault();
txtState.Text = _rec.State_DESC;
txtBillNo.Text = _rec.RecvBillNum;
txtErpBillNo.Text = _rec.ErpRecvBillNum;
txtReceiveTime.Text = Convert.ToDateTime(_rec.ShipTime).ToString("yyyy-MM-dd");
txtShipBillNo.Text = _rec.AsnBillNum;
txtPlanBillNo.Text = _rec.PoBillNum;
@ -65,7 +66,7 @@ namespace SCP.WarehouseData
{
var _receive = new V_TB_RECEIVE_DETAIL();
_receive.Site =CurrentUser.UsedDomain;
_receive.RecvBillNum = GetQueryValue("ID");
_receive.ErpRecvBillNum = GetQueryValue("ID");
SCP_RECIVECE_CONTROLLER.Get_V_TB_RECEIVE_DETAIL_List(_receive, (ret) =>
{
@ -83,7 +84,7 @@ namespace SCP.WarehouseData
public void BindData_View()
{
var _receive = new V_TB_RECEIVE_DETAIL();
_receive.RecvBillNum = GetQueryValue("ID");
_receive.ErpRecvBillNum = GetQueryValue("ID");
if (string.IsNullOrEmpty(Request["ID"].Trim()))
{
if (!string.IsNullOrEmpty("PartCode"))
@ -127,7 +128,7 @@ namespace SCP.WarehouseData
protected void btnOutput_OnClick(object sender, EventArgs e)
{
var _receive = new V_TB_RECEIVE_DETAIL();
_receive.RecvBillNum = GetQueryValue("ID");
_receive.ErpRecvBillNum = GetQueryValue("ID");
_receive.Site = CurrentUser.UsedDomain;
SCP_RECIVECE_CONTROLLER.Get_V_TB_RECEIVE_DETAIL_List(_receive, (ret) =>
{
@ -161,7 +162,7 @@ namespace SCP.WarehouseData
{
var _receive = new V_TB_RECEIVE();
_receive.RecvBillNum = GetQueryValue("ID");
_receive.ErpRecvBillNum = GetQueryValue("ID");
_receive.Site = GetQueryValue("Site");
if (GetQueryValue("STATE") != null)
{
@ -203,7 +204,7 @@ namespace SCP.WarehouseData
protected void btnBack_Click(object sender, EventArgs e)
{
var _receive = new V_TB_RECEIVE();
_receive.RecvBillNum = GetQueryValue("ID");
_receive.ErpRecvBillNum = GetQueryValue("ID");
_receive.Site =GetQueryValue("Site");
_receive.State = 1;
SCP_RECIVECE_CONTROLLER.Get_V_TB_RECEIVE_List(_receive, (ret) =>
@ -215,14 +216,14 @@ namespace SCP.WarehouseData
{
if (_rec != null)
{
int _count=SCPDB.TB_INVOICE_DETAIL.Where(p => p.RecvBillNum == _rec.RecvBillNum && p.PoBillNum == _rec.PoBillNum).Count();
int _count=SCPDB.TB_INVOICE_DETAIL.Where(p => p.ErpRecvBillNum == _rec.ErpRecvBillNum && p.PoBillNum == _rec.PoBillNum).Count();
if (_count > 0)
{
Alert.Show("不能取消已经开票！");
return;
}
var rec = SCPDB.TB_RECEIVE_QAD.Where(p => p.RecvBillNum == _rec.RecvBillNum && p.Site == _rec.Site).FirstOrDefault();
var detail = SCPDB.TB_RECEIVE_DETAIL_QAD.Where(p => p.RecvBillNum == _rec.RecvBillNum && p.Remark == _rec.Site).ToArray();
var rec = SCPDB.TB_RECEIVE_QAD.Where(p => p.ErpRecvBillNum == _rec.ErpRecvBillNum && p.Site == _rec.Site).FirstOrDefault();
var detail = SCPDB.TB_RECEIVE_DETAIL_QAD.Where(p => p.ErpRecvBillNum == _rec.ErpRecvBillNum && p.Site == _rec.Site).ToArray();
if (rec != null)
{
rec.State = 0;

36
SCP/Views/WarehouseData/SCP_RECEIVE_DETAIL.aspx.designer.cs
View File

@ -7,10 +7,12 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace SCP.WarehouseData {
namespace SCP.WarehouseData
{
public partial class SCP_RECEIVE_DETAIL {
public partial class SCP_RECEIVE_DETAIL
{
/// <summary>
/// form1 控件。
@ -76,22 +78,31 @@ namespace SCP.WarehouseData {
protected global::FineUI.FormRow F_PO_DETAIL;
/// <summary>
/// txtBillNo 控件。
/// txtState 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUI.TextBox txtBillNo;
protected global::FineUI.TextBox txtState;
/// <summary>
/// txtShipBillNo 控件。
/// txtErpBillNo 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUI.TextBox txtShipBillNo;
protected global::FineUI.TextBox txtErpBillNo;
/// <summary>
/// txtBillNo 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUI.TextBox txtBillNo;
/// <summary>
/// txtPlanBillNo 控件。
@ -103,13 +114,13 @@ namespace SCP.WarehouseData {
protected global::FineUI.TextBox txtPlanBillNo;
/// <summary>
/// txtState 控件。
/// txtShipBillNo 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUI.TextBox txtState;
protected global::FineUI.TextBox txtShipBillNo;
/// <summary>
/// txtSupplierName 控件。
@ -165,6 +176,15 @@ namespace SCP.WarehouseData {
/// </remarks>
protected global::FineUI.Label TextBox2;
/// <summary>
/// TextBox3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUI.Label TextBox3;
/// <summary>
/// btnOutput 控件。
/// </summary>

2
SCP/Views/锦州锦恒/SupplierData/SCP_ASN_DETAIL.aspx
View File

@ -65,7 +65,7 @@
<f:Button runat="server" ID="btnOutputPallet" Text="导出或打印托盘" Icon="Printer" OnClick="btnOutputPallet_Click" Hidden="true"></f:Button>
<f:Button runat="server" ID="btnBarCodeList" Text="显示条码列表" Icon="Layers" OnClick="btnBarCodeList_Click"></f:Button>
<f:Button runat="server" ID="btnOutPut" Text="导出明细" Icon="PageExcel" OnClick="btnOutput_Click"></f:Button>
<f:TextBox runat = "server" Label = "模板规格" EmptyText = "" ID = "TXT_MarkType" Readonly="true" />
<f:TextBox runat = "server" Label = "模板规格" EmptyText = "" ID = "TXT_MarkType" Readonly="true" Hidden="true" />
</Items>
</f:Toolbar>
</Items>

4
SCP/Views/锦州锦恒/SupplierData/SCP_ASN_DETAIL.aspx.cs
View File

@ -478,7 +478,7 @@ namespace SCP.锦州锦恒.SupplierData
protected void btnPrint_Click(object sender, EventArgs e)
{
string AsnBillNum = Request["AsnBillNum"];
var str = string.Format("window.open(\"../../Handlers/GenerateReport.ashx?report=SendBill&data=102&type=pdf&filename=SendBill.pdf&AsnBillNum={0}&open=\")", AsnBillNum);
var str = string.Format("window.open(\"../../../Handlers/GenerateReport.ashx?report=SendBill&data=102&type=pdf&filename=SendBill.pdf&AsnBillNum={0}&open=\")", AsnBillNum);
PageContext.RegisterStartupScript(str);
SCP_BARCODE_CONTROLLER.Save_TB_PRINT_COUNT(new TB_PRINT_COUNT() { BillNo = AsnBillNum, PrintType = (int)PrintType.ASN});
}
@ -551,7 +551,7 @@ namespace SCP.锦州锦恒.SupplierData
string AsnBillNum = Request["AsnBillNum"];
if (!string.IsNullOrEmpty(AsnBillNum))
{
var str = string.Format("window.open(\"../../Handlers/GenerateReport.ashx?report={1}&data=101&type=pdf&filename=标签.pdf&AsnBillNum={0}&open=\")", AsnBillNum, TXT_MarkType.Text);
var str = string.Format("window.open(\"../../../Handlers/GenerateReport.ashx?report={1}&data=101&type=pdf&filename=标签.pdf&AsnBillNum={0}&open=\")", AsnBillNum, TXT_MarkType.Text);
PageContext.RegisterStartupScript(str);
}
SCP_BARCODE_CONTROLLER.Save_TB_PRINT_COUNT(new TB_PRINT_COUNT() { BillNo = AsnBillNum, PrintType = (int)PrintType.BAR_CODE });

2
SCP/Views/锦州锦恒/SupplierData/SCP_SHIP_DETAIL_BARCODE.aspx.cs
View File

@ -122,7 +122,7 @@ namespace SCP.Views.锦州锦恒.SupplierData
}
}
var str = string.Format("window.open(\"../../Handlers/GenerateReport.ashx?report={1}&data=101&type=pdf&filename=标签.pdf&Barcode={0}&open=\")", string.Join("_", _ls.ToArray()), TXT_MarkType.Text);
var str = string.Format("window.open(\"../../../Handlers/GenerateReport.ashx?report={1}&data=101&type=pdf&filename=标签.pdf&Barcode={0}&open=\")", string.Join("_", _ls.ToArray()), TXT_MarkType.Text);
PageContext.RegisterStartupScript(str);
TXT_MarkType.Text = "";
}

5
SCP/default.aspx
View File

@ -111,13 +111,12 @@
for (var i = 0; obj.options.length; i++)
{
if ('0210' == obj.options[i].value) {
if ('JZ1' == obj.options[i].value) {
obj.options[i].selected = true;
_factory = document.getElementById(_factoryValue);
_factory.value = '0210';
_factory.value = 'JZ1';
}
}
}

Write Preview
Loading…
Cancel
Save