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

yanjinhui

2025-10-27 92e1560e29419d855c9e23b31c11ef261d391e45

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

 .gitignore

@@ -258,3 +258,4 @@
*.bin
*.2
*.2
/新建文件夹/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/HierarchyCache.v1.txt

 н¨Îļþ¼Ð/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/HierarchyCache.v1.txt

Binary files differ

 н¨Îļþ¼Ð/WIDESEA_WMSServer/WIDESEA_ISquareCabinServices/ICabinOrderServices.cs

@@ -19,5 +19,11 @@
        WebResponseContent FeedbackIn(SaveModel saveModel);
        WebResponseContent CreateInboundOrder(OrderDto.UpstreamOrderInfo order);
        WebResponseContent CreateCheckInOrder(OrderDto.UpstreamOrderInfo order);
        /// <summary>
        /// å®Œæˆå…¥åº“单
        /// </summary>
        /// <param name="key"></param>
        /// <returns></returns>
        WebResponseContent FinishInOrder(int key);
    }
}

 н¨Îļþ¼Ð/WIDESEA_WMSServer/WIDESEA_ISquareCabinServices/IDeliveryOrderServices.cs

@@ -50,8 +50,12 @@
        /// <param name="saveModel"></param>
        /// <returns></returns>
        WebResponseContent GetCheckOrders(SaveModel saveModel);


        /// <summary>
        /// å®Œæˆå‡ºåº“单
        /// </summary>
        /// <param name="key"></param>
        /// <returns></returns>
        WebResponseContent FinishOutOrder(int key);

        /// <summary>
        /// å®Œæˆç›˜ç‚¹ä»»åŠ¡

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

@@ -545,11 +545,13 @@
                    if (!Orders.Where(x => x.OdrderStatus != "已完成").Any())
                    {
                        _unitOfWorkManage.BeginTran();
                        _cabinOrderServices.Repository.DeleteAndMoveIntoHty(Orders, OperateTypeEnum.自动完成);
                        foreach (var item in Orders)
                        {
                            _cabinDetailServices.Repository.DeleteAndMoveIntoHty(item.Details, OperateTypeEnum.自动完成);
                            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());
@@ -596,11 +598,13 @@
                    if (!Orders.Where(x => x.OutStatus != "已完成").Any())
                    {
                        _unitOfWorkManage.BeginTran();
                        _deliveryOrderServices.Repository.DeleteAndMoveIntoHty(Orders, OperateTypeEnum.自动完成);
                        foreach (var item in Orders)
                        {
                            _deliveryOrderDetailServices.Repository.DeleteAndMoveIntoHty(item.Details, OperateTypeEnum.自动完成);
                            if (item.Details != null)
                                _deliveryOrderDetailServices.Repository.DeleteAndMoveIntoHty(item.Details, OperateTypeEnum.自动完成);
                            item.Details = null;
                        }
                        _deliveryOrderServices.Repository.DeleteAndMoveIntoHty(Orders, OperateTypeEnum.自动完成);
                        var url = "http://121.37.118.63:80/GYZ2/95fck/outOrderOk";
                        var requestDate = new
                        {

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

@@ -738,5 +738,42 @@
            return content;
        }
        #endregion

        public WebResponseContent FinishInOrder(int key)
        {
            WebResponseContent content = new WebResponseContent();
            try
            {
                Dt_CabinOrder cabinOrder = BaseDal.QueryFirst(x => x.Id == key);
                List<Dt_CabinOrder> cabinOrders = Db.Queryable<Dt_CabinOrder>().Where(x => x.Order_no == cabinOrder.Order_no).Includes(x => x.Details).ToList();//找出所有出库单号相同的出库单
                _unitOfWorkManage.BeginTran();
                foreach (var item in cabinOrders)
                {
                    if (item.Details != null)
                        _cabinOrderDetailServices.Repository.DeleteAndMoveIntoHty(item.Details, OperateTypeEnum.人工完成);
                    item.Modifier = App.User.UserName;
                    item.ModifyDate = DateTime.Now;
                    item.Details = null;
                }
                BaseDal.DeleteAndMoveIntoHty(cabinOrders, OperateTypeEnum.人工完成);
                var url = "http://121.37.118.63:80/GYZ2/95fck/outOrderOk";
                var requestDate = new
                {
                    order_no = cabinOrder.Order_no
                };
                var result = HttpHelper.Post(url, requestDate.ToJsonString());
                var response = JsonConvert.DeserializeObject<UpstreamOrderResponse>(result);
                if (response == null) throw new Exception("上报ERP入库单完成失败！");
                if (response.resultCode != "0") throw new Exception(response.resultMsg);
                _unitOfWorkManage.CommitTran();
                content.OK();
            }
            catch (Exception ex)
            {
                _unitOfWorkManage.RollbackTran();
                content.Error(ex.Message);
            }
            return content;
        }
    }
}

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

