Merge branch 'master' of http://115.159.85.185:8098/r/ZhiHuiQiCe/FangCangZh...

dengjunjie

10 天以前 dd05ce0fe597c0f4c9e3a02228e1b4f6188546aa

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

@@ -65,7 +65,7 @@
                // ååºåˆ—化
                var response = JsonConvert.DeserializeObject<UpstreamResponse<UpstreamOrderInfo>>(result);

                if (response.resultCode != "0")
                if (response == null || response.resultCode != "0" || requestData == null)
                {
                    // è°ƒç”¨å¼‚常接口
                    SendErrorToUpstream(1, "", response.resultMsg ?? "上游接口返回失败", "");
@@ -76,8 +76,10 @@
                {
                    return responseContent.OK("无新入库单数据");
                }
                var ordernos = response.data.Select(x => x.order_no).ToList();
                // èŽ·å–所有已存在的入库单号
                var existingOrderNos = _cabinOrderServices.Db.Queryable<Dt_CabinOrder>()
                    .Where(x => ordernos.Contains(x.Order_no))
                    .Select(x => x.Order_no)
                    .Distinct().ToList();

@@ -86,7 +88,7 @@
                    .Where(order => !existingOrderNos.Contains(order.order_no))
                    .ToList();

                if (!newOrders.Any())
                if (newOrders.Count < 1)
                {
                    return responseContent.OK("所有入库单已存在，无需新增");
                }
@@ -174,8 +176,8 @@
            var responseContent = new WebResponseContent();
            try
            {
                //var url = "http://121.37.118.63:80/GYZ2/95fck/outOrder";
                var url = "http://127.0.0.1:4523/m1/5660322-5340849-default/GYZ2/95fck/outOrder";
                var url = "http://121.37.118.63:80/GYZ2/95fck/outOrder";
                //var url = "http://127.0.0.1:4523/m1/5660322-5340849-default/GYZ2/95fck/outOrder";
                if (string.IsNullOrEmpty(SearchOutDate)) SearchOutDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
                //// è¯·æ±‚参数
                var requestData = new
@@ -198,9 +200,10 @@
                {
                    return responseContent.OK("无新出库单数据");
                }

                var ordernos = response.data.Select(x => x.order_no).ToList();
                // å·²å­˜åœ¨å‡ºåº“单号
                var existingOutOrderNos = _deliveryOrderServices.Db.Queryable<Dt_DeliveryOrder>()
                    .Where(x => ordernos.Contains(x.Out_no))
                    .Select(x => x.Out_no)
                    .Distinct().ToList();

@@ -211,7 +214,7 @@

                List<string> order_no = newOutOrders.Select(x => x.order_no).ToList();

                if (!newOutOrders.Any())
                if (newOutOrders.Count < 1)
                {
                    return responseContent.OK("所有出库单已存在，无需新增");
                }
@@ -545,19 +548,19 @@
                    if (!Orders.Where(x => x.OdrderStatus != "已完成").Any())
                    {
                        _unitOfWorkManage.BeginTran();
                        foreach (var item in Orders)
                        {
                            if (item.Details != null)
                                _cabinDetailServices.Repository.DeleteAndMoveIntoHty(item.Details, OperateTypeEnum.自动完成);
                            item.Details = null;
                        }
                        _cabinOrderServices.Repository.DeleteAndMoveIntoHty(Orders, OperateTypeEnum.自动完成);
                        // è°ƒç”¨ä¸Šæ¸¸æŽ¥å£
                        var url = "http://121.37.118.63:80/GYZ2/95fck/inOrderOk";
                        var result = HttpHelper.Post(url, new { order_no = inorder }.ToJsonString());
                        var response = JsonConvert.DeserializeObject<UpstreamOrderResponse>(result);
                        if (response.resultCode == "0")
                        {
                            foreach (var item in Orders)
                            {
                                if (item.Details != null)
                                    _cabinDetailServices.Repository.DeleteAndMoveIntoHty(item.Details, OperateTypeEnum.自动完成);
                                item.Details = null;
                            }
                            _cabinOrderServices.Repository.DeleteAndMoveIntoHty(Orders, OperateTypeEnum.自动完成);
                            // æäº¤äº‹åŠ¡
                            _unitOfWorkManage.CommitTran();
                        }
@@ -602,7 +605,7 @@
                        {
                            if (item.Details != null)
                                _deliveryOrderDetailServices.Repository.DeleteAndMoveIntoHty(item.Details, OperateTypeEnum.自动完成);
                                item.Details = null;
                            item.Details = null;
                        }
                        _deliveryOrderServices.Repository.DeleteAndMoveIntoHty(Orders, OperateTypeEnum.自动完成);
                        var url = "http://121.37.118.63:80/GYZ2/95fck/outOrderOk";