diff --git a/北京北汽/Controller/SCP_DC_UNI_CONTROLLER.cs b/北京北汽/Controller/SCP_DC_UNI_CONTROLLER.cs
index ddf40a6..f9bca4d 100644
--- a/北京北汽/Controller/SCP_DC_UNI_CONTROLLER.cs
+++ b/北京北汽/Controller/SCP_DC_UNI_CONTROLLER.cs
@@ -244,7 +244,7 @@ namespace CK.SCP.Controller
q = q.Where(p => p.TaskState==p_entity.TaskState);
_ret.State = ReturnStatus.Succeed;
- _ret.Result = q.OrderBy(p => p.CreateTime).ToList();
+ _ret.Result = q.ToList();
}
}
catch (Exception e)
@@ -405,7 +405,8 @@ namespace CK.SCP.Controller
DataCenterContext dc = EntitiesFactory.CreateDataCenterInstance();
AppBoxContext authdb = EntitiesFactory.CreateAppBoxInstance();
using (var scope =
- new TransactionScope(TransactionScopeOption.Required, new TransactionOptions()
+ new TransactionScope(TransactionScopeOption.Suppress, new TransactionOptions()
+ //new TransactionScope(TransactionScopeOption.Required, new TransactionOptions()
{
IsolationLevel = System.Transactions.IsolationLevel.Serializable,
Timeout = new TimeSpan(0, 20, 0)
@@ -479,6 +480,16 @@ namespace CK.SCP.Controller
EntitiesFactory.SaveDb(dc);
scope.Complete();
break;
+ // 作废asn单
+ case "TED_SCRAPASN":
+ result = UpApAsn(db, scpdb, _task);
+ result.Message = _task.TaskID.ToString();
+ Update_TEA_TASK_SUB(db, _task);
+ scpdb.BulkSaveChanges();
+ db.BulkSaveChanges();
+ dc.BulkSaveChanges();
+ scope.Complete();
+ break;
//case "TES_SITE":
// result = UpdateFactory(db, scpdb, appscpdb, _task);
// break;
@@ -3678,6 +3689,58 @@ namespace CK.SCP.Controller
}
return _ret;
}
+
+ ///
+ /// 作废发货单
+ ///
+ ///
+ ///
+ ///
+ ///
+ public static ResultObject UpApAsn(ExchangeCenterContext db, ScpEntities scpdb, TEA_TASK_SUB p_entity)
+ {
+ ResultObject _ret = new ResultObject();
+ try
+ {
+ var _SCPAPASNlist = db.TED_SCRAPASN.Where(p => p.TaskID == p_entity.TaskID && string.IsNullOrEmpty(p.Remark)).ToList();
+ var Asnlist = new List();
+ var AsnDetailslist = new List();
+ foreach (var asn in _SCPAPASNlist)
+ {
+ TB_ASN b_ASN = new TB_ASN();
+ b_ASN = scpdb.TB_ASN.FirstOrDefault(q => q.SubSite == "BJ02" && q.AsnBillNum == asn.BillNum);
+ b_ASN.Reason = asn.Reason;
+ b_ASN.State = (int)AskState.Reject;
+ b_ASN.IsDeleted = true;
+ List asn_details = scpdb.TB_ASN_DETAIL.Where(q => q.AsnBillNum == asn.BillNum).ToList();
+ if (asn_details != null)
+ {
+ asn_details.ForEach(itm => {
+ itm.IsDeleted = true;
+ itm.State = (int)AskState.Reject;
+ });
+ AsnDetailslist.AddRange(asn_details);
+ }
+ Asnlist.Add(b_ASN);
+ asn.Remark = "SCPREAD";
+
+ }
+ scpdb.TB_ASN.BulkUpdate(Asnlist);
+ scpdb.TB_ASN_DETAIL.BulkUpdate(AsnDetailslist);
+ db.TED_SCRAPASN.BulkUpdate(_SCPAPASNlist);
+ _ret.State = ReturnStatus.Succeed;
+ _ret.MessageList.Add(string.Format("更新表{0}任务ID{1}成功!", "TED_SCPAPASN", p_entity.TaskID));
+ }
+ catch (Exception e)
+ {
+ _ret.State = ReturnStatus.Failed;
+ LogHelper.Writlog(LogHelper.LogType.Error, typeof(TEA_TASK_SUB), "UpApAsn", e.Message);
+ _ret.Result = false;
+ _ret.ErrorList.Add(e);
+ throw e;
+ }
+ return _ret;
+ }
}
}
diff --git a/北京北汽/Models/CK.SCP.Models.csproj b/北京北汽/Models/CK.SCP.Models.csproj
index f3a81e4..38f8b36 100644
--- a/北京北汽/Models/CK.SCP.Models.csproj
+++ b/北京北汽/Models/CK.SCP.Models.csproj
@@ -311,6 +311,7 @@
+
diff --git a/北京北汽/Models/ExchangeCenterContext.cs b/北京北汽/Models/ExchangeCenterContext.cs
index 8efd38b..583ecfc 100644
--- a/北京北汽/Models/ExchangeCenterContext.cs
+++ b/北京北汽/Models/ExchangeCenterContext.cs
@@ -101,8 +101,8 @@ namespace CK.SCP.Models
public virtual DbSet TED_SO_MSTR { get; set; }
public virtual DbSet TED_KANBAN_MSTR { get; set; }
public virtual DbSet TED_KANBAN_DET { get; set; }
-
+ public virtual DbSet TED_SCRAPASN { get; set; }
protected override void OnModelCreating(DbModelBuilder modelBuilder)
{
base.OnModelCreating(modelBuilder);
diff --git a/北京北汽/Models/ExchangeCenterTables/TED_SCPAPASN.cs b/北京北汽/Models/ExchangeCenterTables/TED_SCPAPASN.cs
new file mode 100644
index 0000000..fbe7522
--- /dev/null
+++ b/北京北汽/Models/ExchangeCenterTables/TED_SCPAPASN.cs
@@ -0,0 +1,34 @@
+using System;
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using CK.SCP.Models.Base;
+using CK.SCP.Models.Enums;
+
+namespace CK.SCP.Models.ExchangeCenterTables
+{
+ [Description("ASNϱ")]
+ public class TED_SCRAPASN
+ {
+ [Key]
+ [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+ public long UID { get; set; }
+
+ [Description("")]
+ public Guid TaskID { get; set; }
+ [DisplayName("ASN")]
+ public string BillNum { get; set; }
+
+ [DisplayName("ʱ")]
+ public DateTime Otime { get; set; }
+
+ [DisplayName("Ա")]
+ public string OperName { get; set; }
+
+ [DisplayName("ԭ")]
+ public string Reason { get; set; }
+
+ [DisplayName("ע")]
+ public string Remark { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/北京北汽/Models/ScpEntity/TB_ASN.cs b/北京北汽/Models/ScpEntity/TB_ASN.cs
index 6d4e95e..3a04693 100644
--- a/北京北汽/Models/ScpEntity/TB_ASN.cs
+++ b/北京北汽/Models/ScpEntity/TB_ASN.cs
@@ -106,5 +106,6 @@ namespace CK.SCP.Models.ScpEntity
public string Extend1 { get; set; }
public string Extend2{ get; set; }
public string Extend3 { get; set; }
+ public string Reason { get; set; }
}
}
diff --git a/北京北汽/Models/ScpEntity/V_TB_ASN.cs b/北京北汽/Models/ScpEntity/V_TB_ASN.cs
index 478f2b2..3c8069c 100644
--- a/北京北汽/Models/ScpEntity/V_TB_ASN.cs
+++ b/北京北汽/Models/ScpEntity/V_TB_ASN.cs
@@ -11,6 +11,7 @@ namespace CK.SCP.Models.ScpEntity
{
using System;
using System.Collections.Generic;
+using System.ComponentModel;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
@@ -65,7 +66,11 @@ namespace CK.SCP.Models.ScpEntity
public string ReceivedPort { get; set; }
public string SubSite { get; set; }
-
+
+ [Description("原因")]
+ public string Reason { get; set; }
+
+
}
}
diff --git a/北京北汽/SCP/Views/SupplierData/SCP_ASN.aspx b/北京北汽/SCP/Views/SupplierData/SCP_ASN.aspx
index 37a9de0..f1ff991 100644
--- a/北京北汽/SCP/Views/SupplierData/SCP_ASN.aspx
+++ b/北京北汽/SCP/Views/SupplierData/SCP_ASN.aspx
@@ -62,6 +62,13 @@
+
+
+
+
+
+
+
@@ -118,6 +125,7 @@
+
diff --git a/北京北汽/SCP/Views/SupplierData/SCP_ASN.aspx.cs b/北京北汽/SCP/Views/SupplierData/SCP_ASN.aspx.cs
index 47660c2..b4e534a 100644
--- a/北京北汽/SCP/Views/SupplierData/SCP_ASN.aspx.cs
+++ b/北京北汽/SCP/Views/SupplierData/SCP_ASN.aspx.cs
@@ -61,6 +61,14 @@ namespace SCP.SupplierData
_entity.AskBillNum = TXT_ASK.Text;
_entity.UserInVendIds = CurrentUser.VenderList;
_entity.UserInAddress = CurrentUser.FactoryList;
+ if (!string.IsNullOrEmpty(DropDownList1.SelectedValue))
+ {
+ _entity.State = int.Parse(DropDownList1.SelectedValue);
+ if (_entity.State == -1)
+ {
+ _entity.IsDeleted = true;
+ }
+ }
SCP_ASN_CONTROLLER.Get_V_TB_ASN_List(_entity, (_ret) => {
if (_ret.State == ReturnStatus.Succeed)
{
@@ -80,7 +88,7 @@ namespace SCP.SupplierData
{
List _ls = new List();
SearchV_TB_ASN(rs => {
- _ls=rs.Select(p => p.AsnBillNum).ToList();
+ _ls=rs.Where(q=> q.IsDeleted == false).Select(p => p.AsnBillNum).ToList();
if (_ls.Count == 0)
{
Alert.Show(GetResourceKey("无导出记录!"));
diff --git a/北京北汽/SCP/Views/SupplierData/SCP_ASN.aspx.designer.cs b/北京北汽/SCP/Views/SupplierData/SCP_ASN.aspx.designer.cs
index e2603e5..7ddadc9 100644
--- a/北京北汽/SCP/Views/SupplierData/SCP_ASN.aspx.designer.cs
+++ b/北京北汽/SCP/Views/SupplierData/SCP_ASN.aspx.designer.cs
@@ -176,6 +176,15 @@ namespace SCP.SupplierData
///
protected global::FineUI.TextBox txtPO;
+ ///
+ /// DropDownList1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUI.DropDownList DropDownList1;
+
///
/// FormRow_3 控件。
///