优化退货代码

yanjinhui

2025-11-10 a372b271c01f5ad0491c74b7e9fd4a078ad526cc

优化退货代码

 н¨Îļþ¼Ð/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/Business.cs

@@ -214,6 +214,7 @@
                var url = "http://121.37.118.63:80/GYZ2/95fck/inOrderOk";
                foreach (var item in Orders.GroupBy(x => x.Order_no))
                {
                    //只有当该订单号下的所有记录都是"已完成"状态时，才继续处理
                    if (!item.Where(x => x.OdrderStatus != "已完成").Any())
                    {
                        if (item.First().Order_type == InOrderTypeEnum.Allocat.ObjToInt().ToString())
@@ -293,7 +294,7 @@
                        }
                        else
                        {
                            if (item.First().Out_type == "3") url = "http://121.37.118.63:80/GYZ2/95fck/inOrderOk";//入库退货
                            if (item.First().Out_type == "3") url = "http://121.37.118.63:80/GYZ2/95fck/inOrderOk";//入库退货 å‡ºåº“单
                            var result = HttpHelper.Post(url, new { order_no = item.Key }.ToJsonString());
                            var response = JsonConvert.DeserializeObject<UpstreamOrderResponse>(result);
                            if (response != null && response.resultCode == "0")
@@ -327,5 +328,6 @@
            }
        }
        #endregion
      
    }
}

 н¨Îļþ¼Ð/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs

@@ -1489,7 +1489,17 @@
                    materielInfo.Business_qty -= supplyTask.StockQuantity;
                    if (materielInfo.Business_qty < materielInfo.MinQty)
                    {
                        CreateAllocatInOut(materielInfo);//创建调拨任务
                        var result = CreateAllocatInOut(materielInfo); // åˆ›å»ºè°ƒæ‹¨ä»»åŠ¡
                        if (!result.Status)
                        {
                            // è°ƒæ‹¨ä»»åŠ¡åˆ›å»ºå¤±è´¥ï¼Œä½†ä»ç„¶è¦æ›´æ–°ç‰©æ–™ä¿¡æ¯
                            _materielInfoService.UpdateData(materielInfo);
                            // å¯ä»¥é€‰æ‹©è®°å½•æ—¥å¿—或添加提示信息
                            _messageInfoService.AddMessageInfo(MessageGroupByEnum.InventoryLowAlarm,
                                $"调拨任务创建失败",
                                $"物料{materielInfo.MaterielCode}业务库存已更新，但调拨任务创建失败: {result.Message}");
                        }
                        // å¦‚果成功，物料信息已经在 CreateAllocatInOut å†…部更新了
                    }
                    else
                    {

 н¨Îļþ¼Ð/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/NewBusiness.cs

@@ -239,7 +239,7 @@
                        else if (order.order_type == "3")//入库退料
                        {
                            #region è½¬æ¢ä¸ºå‡ºåº“单
                            UpstramOutOrderInfo upstramOutOrderInfo = new UpstramOutOrderInfo()
                             UpstramOutOrderInfo upstramOutOrderInfo = new UpstramOutOrderInfo()
                            {
                                order_no = order.order_no,
                                order_type = order.order_type,
@@ -255,7 +255,7 @@
                                {
                                    batch_num = item.batch_num,
                                    goods_no = item.goods_no,
                                    order_qty = item.order_qty,
                                    order_qty = Math.Abs(item.order_qty),
                                    exp_date = item.exp_date,
                                };
                                upstramOutOrderInfo.details.Add(detail);

 н¨Îļþ¼Ð/WIDESEA_WMSServer/WIDESEA_WMSServer/InOrderJob.cs

@@ -14,15 +14,26 @@
            _materielInfoService = materielInfoService;
        }
        //每隔1秒执行一次
        [Invoke(Begin = "2025-11-01", Interval = 1000 * 5, IsEnabled = true, SkipWhileExecuting = true)]
        [Invoke(Begin = "2025-11-01", Interval = 1000 * 18, IsEnabled = true, SkipWhileExecuting = true)]
        public void Run()
        {
            _materielInfoService.GetMedicineGoodsInfom();
            Thread.Sleep(1000);
            _business.GetInOrder();
            Thread.Sleep(1000);
            _business.GetOutOrder();
            Thread.Sleep(1000);
            _business.CompleteAllOrders();
            Thread.Sleep(1000);
            _business.CompleteAllOutOrders();
            Thread.Sleep(1000);
            Console.WriteLine($"ERP任务执行结束：{DateTime.Now}");
            _materielInfoService.ProductSynchronous();
            Thread.Sleep(1000);
            _business.EdiIn();
            Thread.Sleep(1000);
            _business.EdiOut();
            Console.WriteLine($"WCS任务执行结束：{DateTime.Now}");
        }
    }
}

 н¨Îļþ¼Ð/WIDESEA_WMSServer/WIDESEA_WMSServer/OutOrderJob.cs

@@ -14,15 +14,15 @@
            _materielInfoService = materielInfoService;
        }
        //每隔1秒执行一次
        [Invoke(Begin = "2025-11-01", Interval = 1000 * 5, IsEnabled = true, SkipWhileExecuting = true)]
        [Invoke(Begin = "2025-11-01", Interval = 1000 * 5, IsEnabled = false, SkipWhileExecuting = true)]
        public void Run()
        {
            Thread.Sleep(3000);
            //获取上游出库单数据
            _materielInfoService.ProductSynchronous();
            _business.EdiIn();
            _business.EdiOut();
            Console.WriteLine($"WCS任务执行结束：{DateTime.Now}");
            //Thread.Sleep(3000);
            ////获取上游出库单数据
            //_materielInfoService.ProductSynchronous();
            //_business.EdiIn();
            //_business.EdiOut();
            //Console.WriteLine($"WCS任务执行结束：{DateTime.Now}");
        }
    }
}