diff --git a/Vue.Net/VOL.Entity/DomainModels/WMSOUT/OP_WMS_OUT_PLAN.cs b/Vue.Net/VOL.Entity/DomainModels/WMSOUT/OP_WMS_OUT_PLAN.cs index db547f21..12cf542f 100644 --- a/Vue.Net/VOL.Entity/DomainModels/WMSOUT/OP_WMS_OUT_PLAN.cs +++ b/Vue.Net/VOL.Entity/DomainModels/WMSOUT/OP_WMS_OUT_PLAN.cs @@ -320,6 +320,6 @@ namespace VOL.Entity.DomainModels [Display(Name = "是否条件出库")] [Column(TypeName = "bit")] [Editable(true)] - public bool? ISBATCHSTOCK { get; set; } + public bool? ISBATCHSTOCK { get; set; } = false; } } diff --git a/Vue.Net/VOL.Entity/DomainModels/WMSOUT/VW_OP_WMS_OUT_PLAN.cs b/Vue.Net/VOL.Entity/DomainModels/WMSOUT/VW_OP_WMS_OUT_PLAN.cs index 7e063fad..9f2cf0b6 100644 --- a/Vue.Net/VOL.Entity/DomainModels/WMSOUT/VW_OP_WMS_OUT_PLAN.cs +++ b/Vue.Net/VOL.Entity/DomainModels/WMSOUT/VW_OP_WMS_OUT_PLAN.cs @@ -390,7 +390,7 @@ namespace VOL.Entity.DomainModels /// [Display(Name = "ISBATCHSTOCK")] [Column(TypeName = "bit")] - public bool ISBATCHSTOCK { get; set; } + public bool ISBATCHSTOCK { get; set; } = false; } } \ No newline at end of file diff --git a/Vue.Net/VOL.Entity/DomainModels/WMSOUT/VW_OP_WMS_OUT_PLANDETAIL_PHYSICS.cs b/Vue.Net/VOL.Entity/DomainModels/WMSOUT/VW_OP_WMS_OUT_PLANDETAIL_PHYSICS.cs index 7619114e..e3eee665 100644 --- a/Vue.Net/VOL.Entity/DomainModels/WMSOUT/VW_OP_WMS_OUT_PLANDETAIL_PHYSICS.cs +++ b/Vue.Net/VOL.Entity/DomainModels/WMSOUT/VW_OP_WMS_OUT_PLANDETAIL_PHYSICS.cs @@ -196,7 +196,7 @@ namespace VOL.Entity.DomainModels /// [Display(Name = "ISBATCHSTOCK")] [Column(TypeName = "bit")] - public bool? ISBATCHSTOCK { get; set; } + public bool? ISBATCHSTOCK { get; set; } = false; } } \ No newline at end of file diff --git a/Vue.Net/VOL.WMS/Services/WMSINDO/Partial/OP_WMS_IN_DOService.cs b/Vue.Net/VOL.WMS/Services/WMSINDO/Partial/OP_WMS_IN_DOService.cs index 16076c4b..1d59f6f7 100644 --- a/Vue.Net/VOL.WMS/Services/WMSINDO/Partial/OP_WMS_IN_DOService.cs +++ b/Vue.Net/VOL.WMS/Services/WMSINDO/Partial/OP_WMS_IN_DOService.cs @@ -1410,7 +1410,8 @@ namespace VOL.WMS.Services if (currhead == null || currhead.Count == 0) { return _webResponse.Error("没有找到业务"); } - if(currhead[0].BILLSTATUS != "1003") { + if(currhead[0].BILLSTATUS == "1003") { + //已审核完成 不能重复执行 return _webResponse.Error("此状态的业务不能执行此操作,请刷新后重试"); } diff --git a/Vue.Net/VOL.WMS/Services/WMSOUT/Partial/OP_WMS_OUT_PLANService.cs b/Vue.Net/VOL.WMS/Services/WMSOUT/Partial/OP_WMS_OUT_PLANService.cs index 2ca60ae6..09c193d9 100644 --- a/Vue.Net/VOL.WMS/Services/WMSOUT/Partial/OP_WMS_OUT_PLANService.cs +++ b/Vue.Net/VOL.WMS/Services/WMSOUT/Partial/OP_WMS_OUT_PLANService.cs @@ -319,6 +319,10 @@ namespace VOL.WMS.Services //保存到数据库前 AddOnExecuting = (OP_WMS_OUT_PLAN head, object obj) => { + + if (head.ISBATCHSTOCK == null) + head.ISBATCHSTOCK = false; + List PLANDetailList = tableExtra.Table1List;//.Select(s).ToList(); dealgoodsname(ref head, tableExtra.Table1List); @@ -615,6 +619,9 @@ namespace VOL.WMS.Services //保存到数据库前 UpdateOnExecuting = (OP_WMS_OUT_PLAN head, object obj, object obj2, List list) => { + if (head.ISBATCHSTOCK == null) + head.ISBATCHSTOCK = false; + if (head.ISEND == true) { return WebResponseContent.Instance.Error("已经执行完毕,禁止修改");