盟祺-按出货单出货和退回更新

Ben Lin

2024-04-18 c701f4c3a21a159e9b1efcfc6e9c4769e87b1e6f

盟祺-按出货单出货和退回更新

 Tiger.Api/Controllers/WMS/WMSController.MqSNData.cs

@@ -29,6 +29,28 @@
            }
            return Ok(response);
        }

        /// <summary>
        /// 整单退回 
        /// </summary>
        /// <param name="action"></param>
        /// <returns></returns>
        [HttpPost]
        [Route("api/[controller]/[action]")]
        public async Task<IActionResult> ReturnWhole([FromBody] ApiAction action)
        {
            ApiAction response = new();
            try
            {
                response = response.GetResponse(await DI.Resolve<IMqSNData>().ReturnWhole(action.Data?.ToString()));
            }
            catch (System.Exception ex)
            {
                response = response.GetResponse().CatchExceptionWithLog(ex);
            }
            return Ok(response);
        }

        /// <summary>
        /// 获取分页
        /// </summary>

 Tiger.Business/WMS/MengQi/Biz.Mq.SNData.cs

@@ -43,6 +43,7 @@
                        result.Message = $"退回删除条码不存在";
                        return result;
                    }
                    result.Data = data_His.DeliveryNo;
                    var db = Db;
                    var dbTran = db.UseTran(() =>
                    {
@@ -52,6 +53,49 @@
                    if (!dbTran.IsSuccess)
                    {
                        result.IsSuccessed = false; 
                        result.Message = $"退回删除条码异常";
                    }
                }
                catch (Exception ex)
                {
                    result.CatchExceptionWithLog(ex, "退回删除条码异常");
                }
                return result;
            }

            /// <summary>
            /// 整单退回
            /// </summary>
            /// <param name="deliveryNo"></param>
            /// <returns></returns>
            public async Task<ApiAction> ReturnWhole(string deliveryNo)
            {
                var result = new ApiAction();
                try
                {
                    List<SNData_His> listHis = await Db.Queryable<SNData_His>().Where(x => x.DeliveryNo == deliveryNo).ToListAsync();
                    if (listHis.Count == 0)
                    {
                        result.IsSuccessed = false;
                        result.Message = $"退回送货单[{deliveryNo}]查不到要删除的条码";
                        return result;
                    }
                    List<SNData> sndatas = await Db.Queryable<SNData>().Where(x => x.DeliveryNo == deliveryNo).ToListAsync();
                    if (sndatas.Count == 0)
                    {
                        result.IsSuccessed = false;
                        result.Message = $"退回送货单[{deliveryNo}]查不到要删除的条码";
                        return result;
                    }
                    var db = Db;
                    var dbTran = db.UseTran(() =>
                    {
                        db.Deleteable(listHis).ExecuteCommand();
                        db.Deleteable(sndatas).ExecuteCommand();
                    });
                    if (!dbTran.IsSuccess)
                    {
                        result.IsSuccessed = false;
                        result.Message = $"退回删除条码异常";
                    }
                }
@@ -79,6 +123,7 @@
                        .WhereIF(!string.IsNullOrEmpty(strTime[1]) && strTime.Length == 2, x => Convert.ToDateTime(x.ScanTime) < Convert.ToDateTime(strTime[1]))
                        .WhereIF(!string.IsNullOrEmpty(strTime[2]), x => x.ModelCode.Equals(strTime[2]))
                        .WhereIF(!string.IsNullOrEmpty(strTime[3]), x => x.CustomerCode.Equals(strTime[3]))
                        .WhereIF(!string.IsNullOrEmpty(strTime[4]), x => x.DeliveryNo.Equals(strTime[4]))
                        .ToPageListAsync(pageList.pageIndex, pageList.pageSize, total);
                    pageList.totals = total;
                }
@@ -111,6 +156,7 @@
                        .WhereIF(!string.IsNullOrEmpty(where.strStartEnd) && strTime.Length == 2, x => Convert.ToDateTime(x.ScanTime) < EndTime)
                        .WhereIF(!string.IsNullOrEmpty(where.model), x => x.ModelCode == where.model)
                        .WhereIF(!string.IsNullOrEmpty(where.customerCode), x => x.CustomerCode.Equals(where.customerCode))
                        .WhereIF(!string.IsNullOrEmpty(where.deliveryNo), x => x.DeliveryNo.Equals(where.deliveryNo))
                        .ToListAsync();
                }
                catch (Exception ex)
@@ -142,7 +188,8 @@
                        .WhereIF(!string.IsNullOrEmpty(where.strStartEnd) && strTime.Length == 2, x => Convert.ToDateTime(x.CREATE_TIME) < EndTime)
                        .WhereIF(!string.IsNullOrEmpty(where.model), x => x.ItemCode == where.model)
                        .WhereIF(!string.IsNullOrEmpty(where.customerCode), x => x.CustomerCode.Equals(where.customerCode))
                        .ToListAsync();
                        .WhereIF(!string.IsNullOrEmpty(where.deliveryNo), x => x.DeliveryNo.Equals(where.deliveryNo))
                        .OrderBy(x=>x.CREATE_TIME).OrderBy(x => x.Scanner).ToListAsync();
                }
                catch (Exception ex)
                {

 Tiger.IBusiness/WMS/MengQi/IMqSNData.cs

@@ -15,5 +15,6 @@
        public Task<ApiAction<PageAble<SNData_His>>> GetSNDataHis(PageAble<SNData_His> pageList);
        public Task<ApiAction<List<SNData_His>>> GetAllSNDataHis(SNDataWhere where);
        public Task<ApiAction<List<SNData>>> GetAllSNData(SNDataWhere where);
        public Task<ApiAction> ReturnWhole(string deliveryNo);
    }
}

 Tiger.Model.Net/Entitys/WMS/MengQi/SNData.cs

@@ -237,6 +237,18 @@
                _customercode = value;
            }
        }
        private string _DeliveryNo = null;
        public string DeliveryNo
        {
            get
            {
                return _DeliveryNo;
            }
            set
            {
                _DeliveryNo = value;
            }
        }
    }

    public class SNData_Ext

 Tiger.Model.Net/Entitys/WMS/MengQi/SNData_His.cs

@@ -104,6 +104,18 @@
                _customercode = value;
            }
        }
        private string _DeliveryNo = null;
        public string DeliveryNo
        {
            get
            {
                return _DeliveryNo;
            }
            set
            {
                _DeliveryNo = value;
            }
        }
    }

    public class SNDataWhere
@@ -111,5 +123,8 @@
        public string strStartEnd { get; set; }
        public string model { get; set; }
        public string customerCode { get; set; }
        public string deliveryNo { get; set; }
        public string custParam1 { get; set; }
        public string custParam2 { get; set; }
    }
}