@@ -970,5 +970,42 @@
            }
            return content;
        }

        public WebResponseContent FinishOutOrder(int key)
        {
            WebResponseContent content = new WebResponseContent();
            try
            {
                Dt_DeliveryOrder deliveryOrder = BaseDal.QueryFirst(x => x.Id == key);
                List<Dt_DeliveryOrder> deliveryOrders = Db.Queryable<Dt_DeliveryOrder>().Where(x => x.Out_no == deliveryOrder.Out_no).Includes(x => x.Details).ToList();//找出所有出库单号相同的出库单
                _unitOfWorkManage.BeginTran();
                foreach (var item in deliveryOrders)
                {
                    if (item.Details != null)
                        _deliveryOrderDetailServices.Repository.DeleteAndMoveIntoHty(item.Details, OperateTypeEnum.人工完成);
                    item.Modifier = App.User.UserName;
                    item.ModifyDate = DateTime.Now;
                    item.Details = null;
                }
                BaseDal.DeleteAndMoveIntoHty(deliveryOrders, OperateTypeEnum.人工完成);
                var url = "http://121.37.118.63:80/GYZ2/95fck/outOrderOk";
                var requestDate = new
                {
                    order_no = deliveryOrder.Out_no
                };
                var result = HttpHelper.Post(url, requestDate.ToJsonString());
                var response = JsonConvert.DeserializeObject<UpstreamOrderResponse>(result);
                if (response == null) throw new Exception("上报ERP出库单完成失败！");
                if (response.resultCode != "0") throw new Exception(response.resultMsg);
                _unitOfWorkManage.CommitTran();
                content.OK();
            }
            catch (Exception ex)
            {
                _unitOfWorkManage.RollbackTran();
                content.Error(ex.Message);
            }
            return content;
        }
    }
}

 н¨Îļþ¼Ð/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/SquareCabin/CabinOrderController.cs

@@ -15,7 +15,16 @@
        public CabinOrderController(ICabinOrderServices service) : base(service)
        {
        }

        /// <summary>
        /// å®Œæˆå…¥åº“单
        /// </summary>
        /// <param name="keys"></param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("FinishInOrder")]
        public WebResponseContent FinishInOrder(int key)
        {
            return Service.FinishInOrder(key);
        }
        /// æŸ¥è¯¢å•ä¿¡æ¯
        /// </summary>
        /// <returns></returns>

 н¨Îļþ¼Ð/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/SquareCabin/DeliveryOrderController.cs

@@ -15,7 +15,16 @@
        public DeliveryOrderController(IDeliveryOrderServices service) : base(service)
        {
        }

        /// <summary>
        /// å®Œæˆå‡ºåº“单
        /// </summary>
        /// <param name="keys"></param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("FinishOutOrder")]
        public WebResponseContent FinishOutOrder(int key)
        {
            return Service.FinishOutOrder(key);
        }

        /// <summary>
        /// åˆ›å»ºç›˜ç‚¹ä»»åŠ¡
@@ -23,7 +32,7 @@
        /// <param name="keys"></param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("CreateCheckOrder")]
        public WebResponseContent CreateCheckOrder([FromBody]int[] keys)
        public WebResponseContent CreateCheckOrder([FromBody] int[] keys)
        {
            return Service.CreateCheckOrder(keys);
        }
@@ -55,7 +64,7 @@
        [HttpPost, HttpGet, Route("GetDeliveryOrderDetail")]
        public WebResponseContent GetDeliveryOrderDetail(int pageNo, string orderNo, bool isPick)
        {
            return Service.GetDeliveryOrderDetail(pageNo, orderNo,isPick);
            return Service.GetDeliveryOrderDetail(pageNo, orderNo, isPick);
        }
        /// <summary>
        /// å®Œæˆç›˜ç‚¹ä»»åŠ¡
@@ -99,6 +108,6 @@
            return Service.InventoryGood(batchNo, goodsNo);
        }

       

    }
}