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

yanjinhui

9 天以前 a356468e8421332d47fb1006b4dbdac5d639bde3

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

 新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs

@@ -757,25 +757,18 @@

                foreach (var item in cabinOrders)
                {
                    if (item.Order_type == InOrderTypeEnum.Allocat.ObjToInt().ToString())
                    {
                        if (item.Details != null)
                        {
                            _cabinOrderDetailServices.Repository.DeleteAndMoveIntoHty(item.Details, OperateTypeEnum.浜哄伐瀹屾垚);
                            item.Details = null;
                        }
                    }
                    else
                    {
                        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.浜哄伐瀹屾垚);

                if (cabinOrder.Order_type == InOrderTypeEnum.Allocat.ObjToInt().ToString())
                    _unitOfWorkManage.CommitTran();
                else
                {
                var url = "http://121.37.118.63:80/GYZ2/95fck/outOrderOk";
                var requestDate = new
                {
@@ -786,6 +779,7 @@
                if (response == null) throw new Exception("涓婃姤ERP鍏ュ簱鍗曞畬鎴愬け璐ワ紒");
                if (response.resultCode != "0") throw new Exception(response.resultMsg);
                _unitOfWorkManage.CommitTran();
                }
                content.OK();
            }
            catch (Exception ex)

 新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs

@@ -996,25 +996,17 @@

                foreach (var item in deliveryOrders)
                {
                    if (item.Out_type==OutOrderTypeEnum.Allocate.ObjToInt().ToString())
                    {
                        if (item.Details!=null)
                        {
                            _deliveryOrderDetailServices.Repository.DeleteAndMoveIntoHty(item.Details, OperateTypeEnum.浜哄伐瀹屾垚);
                            item.Details =null;
                        }
                    }
                    else
                    {
                        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.浜哄伐瀹屾垚);
                }
                if (deliveryOrder.Out_type == OutOrderTypeEnum.Allocate.ObjToInt().ToString())
                    _unitOfWorkManage.CommitTran();
                else
                {
                var url = "http://121.37.118.63:80/GYZ2/95fck/outOrderOk";

                var requestDate = new
@@ -1026,6 +1018,7 @@
                if (response == null) throw new Exception("涓婃姤ERP鍑哄簱鍗曞畬鎴愬け璐ワ紒");
                if (response.resultCode != "0") throw new Exception(response.resultMsg);
                _unitOfWorkManage.CommitTran();
                }
                content.OK();
            }
            catch (Exception ex)