diff --git a/ZR.Admin.WebApi/Controllers/mes/wms/WmOutOrderController.cs b/ZR.Admin.WebApi/Controllers/mes/wms/WmOutOrderController.cs index d6e8284e..a70ea8c8 100644 --- a/ZR.Admin.WebApi/Controllers/mes/wms/WmOutOrderController.cs +++ b/ZR.Admin.WebApi/Controllers/mes/wms/WmOutOrderController.cs @@ -69,7 +69,10 @@ namespace ZR.Admin.WebApi.Controllers var modal = parm.ToCreate(HttpContext); var response = _WmOutOrderService.AddWmOutOrder(modal); - + if(response == null) + { + return ToResponse(new ApiResult(500, "数据存在异常请检查", "数据存在异常请检查")); + } return SUCCESS(response); } diff --git a/ZR.Service/mes/wms/WmGoodsActionService.cs b/ZR.Service/mes/wms/WmGoodsActionService.cs index ad97ae63..4461739f 100644 --- a/ZR.Service/mes/wms/WmGoodsActionService.cs +++ b/ZR.Service/mes/wms/WmGoodsActionService.cs @@ -170,9 +170,9 @@ namespace ZR.Service.Business nowProduction.GoodsNumAction = quantityCount; nowProduction.Remark = "拼箱整箱"; //TODO 20240422开会讨论结果：拼箱完需要重新扫码入库，原数据删除 - Context.Deleteable().Where(it => it.Id == nowProduction.Id).ExecuteCommand(); - Context.Deleteable().Where(it => it.Id == secondId).ExecuteCommand(); - return log; + //Context.Deleteable().Where(it => it.Id == nowProduction.Id).ExecuteCommand(); + //Context.Deleteable().Where(it => it.Id == secondId).ExecuteCommand(); + //return log; // 修改主箱 Context.Updateable(nowProduction).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommand(); // 次箱操作 @@ -302,8 +302,8 @@ namespace ZR.Service.Business }; Context.Insertable(log).ExecuteReturnEntity(); //TODO 20240422开会讨论结果：拆箱完需要重新扫码入库，原主箱数据删除 - Context.Deleteable().Where(it => it.Id == mainNowProduction.Id).ExecuteCommand(); - return log; + //Context.Deleteable().Where(it => it.Id == mainNowProduction.Id).ExecuteCommand(); + //return log; // 执行修改 // 1.主箱修改为1号分箱参数 WmGoodsNowProduction newPackage1 = mainNowProduction; diff --git a/ZR.Service/mes/wms/WmGoodsOutProductionService.cs b/ZR.Service/mes/wms/WmGoodsOutProductionService.cs index 61e4afc4..898cbf32 100644 --- a/ZR.Service/mes/wms/WmGoodsOutProductionService.cs +++ b/ZR.Service/mes/wms/WmGoodsOutProductionService.cs @@ -39,7 +39,8 @@ namespace ZR.Service.mes.wms .LeftJoin((wgo, wml) => wgo.Partnumber == wml.Partnumber) .Where(predicate.ToExpression()) .Select((wgo, wml) => new WmGoodsOutProductionDto { Description = wml.Description }, true) - .OrderBy(wml=>wml.OutTime,OrderByType.Desc) + .MergeTable() + .OrderBy(wml => wml.OutTime,OrderByType.Desc) .ToPageList(parm.PageNum, parm.PageSize,ref total); return (response,total); @@ -167,6 +168,10 @@ namespace ZR.Service.mes.wms } // 短批次号 string shortPackageCode = parm.PackageCodeClient.Split('_')[0]; + if (shortPackageCode.Length<8) + { + return "请输入至少8位批次号编码，以保证正确批次出库！"; + } List nowProductionList = Context.Queryable() .Where(it => it.PackageCodeClient.Contains(shortPackageCode)).ToList(); for (int i = 0; i < nowProductionList.Count; i++) diff --git a/ZR.Service/mes/wms/WmOutOrderService.cs b/ZR.Service/mes/wms/WmOutOrderService.cs index 8eb6a27d..aa7bd6f7 100644 --- a/ZR.Service/mes/wms/WmOutOrderService.cs +++ b/ZR.Service/mes/wms/WmOutOrderService.cs @@ -103,44 +103,52 @@ namespace ZR.Service.mes.wms /// public WmOutOrder AddWmOutOrder(WmOutOrder_materialDto model) { - string today_id = "EG" + DateTime.Now.ToString("yyMMdd"); - string last_outorder_ShipmentNum = Context.Queryable().Where(it => it.ShipmentNum.StartsWith(today_id)).Max(it => it.ShipmentNum); - if (string.IsNullOrEmpty(last_outorder_ShipmentNum)) + try { - model.ShipmentNum = today_id + "001"; - - } - else - { - int flow = int.Parse(last_outorder_ShipmentNum.Substring(last_outorder_ShipmentNum.Length - 3, 3)) + 1; - model.ShipmentNum = today_id + flow.ToString("000"); - - } - WmOutOrder wmOutOrder = model.Adapt(); - - // 关联表也要新增 - if (model.MaterialList != null) - { - if (model.MaterialList.Count > 0) + string today_id = "EG" + DateTime.Now.ToString("yyMMdd"); + string last_outorder_ShipmentNum = Context.Queryable().Where(it => it.ShipmentNum.StartsWith(today_id)).Max(it => it.ShipmentNum); + if (string.IsNullOrEmpty(last_outorder_ShipmentNum)) { - List materialOutorderList = new List(); + model.ShipmentNum = today_id + "001"; - foreach (var item in model.MaterialList) + } + else + { + int flow = int.Parse(last_outorder_ShipmentNum.Substring(last_outorder_ShipmentNum.Length - 3, 3)) + 1; + model.ShipmentNum = today_id + flow.ToString("000"); + + } + WmOutOrder wmOutOrder = model.Adapt(); + + // 关联表也要新增 + if (model.MaterialList != null) + { + if (model.MaterialList.Count > 0) { - WmMaterialOutorder materialOutorder = new WmMaterialOutorder(); - materialOutorder.FkMaterialId = item.Id; - materialOutorder.FkOutorderId = model.ShipmentNum; - materialOutorder.OuthouseNum = item.requireOutNum; - materialOutorder.CreatedBy = model.CreatedBy; - materialOutorder.CreatedTime = DateTime.Now; - materialOutorderList.Add(materialOutorder); - }; - int result = Context.Insertable(materialOutorderList).ExecuteCommand(); + List materialOutorderList = new List(); + + foreach (var item in model.MaterialList) + { + WmMaterialOutorder materialOutorder = new WmMaterialOutorder(); + materialOutorder.FkMaterialId = item.Id; + materialOutorder.FkOutorderId = model.ShipmentNum; + materialOutorder.OuthouseNum = item.requireOutNum; + materialOutorder.CreatedBy = model.CreatedBy; + materialOutorder.CreatedTime = DateTime.Now; + materialOutorderList.Add(materialOutorder); + }; + int result = Context.Insertable(materialOutorderList).ExecuteCommand(); + } + } + return Context.Insertable(wmOutOrder).ExecuteReturnEntity(); } - - return Context.Insertable(wmOutOrder).ExecuteReturnEntity(); + catch (Exception ex) + { + return null; + } + } /// /// 删除出货单关联的物料出货单