方舱智能密集库
blame | 历史 | 补丁 | 提交 | 提交对比 | 显示空白
yanjinhui
2025-10-14 ff4660980ccfe3e123df8d5fa820266784625c74 
 ´úÂë¹ÜÀí/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs


@@ -81,7 +81,7 @@


                            Account_time = outorder.account_time,


                            OutStatus= "未完成",


                        };


                        var outorderId = Db.Insertable(entityOrder).ExecuteReturnIdentity();


                        var outorderId = BaseDal.Db.Insertable(entityOrder).ExecuteReturnIdentity();




                        // æ’入出库单明细


                        var detailEntities = outorder.details.Select(d => new Dt_DeliveryOrderDetail


@@ -93,7 +93,7 @@


                            Exp_date = d.exp_date,


                            OotDetailStatus="新建"


                        }).ToList();


                        Db.Insertable(detailEntities).ExecuteCommand();


                        BaseDal.Db.Insertable(detailEntities).ExecuteCommand();


                    }


                    catch (Exception ex)


                    {


@@ -123,7 +123,7 @@


            try


            {


                // 1. æŸ¥è¯¢ç¬¦åˆæ¡ä»¶çš„订单（表头=新建 && åŒ…含有效明细）


                var outOrders = Db.Queryable<Dt_DeliveryOrder>()


                var outOrders = BaseDal.Db.CopyNew().Queryable<Dt_DeliveryOrder>()


                    .Where(o => o.OutStatus == "新建")


                    .Includes(o => o.Details, d => d.MedicineGoods)


                    .ToList();


@@ -177,13 +177,13 @@


                        if (resp != null && resp.code == "0")


                        {


                            // æ›´æ–°è¡¨å¤´çŠ¶æ€


                            Db.Updateable<Dt_DeliveryOrder>()


                            BaseDal.Db.Updateable<Dt_DeliveryOrder>()


                              .SetColumns(o => new Dt_DeliveryOrder { OutStatus = "开始" })


                              .Where(o => o.Id == order.Id)


                              .ExecuteCommand();




                            // æ›´æ–°æ˜Žç»†çŠ¶æ€


                            Db.Updateable<Dt_DeliveryOrderDetail>()


                            BaseDal.Db.Updateable<Dt_DeliveryOrderDetail>()


                              .SetColumns(d => new Dt_DeliveryOrderDetail { Status = 1,OotDetailStatus="已完成" })


                              .Where(d => d.DeliveryOrderId == order.Id && d.Status == 0)


                              .ExecuteCommand();


@@ -237,7 +237,7 @@


                    return responseContent.Error(response.resultMsg ?? "上游接口返回失败");


                }


                //先查头表


                var outOerd=Db.Queryable<Dt_DeliveryOrder>()


                var outOerd= BaseDal.Db.Queryable<Dt_DeliveryOrder>()


                    .Where(o => o.Out_no == out_no)


                    .First();


                if (outOerd == null)


@@ -245,11 +245,11 @@


                    return responseContent.Error($"没有找到该出库单号{out_no}");


                }


                //查找所有明细表是否都已完成


                var incompleteDetails = Db.Queryable<Dt_DeliveryOrderDetail>()


                var incompleteDetails = BaseDal.Db.Queryable<Dt_DeliveryOrderDetail>()


                    .Where(d => d.DeliveryOrderId == outOerd.Id && d.OotDetailStatus == "已完成")


                    .ToList();  


                // æ›´æ–°å‡ºåº“单状态


                Db.Updateable<Dt_DeliveryOrder>()


                BaseDal.Db.Updateable<Dt_DeliveryOrder>()


                  .SetColumns(o => new Dt_DeliveryOrder { OutStatus = "已完成" })


                  .Where(o => o.Out_no == out_no)


                  .ExecuteCommand();