Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

hutongqing

2024-12-28 04a831b2a945b9b6bcb659038a6fed1d3148e3ce

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/ReceiveOrderService.cs

@@ -95,7 +95,7 @@
                {
                    return WebResponseContent.Instance.Error($"未找到收货单");
                }
                if (receiveOrder.ReceiveOrderStatus==ReceiveOrderStatusEnum.Completed.ObjToInt())
                if (receiveOrder.ReceiveOrderStatus == ReceiveOrderStatusEnum.Completed.ObjToInt())
                {
                    return WebResponseContent.Instance.Error($"收货单已完成");
                }
@@ -126,7 +126,7 @@
                        Serno = item.RowNo,
                        Supplotno = "",
                        Taxrate = "",
                        

                    };
                    recevieOrderDetails.Add(recevieOrderDetail);
                }
@@ -142,7 +142,7 @@
                    ReceiveDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
                    PlantsId = "HA02",
                    SuppliersId = receiveOrder.SuppliersId,
                    Type = Enum.GetName(typeof(ReceiveOrderTypeEnum),receiveOrder.ReceiveOrderType),
                    Type = Enum.GetName(typeof(ReceiveOrderTypeEnum), receiveOrder.ReceiveOrderType),
                    UniqueTag = receiveOrder.ReceiveOrderId.ToString(),
                    WarehouseCode = warehouse.WarehouseCode,
                    Way = 1,
@@ -150,8 +150,8 @@
                };
                //收货推送至ERP
                string Content = _invokeERPService.InvokeMatReceiveApi(receiveModel);
                ErpRequestContent erpRequest=Content.DeserializeObject<ErpRequestContent>();
                if (erpRequest.res==0)
                ErpRequestContent erpRequest = Content.DeserializeObject<ErpRequestContent>();
                if (erpRequest.res == 0)
                {
                    return WebResponseContent.Instance.Error(erpRequest.Data);
                }
@@ -173,15 +173,16 @@
            try
            {
                int pageNo = saveModel.MainData["pageNo"].ObjToInt();
                int warehouseId = saveModel.MainData["warehouseId"].ObjToInt();
                string orderNo = saveModel.MainData["orderNo"].ToString();
                List<Dt_ReceiveOrder> dt_ReceiveOrders = new List<Dt_ReceiveOrder>();
                if (string.IsNullOrEmpty(orderNo))
                {
                    dt_ReceiveOrders = Db.Queryable<Dt_ReceiveOrder>().Where(x => x.ReceiveOrderStatus < ReceiveOrderStatusEnum.Completed.ObjToInt()).ToPageList(pageNo, 5);
                    dt_ReceiveOrders = Db.Queryable<Dt_ReceiveOrder>().Where(x => x.ReceiveOrderStatus < ReceiveOrderStatusEnum.Completed.ObjToInt() && x.WarehouseId == warehouseId).ToPageList(pageNo, 5);
                }
                else
                {
                    dt_ReceiveOrders = Db.Queryable<Dt_ReceiveOrder>().Where(x => (x.ReceiveOrderNo.Contains(orderNo) || x.SuppliersId.Contains(orderNo)) && x.ReceiveOrderStatus < ReceiveOrderStatusEnum.Completed.ObjToInt()).ToPageList(pageNo, 5);
                    dt_ReceiveOrders = Db.Queryable<Dt_ReceiveOrder>().Where(x => (x.ReceiveOrderNo.Contains(orderNo) || x.SuppliersId.Contains(orderNo)) && x.ReceiveOrderStatus < ReceiveOrderStatusEnum.Completed.ObjToInt() && x.WarehouseId == warehouseId).ToPageList(pageNo, 5);
                }

                content.OK(data: dt_ReceiveOrders);
@@ -230,7 +231,7 @@

                Dt_InboundOrder inboundOrder = new Dt_InboundOrder()
                {
                    InboundOrderNo="TestInboundNo21",//测试
                    InboundOrderNo = "TestInboundNo21",//测试
                    UpperOrderNo = receiveOrder.ReceiveOrderNo,
                    CreateType = OrderCreateTypeEnum.UpperSystemPush.ObjToInt(),
                    OrderStatus = InOrderStatusEnum.未开始.ObjToInt(),
@@ -352,7 +353,7 @@
                    }
                    receiveOrder = new Dt_ReceiveOrder()
                    {
                        ReceiveOrderNo= "TestReceiveOrderNo21",//测试
                        ReceiveOrderNo = "TestReceiveOrderNo21",//测试
                        ReceiveOrderStatus = ReceiveOrderStatusEnum.Receiving.ObjToInt(),
                        CustomerId = "",
                        DeliveryCode = "/",