н¨Îļþ¼Ð/WIDESEA_WMSServer/ClassLibrary2/ContainerService.cs

@@ -41,6 +41,7 @@
                if (response == null || response.code != "000") throw new Exception("接口返回数据报错");
                var deviceNames = response.data.Select(x => x.name?.Trim()).Distinct().ToList();
                var containers = BaseDal.QueryData(x => deviceNames.Contains(x.deviceName)).ToList();
                if (containers == null || containers.Count < 1) return WebResponseContent.Instance.Error();
                List<Dt_Container> containersAdd = new List<Dt_Container>();
                List<Dt_Container> containersUp = new List<Dt_Container>();
                foreach (var item in response.data)
@@ -117,7 +118,7 @@
                        cool.AlarmInformation = item.message;
                        cool.ModifyDate = currentTime;
                        updateList.Add(cool);
                        if (cool.Alarm!="正常")
                        if (cool.Alarm != "正常")
                        {
                            _messageInfoService.AddMessageInfo(MessageGroupByEnum.EquipmentAlarm, $"冷柜{item.alarm}", item.message, MessageStatusEnum.Undisposed);
                        }

 н¨Îļþ¼Ð/WIDESEA_WMSServer/ClassLibrary2/EquipmentAlarmInforService.cs

@@ -50,6 +50,7 @@

                if (codes.Count < 1) return content;
                List<Dt_EquipmentAlarmInfor> equipmentAlarmInfors = BaseDal.QueryData(x => codes.Contains(x.RobotCode));
                if (equipmentAlarmInfors.Count < 1) return content;
                List<Dt_EquipmentAlarmInfor> equipmentAlarmInforsAdd = new List<Dt_EquipmentAlarmInfor>();
                List<Dt_EquipmentAlarmInfor> equipmentAlarmInforsUp = new List<Dt_EquipmentAlarmInfor>();
                foreach (var item in response.data.robot)
@@ -76,7 +77,7 @@
                    }
                    if (string.Equals(item.status, nameof(DeviceStatus.Error), StringComparison.OrdinalIgnoreCase))
                    {
                        _messageInfoService.AddMessageInfo(MessageGroupByEnum.EquipmentAlarm,"小车编号"+ item.robotCode, item.status);
                        _messageInfoService.AddMessageInfo(MessageGroupByEnum.EquipmentAlarm, "小车编号" + item.robotCode, item.status);
                    }
                }
                foreach (var item in response.data.sorters)
@@ -103,7 +104,7 @@
                    }
                    if (string.Equals(item.status, nameof(DeviceStatus.Error), StringComparison.OrdinalIgnoreCase))
                    {
                        _messageInfoService.AddMessageInfo(MessageGroupByEnum.EquipmentAlarm, "分拣台名字"+ item.sorterCode, item.status);
                        _messageInfoService.AddMessageInfo(MessageGroupByEnum.EquipmentAlarm, "分拣台名字" + item.sorterCode, item.status);
                    }
                }
                if (equipmentAlarmInforsAdd.Count > 0) BaseDal.AddData(equipmentAlarmInforsAdd);
@@ -116,6 +117,6 @@
            return content;
        }

    

    }
}

 н¨Îļþ¼Ð/WIDESEA_WMSServer/ClassLibrary2/InventoryInfoService.cs

@@ -38,33 +38,30 @@
                List<object> lists = new List<object>();
                #region å†·å†»åº“
                string WareCodeLD = WarehouseEnum.冷冻库.ObjToInt().ToString("000");
                List<Dt_InventoryInfo> inventoryInfosLD = BaseDal.QueryData(x => x.WarehouseCode == WareCodeLD);
                object LDQty = new
                var LDQty = Convert.ToInt32(BaseDal.QueryData(x => x.WarehouseCode == WareCodeLD).Sum(x => x.StockQuantity));
                lists.Add(new
                {
                    name = WarehouseEnum.冷冻库.ObjToString(),
                    count = inventoryInfosLD.Sum(x => x.StockQuantity).ObjToInt()
                };
                lists.Add(LDQty);
                    count = LDQty
                });
                #endregion
                #region éº»ç²¾åº“
                string WareCodeMJ = WarehouseEnum.麻精库.ObjToInt().ToString("000");
                List<Dt_InventoryInfo> inventoryInfosMJ = BaseDal.QueryData(x => x.WarehouseCode == WareCodeMJ);
                object MJQty = new
                var MJQty = Convert.ToInt32(BaseDal.QueryData(x => x.WarehouseCode == WareCodeMJ).Sum(x => x.StockQuantity));
                lists.Add(new
                {
                    name = WarehouseEnum.麻精库.ObjToString(),
                    count = inventoryInfosMJ.Sum(x => x.StockQuantity).ObjToInt()
                };
                lists.Add(MJQty);
                    count = MJQty
                });
                #endregion
                #region å¤§ä»¶åº“
                string WareCodeDJ = WarehouseEnum.大件库.ObjToInt().ToString("000");
                List<Dt_InventoryInfo> inventoryInfosDJ = BaseDal.QueryData(x => x.WarehouseCode == WareCodeDJ);
                object DJQty = new
                var DJQty = Convert.ToInt32(BaseDal.QueryData(x => x.WarehouseCode == WareCodeDJ).Sum(x => x.StockQuantity));
                lists.Add(new
                {
                    name = WarehouseEnum.大件库.ObjToString(),
                    count = inventoryInfosDJ.Sum(x => x.StockQuantity).ObjToInt()
                };
                lists.Add(DJQty);
                    count = DJQty
                });
                #endregion
                content.OK(data: lists);
            }

 н¨Îļþ¼Ð/WIDESEA_WMSServer/WIDESEA_Common/MessageEnum.cs

@@ -42,6 +42,12 @@
        /// </summary>
        [Description("出库单报警")]
        OutOrderAlarm,

        /// <summary>
        /// ERP同步上游报警
        /// </summary>
        [Description("与ERP同步报警")]
        SynchronismAlarm
    }

    public enum MessageStatusEnum

 н¨Îļþ¼Ð/WIDESEA_WMSServer/WIDESEA_DTO/Outbound/OutboundOrderDetailAddDTO.cs

@@ -8,6 +8,33 @@
namespace WIDESEA_DTO.Outbound
{
    [ModelValidate]
    public class DeliveryOrderDetailAddDTO
    {
        public int id {  get; set; }
        /// <summary>
        /// ç‰©æ–™ç¼–号
        /// </summary>
        [PropertyValidate("物料编号", NotNullAndEmpty = true)]
        public string goods_no {  get; set; }
        /// <summary>
        /// æ‰¹æ¬¡å·
        /// </summary>
        public string batch_num { get; set; }
        /// <summary>
        /// æ•ˆæœŸ
        /// </summary>
        public string exp_date { get; set; }
        /// <summary>
        /// è´§ä½å·
        /// </summary>
        public string locationCode { get; set; }

        /// <summary>
        /// æ•°é‡
        /// </summary>
        [PropertyValidate("单据数量", NotNullAndEmpty = true, MinValue = 0, IsContainMinValue = false)]
        public int order_Outqty { get; set; }
    }
    public class OutboundOrderDetailAddDTO
    {
        /// <summary>

 н¨Îļþ¼Ð/WIDESEA_WMSServer/WIDESEA_DTO/SquareCabin/OrderDto.cs

@@ -312,6 +312,7 @@
            /// åº“存数量(业务数量)
            /// </summary>
            public decimal business_qty { get; set; }
            public decimal actual_qty { get; set; }
            /// <summary>
           
            /// <summary>

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

@@ -6,17 +6,6 @@
    {
        WebResponseContent GetInOrder();
        WebResponseContent GetOutOrder();
        /// <summary>
        /// èŽ·å–上游入库订单
        /// </summary>
        /// <returns></returns>
        WebResponseContent GetUpstreamOrder();
        /// <summary>
        /// èŽ·å–上游出库单数据
        /// </summary>
        /// <param name="searchDate"></param>
        /// <returns></returns>
        WebResponseContent GetUpstreamOutOrder();

        /// <summary>
        /// ç»™ä¸‹æ¸¸wcs入库单

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

@@ -21,7 +21,7 @@
      /// <param name="goods_no">物料编码</param>
      /// <param name="batch_num">批次号</param>
      /// <returns></returns>
        public WebResponseContent GetInventoryList(string goods_no,string batch_num);
        public WebResponseContent GetInventoryList(int[] key);

        //public WebResponseContent CreateAllocatInOut(Dt_MaterielInfo materielInfo);


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

@@ -41,259 +41,6 @@
            _materielInfoService = materielInfoService;
            _messageInfoService = messageInfoService;
        }
        #region èŽ·å–ERP入库单
        static string SearchInDate = "2025-10-30 00:00:00";
        /// <summary>
        /// èŽ·å–上游系统的入库单
        /// </summary>
        /// <param name="SearchInDate"></param>
        /// <returns></returns>
        public WebResponseContent GetUpstreamOrder()
        {
            var responseContent = new WebResponseContent();
            try
            {
                // è¯·æ±‚地址
                var url = "http://121.37.118.63:80/GYZ2/95fck/inOrder";
                //var url = "http://127.0.0.1:4523/m2/5660322-5340849-default/363009261";

                if (string.IsNullOrEmpty(SearchInDate)) SearchInDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
                //// è¯·æ±‚参数
                var requestData = new
                {
                    searchDate = SearchInDate
                    //searchDate = "2022-10-10 20:45:16"  // æ­£ç¡®çš„格式
                };
                SearchInDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
                // å‘起请求
                var result = HttpHelper.Post(url, requestData.ToJsonString());

                // ååºåˆ—化
                var response = JsonConvert.DeserializeObject<UpstreamResponse<UpstreamOrderInfo>>(result);

                if (response == null || response.resultCode != "0")
                {
                    // è°ƒç”¨å¼‚常接口
                    //SendErrorToUpstream(1, "", response.resultMsg ?? "上游接口返回失败", "");
                    return responseContent.Error(response.resultMsg ?? "上游接口返回失败");
                }

                if (response.data == null || !response.data.Any())
                {
                    return responseContent.OK("无新入库单数据");
                }
                var ordernos = response.data.Select(x => x.order_no).ToList();
                // èŽ·å–所有已存在的入库单号
                var existingOrderNos = _cabinOrderServices.Db.CopyNew().Queryable<Dt_CabinOrder>()
                    .Where(x => ordernos.Contains(x.Order_no))
                    .Select(x => x.Order_no)
                    .Distinct().ToList();

                // è¿‡æ»¤æŽ‰å·²å­˜åœ¨çš„入库单
                var newOrders = response.data
                    .Where(order => !existingOrderNos.Contains(order.order_no))
                    .ToList();

                if (newOrders.Count < 1)
                {
                    return responseContent.OK("所有入库单已存在，无需新增");
                }

                //存储入库单号
                List<string> orderNos = new List<string>();
                string name = string.Empty;
                MessageGroupByEnum messageGroupBy = MessageGroupByEnum.InOrderAlarm;
                MessageStatusEnum messageStatus = MessageStatusEnum.Emergency;
                foreach (var order in newOrders)
                {
                    try
                    {
                        if (order.order_type == "1") //正常入库
                        {
                            name = "创建正常入库单";
                            responseContent = _cabinOrderServices.CreateInboundOrder(order);
                            if (!responseContent.Status) throw new Exception(responseContent.Message);
                            List<Dt_CabinOrder>? dt_CabinOrders = responseContent.Data as List<Dt_CabinOrder>;
                            if (dt_CabinOrders != null)
                                _cabinOrderServices.Db.InsertNav(dt_CabinOrders).Include(x => x.Details).ExecuteCommand();
                        }
                        else if (order.order_type == "3")//入库退料
                        {
                            messageGroupBy = MessageGroupByEnum.OutOrderAlarm;
                            name = "创建入库退货单";
                            //创建出库单
                            #region è½¬æ¢ä¸ºå‡ºåº“单
                            UpstramOutOrderInfo upstramOutOrderInfo = new UpstramOutOrderInfo()
                            {
                                order_no = order.order_no,
                                order_type = order.order_type,
                                warehouse_no = order.warehouse_no,
                                details = new List<UpstreamOutOrderDetail>()
                            };
                            foreach (var item in order.details)
                            {
                                UpstreamOutOrderDetail detail = new UpstreamOutOrderDetail()
                                {
                                    batch_num = item.batch_num,
                                    goods_no = item.goods_no,
                                    order_qty = item.order_qty,
                                    exp_date = item.exp_date,
                                };
                                upstramOutOrderInfo.details.Add(detail);
                            }
                            var content = _deliveryOrderServices.CreateOutboundOrder(upstramOutOrderInfo);
                            if (!content.Status) throw new Exception(content.Message);
                            #endregion
                        }
                        else if (order.order_type == "5")//报溢入库
                        {
                            name = "创建盘盈入库单";
                            messageStatus = MessageStatusEnum.Undisposed;
                            var content = _cabinOrderServices.CreateCheckInOrder(order);
                            if (!content.Status) throw new Exception(content.Message);
                        }
                    }
                    catch (Exception ex)
                    {
                        _messageInfoService.AddMessageInfo(messageGroupBy, name, ex.Message, messageStatus);
                        //SendErrorToUpstream(1, "", ex.Message, "");
                        //return responseContent.Error("同步失败: " + ex.Message);
                    }
                };
                return responseContent.OK("同步入库单成功");

            }
            catch (Exception ex)
            {
                // å…¨å±€å¼‚常时，也推送异常给上游
                //SendErrorToUpstream(1, "", ex.Message, "");
                return responseContent.Error("同步失败: " + ex.Message);
            }
        }
        #endregion

        #region èŽ·å–ERP出库单
        static string SearchOutDate = "2025-10-30 00:00:00";
        public WebResponseContent GetUpstreamOutOrder()
        {
            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";
                if (string.IsNullOrEmpty(SearchOutDate)) SearchOutDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
                //// è¯·æ±‚参数
                var requestData = new
                {
                    searchDate = SearchOutDate
                    //searchDate = "2022-10-10 20:45:16"  // æ­£ç¡®çš„格式
                };
                SearchOutDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");

                var result = HttpHelper.Post(url, requestData.ToJsonString());
                var response = JsonConvert.DeserializeObject<UpstreamResponse<UpstramOutOrderInfo>>(result);

                if (response == null || response.resultCode != "0")
                {
                    //SendErrorToUpstream(3, "", response.resultMsg ?? "上游接口返回失败", "");
                    return responseContent.Error(response?.resultMsg ?? "上游接口返回失败");
                }

                if (response.data == null || !response.data.Any())
                {
                    return responseContent.OK("无新出库单数据");
                }
                var ordernos = response.data.Select(x => x.order_no).ToList();
                // å·²å­˜åœ¨å‡ºåº“单号
                var existingOutOrderNos = _deliveryOrderServices.Db.CopyNew().Queryable<Dt_DeliveryOrder>()
                    .Where(x => ordernos.Contains(x.Out_no))
                    .Select(x => x.Out_no)
                    .Distinct().ToList();

                // æ–°å‡ºåº“单
                var newOutOrders = response.data
                    .Where(outorder => !existingOutOrderNos.Contains(outorder.order_no))
                    .ToList();

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

                if (newOutOrders.Count < 1)
                {
                    return responseContent.OK("所有出库单已存在，无需新增");
                }

                List<Dt_DeliveryOrder> _DeliveryOrders = new List<Dt_DeliveryOrder>();
                List<string> orderNos = new List<string>();
                string name = string.Empty;
                MessageGroupByEnum messageGroupBy = MessageGroupByEnum.OutOrderAlarm;
                MessageStatusEnum messageStatus = MessageStatusEnum.Emergency;
                foreach (var outorder in newOutOrders)
                {
                    try
                    {
                        if (outorder.order_type == "1") // æ­£å¸¸å‡ºåº“单
                        {
                            name = "创建正常出库单";
                            var content = _deliveryOrderServices.CreateOutboundOrder(outorder);
                            if (!content.Status) throw new Exception(content.Message);
                        }
                        else if (outorder.order_type == "2")//出库退货
                        {
                            name = "创建出库退货单";
                            messageGroupBy = MessageGroupByEnum.InOrderAlarm;
                            // åˆ›å»ºå‡ºåº“退货单 - è¿™é‡Œéœ€è¦æ ¹æ®ä¸šåŠ¡é€»è¾‘实现
                            // æš‚时跳过或实现退货逻辑
                            //continue;
                            #region è½¬æ¢æˆå…¥åº“单
                            UpstreamOrderInfo order = new UpstreamOrderInfo()
                            {
                                order_no = outorder.order_no,
                                order_type = outorder.order_type,
                                warehouse_no = outorder.warehouse_no,
                                details = new List<UpstreamOrderDetail>()
                            };
                            foreach (var item in outorder.details)
                            {
                                UpstreamOrderDetail detail = new UpstreamOrderDetail()
                                {
                                    batch_num = item.batch_num,
                                    goods_no = item.goods_no,
                                    order_qty = item.order_qty,
                                    exp_date = item.exp_date,
                                };
                                order.details.Add(detail);
                            }
                            responseContent = _cabinOrderServices.CreateInboundOrder(order);
                            if (!responseContent.Status) throw new Exception(responseContent.Message);
                            List<Dt_CabinOrder>? dt_CabinOrders = responseContent.Data as List<Dt_CabinOrder>;
                            if (dt_CabinOrders != null && dt_CabinOrders.Count > 0)
                                _cabinOrderServices.Db.CopyNew().InsertNav(dt_CabinOrders).Include(x => x.Details).ExecuteCommand();
                            #endregion
                        }
                        else if (outorder.order_type == "6")//报损出库
                        {
                            name = "创建盘损出库单";
                            messageStatus = MessageStatusEnum.Undisposed;
                            var content = _deliveryOrderServices.CreateCheckOutOrder(outorder);
                            if (!content.Status) throw new Exception(content.Message);
                        }
                    }
                    catch (Exception ex)
                    {
                        _messageInfoService.AddMessageInfo(messageGroupBy, name, ex.Message, messageStatus);
                        //SendErrorToUpstream(3, "", ex.Message, "");
                        //return responseContent.Error("同步失败: " + ex.Message);
                    }
                }
                return responseContent.OK($"同步出库单成功，共{_DeliveryOrders.Count}条");
            }
            catch (Exception ex)
            {
                //SendErrorToUpstream(3, "", ex.Message, "");
                return responseContent.Error("同步失败: " + ex.Message);
            }
        }
        #endregion

        #region ä¸‹å‘立库入库单
        public WebResponseContent EdiIn()
@@ -372,131 +119,6 @@
                return WebResponseContent.Instance.Error(ex.Message);
            }
        }
        #region MyRegion

        //public WebResponseContent EdiIn1()
        //{
        //    try
        //    {
        //        //2.查询符合条件的订单（表头 = æ–°å»º && åŒ…含有效明细）
        //        //var orders = BaseDal.Db.Queryable<Dt_CabinOrder>()
        //        //    .Where(o => o.OdrderStatus == "新建")
        //        //    .Includes(o => o.Details, d => d.MedicineGoods)
        //        //    .ToList();
        //        //查出包含全部的入库单，包含全部明细+一个明细对应一个商品
        //        var reslut = WarehouseEnum.立库.ObjToInt().ToString("000");
        //        var orders = _cabinOrderServices.Db.CopyNew()
        //        .Queryable<Dt_CabinOrder>()
        //        .Where(o => o.OdrderStatus == "新建" && o.Warehouse_no == reslut)
        //        .Includes(o => o.Details, d => d.MedicineGoods)
        //        .ToList();
        //        // 3. å†è¿‡æ»¤æŽ‰ä¸ç¬¦åˆæ¡ä»¶çš„明细（只保留 Status=0）
        //        foreach (var order in orders)
        //        {
        //            //Console.WriteLine($"订单 {order.Order_no} åŽŸæ˜Žç»†æ•°ï¼š{order.Details.Count}");
        //            order.Details = order.Details.Where(d => d.Status == 0).ToList();
        //            //Console.WriteLine($"订单 {order.Order_no} è¿‡æ»¤åŽæ˜Žç»†æ•°ï¼š{order.Details.Count}");
        //        }


        //        if (orders.Count < 1)
        //        {
        //            //Console.WriteLine("没有符合条件的订单需要推送");
        //            return WebResponseContent.Instance.Error("没有符合条件的订单需要推送");
        //        }
        //        List<Dt_CabinOrderDetail> cabinOrderDetails = new List<Dt_CabinOrderDetail>();
        //        var url = "http://172.16.1.2:9357/file-admin/api/in/ediIn";
        //        // 4. éåŽ†è®¢å•ï¼Œç»„装 DTO å¹¶æŽ¨é€
        //        foreach (var order in orders)
        //        {
        //            // ä»Žç¬¬ä¸€ä¸ªæœ‰ MedicineGoods çš„明细中取出 MaterielErpType
        //            string materialCode = order.Details
        //                .Select(d => d.MedicineGoods?.MaterielErpType)
        //                .FirstOrDefault(x => !string.IsNullOrEmpty(x)) ?? "YY"; // é»˜è®¤å€¼YY

        //            var ediDto = new ToediInInfo
        //            {

        //                //客户代码
        //                customerCode = "905",
        //                //物料类型
        //                materialCode = materialCode,
        //                //入库单号
        //                externalOrderNo = order.Order_no,
        //                //入库单类型
        //                inOrderType = order.Order_type == "5" ? "20" : "10",
        //                //优先级
        //                priority = 0,
        //                //是否取消
        //                Is_cancel = 0,
        //                details = order.Details.Select(d => new ToediInDetail
        //                {
        //                    //批号
        //                    batchNo = d.Batch_num,
        //                    //产品
        //                    productCode = d.Goods_no,
        //                    //sku名称
        //                    productName = d.MedicineGoods?.MaterielName,
        //                    //sku规格
        //                    productSpecifications = d.MedicineGoods?.MaterielSpec,
        //                    //数量
        //                    quantity = (int)d.Order_qty,
        //                    //效期
        //                    validityPeriod = d.Exp_date,
        //                    //生产厂家
        //                    manufacturer = d.MedicineGoods?.Factory,
        //                    //房号
        //                    libraryNo = order.Warehouse_no,
        //                }).ToList()
        //            };

        //            //var url = "http://127.0.0.1:4523/m2/5660322-5340849-default/363019549";
        //            var result = HttpHelper.Post(url, ediDto.ToJsonString());
        //            var resp = JsonConvert.DeserializeObject<TowcsResponse<object>>(result);

        //            if (resp != null && resp.code == "0")
        //            {
        //                order.OdrderStatus = "开始";
        //                foreach (var item in order.Details)
        //                {
        //                    item.Status = 1;
        //                    item.OrderDetailStatus = "开始";
        //                }
        //                cabinOrderDetails.AddRange(order.Details);
        //                // æ›´æ–°è¡¨å¤´çŠ¶æ€
        //                //_cabinOrderServices.Db.Updateable<Dt_CabinOrder>()
        //                //   .SetColumns(o => new Dt_CabinOrder { OdrderStatus = "开始" })
        //                //   .Where(o => o.Id == order.Id)
        //                //   .ExecuteCommand();

        //                // æ›´æ–°æ˜Žç»†çŠ¶æ€ä¸ºå·²åŒæ­¥  //这里要是将新建--》开始状态,在后端接口返回我们的时候在返回已完成
        //                //_cabinDetailServices.Db.Updateable<Dt_CabinOrderDetail>()
        //                //  .SetColumns(d => new Dt_CabinOrderDetail { Status = 1, OrderDetailStatus = "开始" })
        //                //  .Where(d => d.OrderId == order.Id && d.Status == 0)
        //                //  .ExecuteCommand();

        //                //Console.WriteLine($"订单 {order.Order_no} æŽ¨é€æˆåŠŸ");
        //            }
        //            else
        //            {
        //                continue;
        //                //SendErrorToUpstream(3, order.Order_no, resp?.msg ?? "WCS æŽ¨é€å¤±è´¥", "");
        //                //Console.WriteLine($"订单 {order.Order_no} æŽ¨é€å¤±è´¥ï¼š{resp?.msg}");
        //                //return new WebResponseContent { Status = false, Message = "订单推送失败" };
        //            }
        //        }
        //        _cabinOrderServices.UpdateData(orders);
        //        _cabinDetailServices.UpdateData(cabinOrderDetails);
        //        return new WebResponseContent { Status = true, Message = "推送成功" };
        //    }
        //    catch (Exception ex)
        //    {

        //        Console.WriteLine("EdiIn å¼‚常：" + ex.Message);
        //        return new WebResponseContent { Status = false, Message = ex.Message };
        //    }
        //} 
        #endregion
        #endregion

        #region ä¸‹å‘立库出库单
@@ -571,133 +193,6 @@
                return WebResponseContent.Instance.Error(ex.Message);
            }
        }

        #region MyRegion
        public WebResponseContent EdiOut1()
        {
            var responseContent = new WebResponseContent();
            var WarehouseLk = WarehouseEnum.立库.ObjToInt().ToString("000");
            try
            {
                // 1. æŸ¥è¯¢ç¬¦åˆæ¡ä»¶çš„订单（表头=新建 && åŒ…含有效明细）
                var outOrders = _deliveryOrderServices.Db.CopyNew().Queryable<Dt_DeliveryOrder>()
                    .Where(o => o.OutStatus == "新建" && o.Warehouse_no == WarehouseLk)
                    .Includes(o => o.Details, d => d.MedicineGoods)
                    .ToList();

                // 2. å†è¿‡æ»¤æŽ‰ä¸ç¬¦åˆæ¡ä»¶çš„明细（只保留 Status=0 ï¼‰
                foreach (var order in outOrders)
                {
                    order.Details = order.Details.Where(d => d.Status == 0).ToList();
                }

                if (outOrders.Count < 1)
                {
                    //Console.WriteLine("没有符合条件的订单需要推送");
                    return responseContent.Error("没有符合条件的订单需要推送");
                }
                List<Dt_DeliveryOrderDetail> deliveryOrderDetails = new List<Dt_DeliveryOrderDetail>();
                var url = "http://172.16.1.2:9357/file-admin/api/out/ediOut";
                foreach (var order in outOrders)
                {
                    try
                    {
                        string materialCode = "YY";//默认值
                                                   //获取当前订单的第一个明细项
                        var firstDetail = order.Details.FirstOrDefault();
                        if (firstDetail?.MedicineGoods != null && !string.IsNullOrEmpty(firstDetail.MedicineGoods.MaterielErpType))
                        {
                            //如果条件满足，将物料代码设置为第一个明细项对应的药品物料代码
                            materialCode = firstDetail.MedicineGoods.MaterielErpType;
                        }
                        switch (order.Out_type)
                        {
                            case "1"://正常出库
                            case "3"://入库退货
                                order.Out_type = "10";//一般交易出库单
                                break;
                            case "6"://盘亏出库
                                order.Out_type = "30";//盘亏出库单
                                break;
                        }
                        // 3. ç»„装 DTO
                        var ediDto = new TowcsDto.ToediOutInfo
                        {
                            customerCode = "905",
                            materialCode = materialCode,
                            externalOrderNo = order.Out_no,
                            outOrderType = order.Out_type,//20是盘点出库单
                            priority = 1,
                            Is_cancel = 0,
                            details = order.Details.Select(d => new TowcsDto.ToeOutdiInDetail
                            {
                                batchNo = d.Batch_num,
                                productCode = d.Goods_no,
                                productName = d.MedicineGoods?.MaterielName,
                                productSpecifications = d.MedicineGoods?.MaterielModel,
                                quantity = (int)d.Order_qty,
                                //stocktakingDetails = order.Out_type == "3"
                                //    ? new List<ToOutediInStock>
                                //      {
                                //  new ToOutediInStock { palletCode = "FC00001", quantity = d.Order_qty.ToString() }
                                //      }
                                //    : null
                            }).ToList()
                        };

                        // 4. è°ƒç”¨æŽ¥å£
                        //var url = "http://127.0.0.1:4523/m2/5660322-5340849-default/363076920";

                        var result = HttpHelper.Post(url, ediDto.ToJsonString());
                        var resp = JsonConvert.DeserializeObject<TowcsDto.TowcsResponse<object>>(result);

                        if (resp != null && resp.code == "0")
                        {
                            order.OutStatus = "开始";
                            foreach (var item in order.Details)
                            {
                                item.Status = 1;
                                item.OotDetailStatus = "开始";
                            }
                            deliveryOrderDetails.AddRange(order.Details);
                            // æ›´æ–°è¡¨å¤´çŠ¶æ€
                            //_cabinDetailServices.Db.CopyNew().Updateable<Dt_DeliveryOrder>()
                            //  .SetColumns(o => new Dt_DeliveryOrder { OutStatus = "开始" })
                            //  .Where(o => o.Id == order.Id)
                            //  .ExecuteCommand();

                            // æ›´æ–°æ˜Žç»†çŠ¶æ€
                            //_deliveryOrderDetailServices.Db.CopyNew().Updateable<Dt_DeliveryOrderDetail>()
                            //  .SetColumns(d => new Dt_DeliveryOrderDetail { Status = 1, OotDetailStatus = "开始" })
                            //  .Where(d => d.DeliveryOrderId == order.Id && d.Status == 0)
                            //  .ExecuteCommand();
                            //Console.WriteLine($"订单 {order.Out_no} æŽ¨é€æˆåŠŸ");
                        }
                        else
                        {
                            continue;
                            //SendErrorToUpstream(3, order.Out_no, resp?.msg ?? "WCS æŽ¨é€å¤±è´¥", "");
                            //Console.WriteLine($"订单 {order.Out_no} æŽ¨é€å¤±è´¥ï¼š{resp?.msg}");
                        }
                        //删除全部状为已完成的明细和表头，移入历史表
                    }
                    catch (Exception ex)
                    {
                        //SendErrorToUpstream(3, order.Out_no, ex.Message, "");
                        //Console.WriteLine($"订单 {order.Out_no} æŽ¨é€å¼‚常：{ex.Message}");
                    }
                }
                _deliveryOrderServices.UpdateData(outOrders);
                _deliveryOrderDetailServices.UpdateData(deliveryOrderDetails);
                return responseContent.OK("出库订单推送完成");
            }
            catch (Exception ex)
            {
                //Console.WriteLine("EdiOut å¼‚常：" + ex.Message);
                return responseContent.Error("出库订单推送失败：" + ex.Message);
            }
        }
        #endregion
        #endregion

        #region å…¥åº“完成上报ERP
@@ -829,35 +324,6 @@
            catch (Exception ex)
            {
                return responseContent.Error("批量处理失败：" + ex.Message);
            }
        }
        #endregion

        #region æŽ¨é€å¼‚常上报ERP
        /// <summary>
        /// æŽ¨é€å¼‚常信息给上游系统1.入库单接口；2.入库单报完成接口；3.出库单接口；4.出库报完成接口；5.药品基础信息同步接口；6.供应商信息接口；7.客户信息接口；8.库存
        /// </summary>
        public void SendErrorToUpstream(int type, string code, string message, string remark)
        {
            try
            {
                var url = "http://121.37.118.63:80/GYZ2/95fck/lexceptionLogog";

                var requestData = new
                {
                    type = type.ToString(),
                    code = code,
                    message = message,
                    remark = remark
                };

                var result = HttpHelper.Post(url, requestData.ToJsonString());
                // å¯ä»¥ååºåˆ—化检查 resultCode æ˜¯å¦ä¸º0
            }
            catch (Exception e)
            {
                // è¿™é‡Œä¸è¦å†æŠ›å¼‚常了，避免死循环
                Console.WriteLine("异常接口推送失败：" + e.Message);
            }
        }
        #endregion

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

@@ -161,8 +161,8 @@
                #region è´§ä½
                var location = _locationInfoService.Repository.QueryFirst(x => x.LocationCode == LocationCode);
                if (location == null) return WebResponseContent.Instance.Error($"请维护货位编号【{LocationCode}】的货位信息");
                if (location.EnableStatus == EnableStatusEnum.Disable.ObjToInt())
                    return WebResponseContent.Instance.Error($"货位编号【{LocationCode}】已禁用，请恢复正常再使用");
                //if (location.EnableStatus == EnableStatusEnum.Disable.ObjToInt())
                //    return WebResponseContent.Instance.Error($"货位编号【{LocationCode}】已禁用，请恢复正常再使用");
                if (location.WarehouseCode != cabinOrderDetail.Reservoirarea)
                    return WebResponseContent.Instance.Error($"货位编号【{LocationCode}】所属库房与当前入库单所属库房不匹配");
                if (location.LocationStatus == LocationStatusEnum.Free.ObjToInt())

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

@@ -21,6 +21,7 @@
using WIDESEA_Core.BaseServices;
using WIDESEA_Core.Enums;
using WIDESEA_Core.Helper;
using WIDESEA_DTO.Outbound;
using WIDESEA_DTO.SquareCabin;
using WIDESEA_IBasicService;
using WIDESEA_ISquareCabinServices;
@@ -62,7 +63,138 @@
        }
        public override WebResponseContent UpdateData(SaveModel saveModel)
        {
            return base.UpdateData(saveModel);
            try
            {
                int id = saveModel.MainData["id"].ObjToInt();
                var warehouse_no = saveModel.MainData["warehouse_no"].ToString();
                var out_no = saveModel.MainData["out_no"].ToString();
                //OutboundOrderAddDTO outboundOrder = saveModel.MainData.DicToModel<OutboundOrderAddDTO>();
                //Dt_DeliveryOrder deliveryOrder = BaseDal.QueryFirst(x => x.Id == id);
                List<DeliveryOrderDetailAddDTO> orderDetailAddDTOs = saveModel.DetailData.DicToIEnumerable<DeliveryOrderDetailAddDTO>();
                orderDetailAddDTOs = orderDetailAddDTOs.Where(x => x.id == 0).ToList();
                if (orderDetailAddDTOs.Count < 1) return WebResponseContent.Instance.OK();
                if (orderDetailAddDTOs.Where(x => string.IsNullOrEmpty(x.locationCode)).Any()) return WebResponseContent.Instance.Error("货位号为必填字段!");
                if (orderDetailAddDTOs.Where(x => string.IsNullOrEmpty(x.exp_date)).Any()) return WebResponseContent.Instance.Error("效期为必填字段!");
                var LocationCodes = orderDetailAddDTOs.Select(x => x.locationCode);
                List<Dt_LocationInfo> locationInfos = _locationInfoService.Repository.QueryData(x => x.WarehouseCode == warehouse_no && LocationCodes.Contains(x.LocationCode));
                var diff = LocationCodes.Except(locationInfos.Select(x => x.LocationCode)).ToArray();
                if (diff.Length > 0) return WebResponseContent.Instance.Error($"货位编号【{string.Join(", ", diff)}】不属于当前库房");
                var array1 = orderDetailAddDTOs.Select(x => x.goods_no);
                var MaterielInfos = _materielInfoService.Repository.QueryData(x => array1.Contains(x.MaterielCode));
                var array2 = MaterielInfos.Select(x => x.MaterielCode);
                diff = array1.Except(array2).ToArray();
                if (diff.Length > 0) return WebResponseContent.Instance.Error($"请维护物料编号【{string.Join(", ", diff)}】的物料信息");
                if (warehouse_no == WarehouseEnum.立库.ObjToInt().ToString("000"))
                {
                    var MaterielInfos1 = MaterielInfos.Where(x => x.MaterielSourceType == MaterielSourceTypeEnum.PurchasePart).ToList();
                    if (MaterielInfos1.Count > 0)
                    {
                        return WebResponseContent.Instance.Error($"物料编号【{string.Join(", ", MaterielInfos1.Select(x => x.MaterielCode))}】的物料属性分类为大件，不可入立库");
                    }
                }
                var InventoryInfos = _inventoryInfoService.Repository.QueryData(x => x.WarehouseCode == warehouse_no && array2.ToList().Contains(x.MaterielCode));
                var Batchs = _inventory_BatchServices.Repository.QueryData(x => array2.Contains(x.MaterielCode));
                List<Dt_DeliveryOrderDetail> deliveryOrderDetails = new List<Dt_DeliveryOrderDetail>();
                List<Dt_SupplyTask> supplyTasks = new List<Dt_SupplyTask>();
                List<Dt_InventoryInfo> inventoryInfos = new List<Dt_InventoryInfo>();
                List<Dt_Inventory_Batch> inventory_Batches = new List<Dt_Inventory_Batch>();
                foreach (var item in orderDetailAddDTOs)
                {
                    if (InventoryInfos.Where(x => x.MaterielCode == item.goods_no && x.BatchNo == item.batch_num).Any())
                        return WebResponseContent.Instance.Error($"物料编号【{item.goods_no}】物料批次【{item.batch_num}】已存在库存");
                    #region æ·»åŠ ç›˜ç‚¹å•è¯¦æƒ…
                    Dt_DeliveryOrderDetail dt_DeliveryOrde = new Dt_DeliveryOrderDetail()
                    {
                        DeliveryOrderId = id,
                        Reservoirarea = warehouse_no,
                        Status = 2,
                        Order_qty = 0,
                        Order_Outqty = item.order_Outqty,
                        Goods_no = item.goods_no,
                        OotDetailStatus = "新建",
                        Batch_num = item.batch_num,
                        Creater = App.User.UserName,
                        CreateDate = DateTime.Now,
                    };
                    deliveryOrderDetails.Add(dt_DeliveryOrde);
                    #endregion

                    #region æ·»åŠ åº“存、批次信息、盘点任务
                    var MaterielInfo = MaterielInfos.First(x => x.MaterielCode == item.goods_no);
                    Dt_InventoryInfo inventoryInfo = new Dt_InventoryInfo()
                    {
                        BatchNo = item.batch_num,
                        MaterielCode = MaterielInfo.MaterielCode,
                        AvailableQuantity = 0,
                        CreateDate = DateTime.Now,
                        Creater = App.User.UserName,
                        InDate = DateTime.Now,
                        LocationCode = item.locationCode,
                        MaterielName = MaterielInfo.MaterielName,
                        MaterielSpec = MaterielInfo.MaterielSpec,
                        OutboundQuantity = 0,
                        StockQuantity = 0,
                        StockStatus = StockStatusEmun.盘点锁定.ObjToInt(),
                        SupplyQuantity = 0,
                        WarehouseCode = warehouse_no,
                        ValidityPeriod = item.exp_date
                    };
                    inventoryInfos.Add(inventoryInfo);
                    Dt_Inventory_Batch? inventory_Batch = Batchs.FirstOrDefault(x => x.BatchNo == item.batch_num && x.MaterielCode == item.goods_no);
                    if (inventory_Batch == null)
                    {
                        inventory_Batch = new Dt_Inventory_Batch()
                        {
                            BatchNo = inventoryInfo.BatchNo,
                            CreateDate = inventoryInfo.CreateDate,
                            Creater = inventoryInfo.Creater,
                            MaterielCode = inventoryInfo.MaterielCode,
                            ERPStockQuantity = 0,
                            MaterielName = inventoryInfo.MaterielName,
                            MaterielSpec = inventoryInfo.MaterielSpec,
                            OutboundQuantity = inventoryInfo.OutboundQuantity,
                            ProductionDate = inventoryInfo.ProductionDate,
                            Status = false,
                            StockQuantity = inventoryInfo.StockQuantity,
                            AvailableQuantity = inventoryInfo.AvailableQuantity,
                            ValidityPeriod = inventoryInfo.ValidityPeriod.ObjToDate(),
                            SupplyQuantity = inventoryInfo.SupplyQuantity,
                        };
                        inventory_Batches.Add(inventory_Batch);
                    }
                    Dt_SupplyTask supplyTask = new Dt_SupplyTask()
                    {
                        WarehouseCode = warehouse_no,
                        TaskStatus = SupplyStatusEnum.NewCheck.ObjToInt(),
                        BatchNo = inventoryInfo.BatchNo,
                        MaterielName = inventoryInfo.MaterielName,
                        MaterielCode = inventoryInfo.MaterielCode,
                        MaterielSpec = inventoryInfo.MaterielSpec,
                        TaskType = TaskTypeEnum.OutInventory.ObjToInt(),
                        CreateDate = DateTime.Now,
                        Creater = App.User.UserName,
                        LocationCode = inventoryInfo.LocationCode,
                        OrderNo = out_no,
                        StockQuantity = inventoryInfo.StockQuantity,
                        SupplyQuantity = 0,
                        Remark = "盘点"
                    };
                    supplyTasks.Add(supplyTask);
                    #endregion
                }
                _unitOfWorkManage.BeginTran();
                _deliveryOrderDetailServices.AddData(deliveryOrderDetails);
                _inventoryInfoService.AddData(inventoryInfos);
                if (inventory_Batches.Count > 0) _inventory_BatchServices.AddData(inventory_Batches);
                _supplyTaskService.AddData(supplyTasks);
                _unitOfWorkManage.CommitTran();
                return WebResponseContent.Instance.OK("盘点详情添加成功,请通过ERP平账！");
            }
            catch (Exception ex)
            {
                _unitOfWorkManage.RollbackTran();
                return WebResponseContent.Instance.Error(ex.Message);
            }
        }

        #region åˆ›å»ºå‡ºåº“单
@@ -185,7 +317,7 @@
                    _supplyTaskService.AddData(supplyTasks);
                    _inventory_BatchServices.UpdateData(batchesUp);
                    _inventoryInfoService.UpdateData(inventoryInfosUp);
                    BaseDal.Db.CopyNew().InsertNav(entityOrder).Include(x => x.Details).ExecuteCommand();
                    BaseDal.Db.InsertNav(entityOrder).Include(x => x.Details).ExecuteCommand();
                    _unitOfWorkManage.CommitTran();
                    #endregion
                }
@@ -438,7 +570,7 @@
                                #region æ·»åŠ å‡ºåº“任务、修改库存信息
                                Dt_InventoryInfo? inventoryInfo = dt_InventoryInfos.FirstOrDefault(x => x.WarehouseCode == WareCodeLK);
                                if (inventoryInfo == null)
                                    throw new Exception($"未找到物料编号【{detail.goods_no}】物料批次【{detail.batch_num}】在立库中的库存信息；所需数量【{orderDetailLK.Order_qty}】请补货");
                                    throw new Exception($"出库单【{outorder.order_no}】详情存在散件,物料编号【{detail.goods_no}】物料批次【{detail.batch_num}】所需数量【{Convert.ToInt32(orderDetailLK.Order_qty)}】请人工调拨补货入立库");
                                inventoryInfo.AvailableQuantity -= orderDetailLK.Order_qty;
                                inventoryInfo.OutboundQuantity += orderDetailLK.Order_qty;
                                Dt_SupplyTask supplyTask = new Dt_SupplyTask()
@@ -478,9 +610,9 @@
                        _inventory_BatchServices.UpdateData(batchesUp);
                        _inventoryInfoService.UpdateData(inventoryInfosUp);
                        if (entityOrder.Details.Count > 0)
                            BaseDal.Db.CopyNew().InsertNav(entityOrder).Include(x => x.Details).ExecuteCommand();
                            BaseDal.Db.InsertNav(entityOrder).Include(x => x.Details).ExecuteCommand();
                        if (entityOrderLK.Details.Count > 0)
                            BaseDal.Db.CopyNew().InsertNav(entityOrderLK).Include(x => x.Details).ExecuteCommand();
                            BaseDal.Db.InsertNav(entityOrderLK).Include(x => x.Details).ExecuteCommand();
                        _unitOfWorkManage.CommitTran();
                    }
                    catch (Exception ex)
@@ -822,9 +954,7 @@
            try
            {
                // 1️⃣ æŸ¥æ‰¾æŒ‡å®šæ‰¹æ¬¡ä¸Žç‰©æ–™çš„库存信息
                var batchInfo = BaseDal.Db.CopyNew().Queryable<Dt_Inventory_Batch>()
                    .Where(x => x.BatchNo == batchNo && x.MaterielCode == goodsNo)
                    .First();
                var batchInfo = _inventory_BatchServices.Repository.QueryFirst(x => x.BatchNo == batchNo && x.MaterielCode == goodsNo);

                if (batchInfo == null)
                    return response.Error($"未找到该物料 [{goodsNo}] æ‰¹æ¬¡ [{batchNo}] çš„库存信息");
@@ -960,6 +1090,8 @@
            }
            return content;
        }

       
        public WebResponseContent OutTaskFinish(Dt_SupplyTask supplyTask, Dt_DeliveryOrder deliveryOrder)
        {
            WebResponseContent content = new WebResponseContent();
@@ -1008,7 +1140,7 @@
                    _inventory_BatchServices.DeleteData(inventory_Batch);
                else
                    _inventory_BatchServices.UpdateData(inventory_Batch);
                _materielInfoService.UpdateData(materielInfo);
                //_materielInfoService.UpdateData(materielInfo);
                if (inventoryInfo.StockQuantity <= 0)
                    _inventoryInfoService.DeleteData(inventoryInfo);
                else
@@ -1025,7 +1157,15 @@
                {
                    materielInfo.Business_qty -= supplyTask.StockQuantity;
                    if (materielInfo.Business_qty < materielInfo.MinQty)
                    {
                        CreateAllocatInOut(materielInfo);//创建调拨任务
                    }
                    else
                    {
                        _materielInfoService.UpdateData(materielInfo);
                    }
                       

                }
                #endregion
                _unitOfWorkManage.CommitTran();
@@ -1039,12 +1179,13 @@
            }
            return content;
        }

        public WebResponseContent OutTaskFinish(Dt_SupplyTask supplyTask)
        {
            WebResponseContent content = new WebResponseContent();
            try
            {
                Dt_DeliveryOrder? cabinOrder = BaseDal.Db.CopyNew().Queryable<Dt_DeliveryOrder>().Where(x => x.Out_no == supplyTask.OrderNo && x.Warehouse_no == supplyTask.WarehouseCode).Includes(x => x.Details).First();
                Dt_DeliveryOrder? cabinOrder = BaseDal.Db.Queryable<Dt_DeliveryOrder>().Where(x => x.Out_no == supplyTask.OrderNo && x.Warehouse_no == supplyTask.WarehouseCode).Includes(x => x.Details).First();
                if (cabinOrder == null) return WebResponseContent.Instance.OK($"出库单已完成");

                Dt_DeliveryOrderDetail? cabinOrderDetail = cabinOrder.Details.Where(x => x.Batch_num == supplyTask.BatchNo && x.Reservoirarea == supplyTask.WarehouseCode && x.Goods_no == supplyTask.MaterielCode).FirstOrDefault();
@@ -1068,7 +1209,7 @@
                    //_deliveryOrderDetailServices.Repository.DeleteAndMoveIntoHty(cabinOrderDetail, OperateTypeEnum.自动完成);
                }
                _deliveryOrderDetailServices.Repository.UpdateData(cabinOrderDetail);
                var cabinOrder1 = BaseDal.Db.CopyNew().Queryable<Dt_DeliveryOrder>().Where(x => x.Out_no == cabinOrder.Out_no && x.Warehouse_no == supplyTask.WarehouseCode && x.Out_type != "20").Includes(x => x.Details).First();
                var cabinOrder1 = BaseDal.Db.Queryable<Dt_DeliveryOrder>().Where(x => x.Out_no == cabinOrder.Out_no && x.Warehouse_no == supplyTask.WarehouseCode && x.Out_type != "20").Includes(x => x.Details).First();
                if (!cabinOrder1.Details.Where(x => x.OotDetailStatus != "已完成").Any())
                    cabinOrder.OutStatus = "已完成";
                Repository.UpdateData(cabinOrder);

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

@@ -1,12 +1,7 @@
using HslCommunication;
using MailKit.Search;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection.Metadata;
using System.Text;
using System.Threading.Tasks;
using SqlSugar;
using WIDESEA_Common;
using WIDESEA_Common.OrderEnum;
using WIDESEA_Common.StockEnum;
using WIDESEA_Common.TaskEnum;
@@ -31,11 +26,15 @@
        private readonly ICabinOrderServices _cabinOrderServices;
        private readonly IDeliveryOrderServices _deliveryOrderServices;
        private readonly ISupplyTaskService _supplyTaskService;
        public InventoryServices(IRepository<Dt_Inventory> BaseDal, ICabinOrderServices cabinOrderServices, IDeliveryOrderServices deliveryOrderServices, ISupplyTaskService supplyTaskService) : base(BaseDal)
        private readonly IInventory_BatchServices _inventoryBatchServices;
        private readonly IMessageInfoService _infoService;
        public InventoryServices(IRepository<Dt_Inventory> BaseDal, ICabinOrderServices cabinOrderServices, IDeliveryOrderServices deliveryOrderServices, ISupplyTaskService supplyTaskService, IInventory_BatchServices inventoryBatchServices, IMessageInfoService infoService) : base(BaseDal)
        {
            _cabinOrderServices = cabinOrderServices;
            _deliveryOrderServices = deliveryOrderServices;
            _supplyTaskService = supplyTaskService;
            _inventoryBatchServices = inventoryBatchServices;
            _infoService = infoService;
        }

        /// <summary>
@@ -45,52 +44,42 @@
        /// <param name="batch_num">批号</param>
        /// <returns></returns>
        /// <exception cref="NotImplementedException"></exception>
        public WebResponseContent GetInventoryList(string goods_no, string batch_num)
        public WebResponseContent GetInventoryList(int[] keys)
        {
            var responseContent = new WebResponseContent();
            try
            {
                var url = "http://121.37.118.63/GYZ2/95fck/repositoryInfo";
                var result = HttpHelper.Post(url, new { goods_no, batch_num }.ToJsonString());
                //根据id查询库存批次信息表，获取到他们的商品编码和批次号
                var inventoryBatches = _inventoryBatchServices.Repository.QueryData(x => keys.Contains(x.Id)); //查全部

                var response = JsonConvert.DeserializeObject<UpstreamResponse<InventoryInfo>>(result);

                if (response.resultCode != "0")
                var url = "http://121.37.118.63:80/GYZ2/95fck/repositoryInfo";
                foreach (var item in inventoryBatches)
                {
                    //SendErrorToUpstream(8, "", response.resultMsg ?? "上游接口返回失败", "");
                    return responseContent.Error(response.resultMsg ?? "上游接口返回失败");
                }
                    var result = HttpHelper.Post(url, new { goods_no = item.MaterielCode, batch_num = item.BatchNo }.ToJsonString());

                if (response.data == null || !response.data.Any())
                {
                    return responseContent.OK("无新库存数据");
                    var response = JsonConvert.DeserializeObject<UpstreamResponse<InventoryInfo>>(result);
                    if (response == null) continue;
                    var data = response.data.FirstOrDefault();
                    if (data != null)
                        item.ERPStockQuantity = data.business_qty;
                }

                Db.Ado.BeginTran();
                foreach (var item in response.data)
                {
                    // ä½¿ç”¨ FirstOrDefault é¿å…æ‰¾ä¸åˆ°è®°å½•æ—¶æŠ›å‡ºå¼‚常
                    var Inver = Db.Queryable<Dt_Inventory_Batch>()
                        .First(x => x.MaterielCode == item.goods_no && x.BatchNo == item.batch_num);

                    if (Inver != null)
                    {
                        Inver.ERPStockQuantity = item.business_qty;
                        Db.Updateable(Inver).ExecuteCommand();
                    }
                }
                Db.Ado.CommitTran();
                _inventoryBatchServices.UpdateData(inventoryBatches);
                return responseContent.OK("库存信息同步完成");

            }
            catch (Exception ex)
            {
                Db.Ado.RollbackTran();
                //SendErrorToUpstream(8, "", ex.Message, "");
                return responseContent.Error("同步失败: " + ex.Message);
            }
        }


        /// <summary>
        /// ä¸è®ºæ˜¯å‡ºåº“入库盘点，wcs都会调用我这个方法
        /// </summary>
        /// <param name="request"></param>
        /// <returns></returns>

        public ApiResponse<Dt_InventoryInfo> OrderFeedback(EdiOrderCallbackRequest request)
        {
            try

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

@@ -29,7 +29,7 @@
                //SearchInOrderDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
                var result = HttpHelper.Post(url, requestData.ToJsonString());
                var response = JsonConvert.DeserializeObject<UpstreamResponse<UpstreamOrderInfo>>(result);
                if (response == null || response.resultCode != "0") return content;
                if (response == null) return content;
                if (response.data.Count < 1)
                {
                    SearchInOrderDate = GetOutOrderDate;
@@ -114,7 +114,7 @@
                var result = HttpHelper.Post(url, requestData.ToJsonString());
                var response = JsonConvert.DeserializeObject<UpstreamResponse<UpstramOutOrderInfo>>(result);

                if (response == null || response.resultCode != "0") return content;
                if (response == null) return content;
                if (response.data.Count < 1)
                {
                    SearchOutOrderDate = GetOutOrderDate;

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

@@ -36,7 +36,7 @@
                Dt_Tactics tactics = _tacticsService.Repository.QueryFirst(x => x.TacticeName == "出库策略");
                List<Dt_SupplyTask> supplyTasks = new List<Dt_SupplyTask>();
                //// æŸ¥è¯¢å¤§ä»¶åº“中可用的库存
                List<Dt_InventoryInfo> dt_InventoryInfos = _inventoryInfoService.Repository.QueryData(x => x.MaterielCode == materielInfo.MaterielCode && x.StockStatus == StockStatusEmun.入库完成.ObjToInt() && x.AvailableQuantity > 0 && x.WarehouseCode == WareCode);
                List<Dt_InventoryInfo> dt_InventoryInfos = _inventoryInfoService.Repository.QueryData(x => x.MaterielCode == materielInfo.MaterielCode && x.StockStatus == StockStatusEmun.入库完成.ObjToInt() && x.AvailableQuantity > 0 && x.WarehouseCode == WareCode);//这里如果有俩个不同批次的物料，补货不管批次
                if (dt_InventoryInfos.Count < 1) throw new Exception($"物料编号【{materielInfo.MaterielCode}】大件库无库存！请及时补充库存！");
                if (tactics.SelectTactice == TacticsEnum.ComeOutonFirstTime.ObjToInt())
                    dt_InventoryInfos = dt_InventoryInfos.OrderBy(x => x.ValidityPeriod).ToList();
@@ -50,6 +50,8 @@
                    OutStatus = "新建",
                    Details = new List<Dt_DeliveryOrderDetail>()
                };

                #region å¾ªçŽ¯
                foreach (var item in dt_InventoryInfos)
                {
                    decimal Qty = 0;
@@ -84,7 +86,7 @@
                    {
                        deliveryOrderDetail.Order_qty += Qty;
                    }
                    deliveryOrder.Details.Add(deliveryOrderDetail); 
                    //deliveryOrder.Details.Add(deliveryOrderDetail); 
                    #endregion
                    #region æ·»åŠ è°ƒæ‹¨å‡ºåº“任务
                    Dt_SupplyTask supplyTask = new Dt_SupplyTask()
@@ -104,9 +106,12 @@
                        SupplyQuantity = 0,
                        Remark = "调拨出库"
                    };
                    supplyTasks.Add(supplyTask); 
                    supplyTasks.Add(supplyTask);
                    #endregion
                }
                #endregion


                #region å¤§ä»¶åº“补立库后立库业务库存数还是小于立库最小库存数，添加提示信息
                //添加报警信息
                if (materielInfo.Business_qty < materielInfo.MinQty)

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

@@ -3,6 +3,7 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using WIDESEA_Common;
using WIDESEA_Common.OrderEnum;
using WIDESEA_Common.StockEnum;
using WIDESEA_Common.TaskEnum;
@@ -36,9 +37,10 @@
                foreach (var item in inventory_Batches)
                {
                    var supplyTasks = _supplyTaskService.Repository.QueryData(x => x.MaterielCode == item.MaterielCode && x.BatchNo == item.BatchNo && x.TaskStatus == SupplyStatusEnum.NewCheck.ObjToInt()).ToList();
                    if (item.SupplyQuantity != 0) throw new Exception($"物料编号【{item.MaterielCode}】批次号【{item.BatchNo}】已存在盘点差异!");
                    if (supplyTasks.Count > 0) throw new Exception($"物料编号【{item.MaterielCode}】批次号【{item.BatchNo}】已存在盘点任务，请先完成当前盘点任务");
                    supplyTasks = _supplyTaskService.Repository.QueryData(x => x.MaterielCode == item.MaterielCode && x.BatchNo == item.BatchNo && x.TaskStatus == SupplyStatusEnum.NewOut.ObjToInt()).ToList();
                    if (supplyTasks.Count > 0) throw new Exception($"物料编号【{item.MaterielCode}】批次号【{item.BatchNo}】已存在盘点任务，请先完成当前盘点任务");
                    if (supplyTasks.Count > 0) throw new Exception($"物料编号【{item.MaterielCode}】批次号【{item.BatchNo}】已存在出库任务，请先完成当前出库任务");
                    List<Dt_InventoryInfo> inventoryInfos = _inventoryInfoService.Repository.QueryData(x => item.MaterielCode == x.MaterielCode && x.BatchNo == item.BatchNo);
                    if (inventoryInfos.Count > 0)
                    {
@@ -234,7 +236,7 @@
                if (materielInfo == null) return WebResponseContent.Instance.Error($"请维护物料编号【{cabinOrderDetail.Goods_no}】的物料信息");
                cabinOrderDetail.Order_Outqty += supplyTask.SupplyQuantity;
                #region å¹³åº“盘点只能出现整箱差异
                if (supplyTask.WarehouseCode == WarehouseEnum.大件库.ObjToInt().ToString("000"))
                if (supplyTask.WarehouseCode == WarehouseEnum.大件库.ObjToInt().ToString("000") && materielInfo.MaterielSourceType != MaterielSourceTypeEnum.PurchasePart)
                {
                    var Qty = supplyTask.SupplyQuantity % materielInfo.BoxQty;
                    if (Qty != 0) return WebResponseContent.Instance.Error($"大件库库存为整箱！盘点数量不能存在散件");
@@ -247,52 +249,95 @@
                #endregion

                #region åº“å­˜
                Dt_InventoryInfo inventoryInfo = new Dt_InventoryInfo();
                List<Dt_Inventory_Batch> inventory_Batchs = _inventory_BatchServices.Repository.QueryData(x => cabinOrder.Details.Select(x => x.Goods_no).Contains(x.MaterielCode));
                List<Dt_InventoryInfo> inventoryInfos = _inventoryInfoService.Repository.QueryData(x => cabinOrder.Details.Select(x => x.Goods_no).Contains(x.MaterielCode) && x.WarehouseCode == supplyTask.WarehouseCode && x.StockStatus == StockStatusEmun.盘点锁定.ObjToInt());
                Dt_InventoryInfo? inventoryInfo = new();
                List<Dt_InventoryInfo> inventoryInfosDel = new List<Dt_InventoryInfo>();
                if (supplyTask.WarehouseCode != WarehouseEnum.立库.ObjToInt().ToString("000"))
                {
                    inventoryInfo = _inventoryInfoService.Repository.QueryFirst(x => x.BatchNo == cabinOrderDetail.Batch_num && x.MaterielCode == cabinOrderDetail.Goods_no && x.WarehouseCode == supplyTask.WarehouseCode && x.LocationCode == supplyTask.LocationCode);
                    inventoryInfo = inventoryInfos.FirstOrDefault(x => x.BatchNo == cabinOrderDetail.Batch_num && x.MaterielCode == cabinOrderDetail.Goods_no && x.LocationCode == supplyTask.LocationCode);
                    if (inventoryInfo == null) return WebResponseContent.Instance.Error($"未找到货位【{LocationCode}】的库存信息");
                }
                else
                {
                    inventoryInfo = _inventoryInfoService.Repository.QueryFirst(x => x.BatchNo == cabinOrderDetail.Batch_num && x.MaterielCode == cabinOrderDetail.Goods_no && x.WarehouseCode == supplyTask.WarehouseCode);
                    inventoryInfo = inventoryInfos.FirstOrDefault(x => x.BatchNo == cabinOrderDetail.Batch_num && x.MaterielCode == cabinOrderDetail.Goods_no);
                }
                if (inventoryInfo == null) return WebResponseContent.Instance.Error($"未找到立库的库存信息");
                inventoryInfo.SupplyQuantity = supplyTask.SupplyQuantity - inventoryInfo.StockQuantity;
                #endregion

                #region åˆ¤æ–­å½“前物料批次的盘点任务是否全部完成
                List<Dt_SupplyTask> supplyTasks = _supplyTaskService.Repository.QueryData(x => x.MaterielCode == supplyTask.MaterielCode && x.BatchNo == supplyTask.BatchNo && x.TaskStatus == SupplyStatusEnum.NewCheck.ObjToInt() && x.WarehouseCode == supplyTask.WarehouseCode && x.TaskId != supplyTask.TaskId).ToList();
                List<Dt_SupplyTask> supplyTasks1 = _supplyTaskService.Repository.QueryData(x => x.MaterielCode == supplyTask.MaterielCode && x.BatchNo == supplyTask.BatchNo && x.TaskStatus == SupplyStatusEnum.NewCheck.ObjToInt() && x.TaskId != supplyTask.TaskId).ToList();
                Dt_Inventory_Batch inventory_Batch = new Dt_Inventory_Batch();
                List<Dt_InventoryInfo> inventoryInfos = new List<Dt_InventoryInfo>();
                if (supplyTasks1.Count < 1)
                List<Dt_SupplyTask> supplyTasks = _supplyTaskService.Repository.QueryData(x => x.OrderNo == supplyTask.OrderNo && x.TaskStatus == SupplyStatusEnum.NewCheck.ObjToInt() && x.TaskId != supplyTask.TaskId).ToList();//查找当前盘点单的盘点任务
                if (!supplyTasks.Where(x => cabinOrderDetail.Goods_no == x.MaterielCode && x.BatchNo == cabinOrderDetail.Batch_num).Any())
                    cabinOrderDetail.OotDetailStatus = "已完成";
                #region åˆ¤æ–­å½“前盘点单任务是否全部完成
                if (supplyTasks.Count < 1)
                {
                    #region æŸ¥æ‰¾åº“å­˜
                    inventoryInfos = _inventoryInfoService.Repository.QueryData(x => x.BatchNo == cabinOrderDetail.Batch_num && x.MaterielCode == cabinOrderDetail.Goods_no && x.Id != inventoryInfo.Id);
                    var SupplyQuantitys = inventoryInfos.Sum(x => x.SupplyQuantity) + inventoryInfo.SupplyQuantity;//计算盘点总数
                    #endregion

                    #region åº“存批次
                    inventory_Batch = _inventory_BatchServices.Repository.QueryFirst(x => x.BatchNo == cabinOrderDetail.Batch_num && x.MaterielCode == cabinOrderDetail.Goods_no);
                    
                    #region å¤„理当前物料批次的库存和批次信息
                    Dt_Inventory_Batch inventory_Batch = inventory_Batchs.First(x => x.BatchNo == inventoryInfo.BatchNo && x.MaterielCode == inventoryInfo.MaterielCode);
                    var SupplyQuantitys = inventoryInfos.Where(x => x.BatchNo == inventoryInfo.BatchNo && x.MaterielCode == inventoryInfo.MaterielCode).Sum(x => x.SupplyQuantity);
                    if (SupplyQuantitys == 0)
                    {
                        foreach (var item in inventoryInfos)
                        foreach (var item in inventoryInfos.Where(x => x.BatchNo == inventoryInfo.BatchNo && x.MaterielCode == inventoryInfo.MaterielCode))
                        {
                            item.StockQuantity += item.SupplyQuantity;
                            if (item.StockQuantity <= 0)
                            {
                                inventoryInfosDel.Add(item);
                                continue;
                            }
                            item.AvailableQuantity = item.StockQuantity;
                            item.SupplyQuantity = 0;
                            item.StockStatus = StockStatusEmun.入库完成.ObjToInt();
                        }
                        inventoryInfo.StockQuantity += inventoryInfo.SupplyQuantity;
                        inventoryInfo.SupplyQuantity = 0;
                        inventoryInfo.StockStatus = StockStatusEmun.入库完成.ObjToInt();
                        //inventoryInfo.StockQuantity += inventoryInfo.SupplyQuantity;
                        //if (inventoryInfo.StockQuantity <= 0)
                        //{
                        //    inventoryInfosDel.Add(inventoryInfo);
                        //    inventoryInfo = null;
                        //}
                        //else
                        //{
                        //    inventoryInfo.AvailableQuantity = inventoryInfo.StockQuantity;
                        //    inventoryInfo.SupplyQuantity = 0;
                        //    inventoryInfo.StockStatus = StockStatusEmun.入库完成.ObjToInt();
                        //}
                    }
                    else
                    {
                        inventory_Batch.SupplyQuantity += SupplyQuantitys;
                    }
                    #endregion

                    #region å¤„理其他库存批次和库存
                    foreach (var detail in cabinOrder.Details.Where(x => x.Id != cabinOrderDetail.Id))
                    {
                        SupplyQuantitys = inventoryInfos.Where(x => x.BatchNo == detail.Batch_num && x.MaterielCode == detail.Goods_no).Sum(x => x.SupplyQuantity);//计算盘点总数
                        inventory_Batch = inventory_Batchs.First(x => x.BatchNo == detail.Batch_num && x.MaterielCode == detail.Goods_no);
                        #region åº“存批次
                        if (SupplyQuantitys == 0)
                        {
                            foreach (var item in inventoryInfos.Where(x => x.BatchNo == detail.Batch_num && x.MaterielCode == detail.Goods_no))
                            {
                                item.StockQuantity += item.SupplyQuantity;
                                if (item.StockQuantity <= 0)
                                {
                                    inventoryInfosDel.Add(item);
                                    continue;
                                }
                                item.AvailableQuantity = item.StockQuantity;
                                item.SupplyQuantity = 0;
                                item.StockStatus = StockStatusEmun.入库完成.ObjToInt();
                            }
                        }
                        else
                        {
                            inventory_Batch.SupplyQuantity += SupplyQuantitys;
                        }
                        #endregion
                    }
                    #endregion
                }
                #endregion
                _unitOfWorkManage.BeginTran();
                #region å¤„理盘点单
                if (supplyTasks.Count < 1)
@@ -315,12 +360,12 @@
                    _deliveryOrderDetailServices.Repository.UpdateData(cabinOrderDetail);
                }
                #endregion
                _inventoryInfoService.UpdateData(inventoryInfo);
                //_inventoryInfoService.UpdateData(inventoryInfo);
                _supplyTaskService.Repository.DeleteAndMoveIntoHty(supplyTask, OperateTypeEnum.自动完成);
                _inventoryInfoService.UpdateData(inventoryInfos);
                _inventory_BatchServices.UpdateData(inventory_Batch);
                if (inventoryInfosDel.Count > 0) _inventoryInfoService.DeleteData(inventoryInfosDel);
                _inventory_BatchServices.UpdateData(inventory_Batchs);
                _unitOfWorkManage.CommitTran();
                #endregion
                content.OK();
            }
            catch (Exception ex)

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

@@ -19,7 +19,7 @@
            _inventoryInfoService = inventoryInfoService;
        }
        //每隔1秒执行一次
        [Invoke(Begin = "2025-11-01", Interval = 1000 * 5, IsEnabled = true, SkipWhileExecuting = true)]
        [Invoke(Begin = "2025-11-01", Interval = 1000 * 10, IsEnabled = true, SkipWhileExecuting = true)]
        public void Run()
        {
            //冷库

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

@@ -20,7 +20,7 @@
        [HttpPost, HttpGet, Route("GetUpstreamOrder"), AllowAnonymous]
        public WebResponseContent GetUpstreamOrder()
        {
            return _business.GetUpstreamOrder();
            return _business.GetInOrder();
        }
        
        /// <summary>

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

@@ -25,9 +25,9 @@
        }

        [HttpPost,Route("GetInventoryList"),AllowAnonymous]
        public WebResponseContent GetInventoryList(string goods_no, string batch_num)
        public WebResponseContent GetInventoryList([FromBody]int[] key)
        {
            return Service.GetInventoryList(goods_no, batch_num);
            return Service.GetInventoryList(key);
        }
    }
}

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

@@ -17,6 +17,7 @@
        [Invoke(Begin = "2025-11-01", Interval = 1000 * 5, IsEnabled = true, SkipWhileExecuting = true)]
        public void Run()
        {
            Thread.Sleep(3000);
            //获取上游出库单数据
            _materielInfoService.ProductSynchronous();
            _business.EdiIn();

 н¨Îļþ¼Ð/WMS/src/extension/outbound/outboundOrder.js

@@ -2,7 +2,7 @@
//此js文件是用来自定义扩展业务代码，可以扩展一些自定义页面或者重新配置生成的代码
import gridBody from './extend/outOrderDetail.vue'
import http from '../../api/http';
import { el } from 'element-plus/es/locales.mjs';
import { el, fa, sw } from 'element-plus/es/locales.mjs';
let extension = {
  components: {
    //查询界面扩展组件
@@ -40,6 +40,14 @@
          });
        }
      }
      // this.detailOptions.buttons.unshift({//这里可以使用push添加最后一个位置
      //   name: '自定义按钮', //按钮名称
      //   icon: 'el-icon-document', //按钮图标:组件示例->图标
      //   //primary、success、warning、error、info、text、danger
      //   type: 'primary',
      //   plain: true,
      //   onClick: () => { }
      // })
    },
    onInited() {
      //框架初始化配置后
@@ -85,22 +93,54 @@
        })
      })
      this.detailOptions.buttons.forEach((btn) => {
        if (btn.name != '添加行') {
          btn.hidden = true;
          //或者设置只读
          //btn.readonly=true;
        if (row.out_type == "20" && row.warehouse_no != "001") {
          btn.hidden = btn.name != '添加行' && btn.name != '自定义按钮'
        } else {
          btn.hidden = true
        }
        // if (row.out_type != "20") {
        //   btn.hidden = true
        // } else {
        //   btn.hidden = btn.name != '添加行'
        // }
        // if (btn.name != '添加行') {
        //   btn.hidden = btn.name != '添加行';
        //   //或者设置只读
        //   //btn.readonly=true;
        // }
      });
      if (row.out_type == "20") {
        this.detail.columns.forEach((x) => {
          if (x.field == "order_Outqty") {
            x.title = "盘点数量",
              x.edit = true
          }
        })
      } else {

      }
      this.detail.columns.forEach((x) => {
        switch (x.field) {
          case "creater":
            x.hidden = (row.out_type != "20" && row.out_type != "215");
            break;
          case "locationCode":
            if (row.warehouse_no != "001" && row.out_type == "20") {
              x.hidden = false
            } else {
              x.hidden = true
            }
          case "exp_date":
            x.hidden = row.out_type == "215" || row.out_type == "20" && row.warehouse_no === "001";
            // x.title = (row.out_type == "20") ? "货位号" : "效期";
            x.edit = row.out_type == "20"
            break;
          case "order_qty":
            x.title = row.out_type == "20" ? "库存数量" : "订单数量";
            x.readonly = row.out_type != "20";
            break;
          case "order_Outqty":
            x.title = row.out_type == "20" ? "盘点数量" : "完成数量";
            x.readonly = row.out_type != "20";
            break;
          case "goods_no":
            x.readonly = row.out_type != "20";
            break;
          case "batch_num":
            x.readonly = row.out_type != "20";
            break;
        }
      })
    }
  }
};

 н¨Îļþ¼Ð/WMS/src/extension/stock/Dt_Inventory_Batch.js

@@ -40,18 +40,19 @@
      }
      let TB = this.buttons.find(x => x.value == 'TB');
      if (TB) {
        TB.onClick = function () {
        TB.onClick = ()=> {
          let rows = this.$refs.table.getSelected();
          if (rows.length == 0) return this.$error("请选择数据!");
          if (rows.length > 1) return this.$error("请选择一条数据!");
          // if (rows.length > 1) return this.$error("请选择一条数据!");

          // èŽ·å–选中行的数据（rows是数组，取第一个元素）
          const selectedRow = rows[0];
          const materielCode = selectedRow.materielCode;
          const batchNo = selectedRow.batchNo;
          const selectedRow = rows.map(item => item.id);
          // const selectedRow = rows.id[0]
          // const materielCode = selectedRow.materielCode;
          // const batchNo = selectedRow.batchNo;

          this.http
            .post(`api/Inventory/GetInventoryList?goods_no=${materielCode}&batch_num=${batchNo}`)
            .post(`api/Inventory/GetInventoryList`,selectedRow)
            .then((x) => {
              if (x.status) {
                this.$Message.success('同步完成');
@@ -70,6 +71,13 @@
      this.buttons.forEach(x => {//name改为要隐藏的按钮名字
        if (x.name == '编 è¾‘') {
          x.name = '调 æ‹¨';
          x.onClick = function () {
            let rows = this.$refs.table.getSelected();
            if (rows.length == 0) return this.$error("请选择数据!");
            if (rows.length > 1) return this.$error("只能选择一条数据")
            let row = rows[0];
            this.edit(row)
          }
        }
      })
    },
@@ -105,7 +113,7 @@
      this.editFormOptions.forEach((editForm) => {
        editForm.forEach((x) => {
          if (x.field == "availableQuantity") {
            

          } else {
            x.readonly = true
          }

 н¨Îļþ¼Ð/WMS/src/views/basic/locationInfo.vue

@@ -38,7 +38,7 @@
      locationStatus: "",
      enableStatus: "",
      remark: "",
      warehouseCode:"",
      warehouseCode: "",
    });
    const editFormOptions = ref([
      [
@@ -48,61 +48,60 @@
        //   type: "select",
        //   required: true,
        //   span: 12,
        //   dataKey:  "warehouseNuber", 
        //   dataKey:  "warehouseNuber",
        //   data: []
        // },
         {
        {
          field: "warehouseCode",
          title: "库房编号",
          type: "select",
          required: true,
          span: 12,
          dataKey:  "warehouseNuber", 
          data: []
          dataKey: "warehouseNuber",
          data: [],
        },
        

        {
          field: "locationCode",
          title: "货位编号",
          type: "string",
          span: 12
        }
          span: 12,
        },
      ],
      [
        {
          field: "locationName",
          title: "货位名称",
          type: "string",
          span: 12
          span: 12,
        },
        {
          field: "roadwayNo",
          title: "巷道编号",
          type: "string",
          span: 12
        }
          span: 12,
        },
      ],
      [
        {
          field: "row",
          title: "货位行",
          type: "int",
          span: 8
          span: 8,
        },
        {
          field: "column",
          title: "货位列",
          type: "int",
          span: 8
          span: 8,
        },
      
      ],
      [
        {
          field: "depth",
          title: "货位深度",
          type: "int",
          span: 12
          span: 12,
        },
        // {
        //   field: "locationType",
@@ -112,12 +111,12 @@
        //   data: [],
        //   dataKey:  "locationTypeEnum",
        // }
          {
        {
          field: "layer",
          title: "货位层",
          type: "int",
          span: 8
        }
          span: 8,
        },
      ],
      [
        {
@@ -126,16 +125,16 @@
          type: "select",
          span: 12,
          data: [],
           dataKey:  "locationStatusEnum",
          dataKey: "locationStatusEnum",
        },
        {
          field: "enableStatus",
          title: "禁用状态",
          type: "select",
          span: 12,
          dataKey:"EnableStatusEnum",
          dataKey: "EnableStatusEnum",
          data: [],
        }
        },
      ],
      // [
      //   {
@@ -157,26 +156,43 @@
      row: "",
      column: "",
      layer: "",
      warehouseCode: ""
      warehouseCode: "",
    });
    const searchFormOptions = ref([
      [
        // { title: "库房编号", field: "warehouseId", type: "select", dataKey:  "warehouseNuber",  data: [] } ,
         { title: "库房编号", field: "warehousecode", type: "select", dataKey:  "warehouseNuber",  data: [] } ,
        {
          title: "库房编号",
          field: "warehousecode",
          type: "select",
          dataKey: "warehouseNuber",
          data: [],
        },
        { title: "货位编号", field: "locationCode", type: "like" },
        { title: "货位名称", field: "locationName", type: "like" },
      ],
      [
        { title: "巷道编号", field: "roadwayNo", type: "like" },
        // { title: "货位类型", field: "locationType", type: "select",  dataKey:  "locationTypeEnum", data: []  },       
        { title: "货位状态", field: "locationStatus", type: "select",  dataKey:  "locationStatusEnum",data: []},
         { title: "禁用状态", field: "enableStatus", type: "select", data: [], dataKey:"status" },
        // { title: "货位类型", field: "locationType", type: "select",  dataKey:  "locationTypeEnum", data: []  },
        {
          title: "货位状态",
          field: "locationStatus",
          type: "select",
          dataKey: "locationStatusEnum",
          data: [],
        },
        {
          title: "禁用状态",
          field: "enableStatus",
          type: "select",
          data: [],
          dataKey: "status",
        },
      ],
      [

        { title: "行", field: "row", type: "int" },
        { title: "列", field: "column", type: "int" },
        { title: "层", field: "layer", type: "int" }
        { title: "层", field: "layer", type: "int" },
      ],
    ]);
    const columns = ref([
@@ -206,7 +222,7 @@
        width: 120,
        align: "left",
        data: [],
        bind: { key: "warehouseNuber", data: [] }
        bind: { key: "warehouseNuber", data: [] },
      },
      {
        field: "locationCode",
@@ -228,6 +244,7 @@
        type: "string",
        width: 100,
        align: "left",
        hidden: true,
      },
      {
        field: "row",
@@ -320,7 +337,7 @@
        width: 160,
        align: "left",
        sort: true,
      }
      },
    ]);
    const detail = ref({
      cnName: "#detailCnName",

 н¨Îļþ¼Ð/WMS/src/views/outbound/outboundOrder.vue

@@ -1,389 +1,400 @@
 
<template>
    <view-grid ref="grid"
               :columns="columns"
               :detail="detail"
               :editFormFields="editFormFields"
               :editFormOptions="editFormOptions"
               :searchFormFields="searchFormFields"
               :searchFormOptions="searchFormOptions"
               :table="table"
               :extend="extend">
    </view-grid>
  <view-grid
    ref="grid"
    :columns="columns"
    :detail="detail"
    :editFormFields="editFormFields"
    :editFormOptions="editFormOptions"
    :searchFormFields="searchFormFields"
    :searchFormOptions="searchFormOptions"
    :table="table"
    :extend="extend"
  >
  </view-grid>
</template>
<script>
    import extend from "@/extension/outbound/outboundOrder.js";
    import { ref, defineComponent } from "vue";
    export default defineComponent({
        setup() {
            const table = ref({
                key: 'id',
                footer: "Foots",
                cnName: '出库单',
                name: 'DeliveryOrder',
                url: "/DeliveryOrder/",
                sortName: "id"
            });
            
            const editFormFields = ref({
                out_no: "",
                out_type: "",
                client_no: "",
                client_name: "",
                warehouse_no: "",
                account_time: "",
                outStatus: "",
            });

            const editFormOptions = ref([
                [
                    {
                        title: "出库单号",
                        field: "out_no",
                        type: "string",
                        required: true,
                        width: 150
                    },
                    {
                        title: "出库单类型",
                        field: "out_type",
                        type: "select",
                        dataKey: "out_type",
                        data: [],
                        required: true,
                        width: 120
                    }
                ],
                [
                    {
                        title: "客户代码",
                        field: "client_no",
                        type: "string",
                        width: 120
                    },
                    {
                        title: "客户名称",
                        field: "client_name",
                        type: "string",
                        width: 150
                    }
                ],
                [
                    {
                        title: "库房号",
                        field: "warehouse_no",
                        type: "select",
                        dataKey: "warehouseNuber",
                        data: [],
                        width: 100
                    },
                    {
                        title: "状态",
                        field: "outStatus",
                        type: "string",
                        dataKey: "outStatus",
                        data: [],
                        width: 120
                    }
                ],
                [
                    {
                        title: "出库记账时间",
                        field: "account_time",
                        type: "datetime",
                        width: 160
                    }
                ]
            ]);
            
            const searchFormFields = ref({
                out_no: "",
                out_type: "",
                client_no: "",
                client_name: "",
                warehouse_no: "",
                outStatus: "",
                account_time: "",
            });
            
            const searchFormOptions = ref([
                [
                    { title: "出库单号", field: "out_no", type: "like" },
                    { title: "客户代码", field: "client_no", type: "like" },
                    { title: "库房号", field: "warehouse_no", type: "select", dataKey: "warehouseNuber", data: [] },
                    {
                        title: "出库单类型",
                        field: "out_type",
                        type: "select",
                        dataKey: "out_type",
                        data: [],
                    },
                ],
                [
                    // {
                    //     title: "状态",
                    //     field: "outStatus",
                    //     type: "select",
                    //     dataKey: "outStatus",
                    //     data: [],
                    // },
                    { title: "客户名称", field: "client_name", type: "like" },
                    { title: "出库记账时间", field: "account_time", type: "datetime" },
                ]
            ]);
            
            const columns = ref([
                {
                    field: 'id',
                    title: '主键',
                    type: 'int',
                    width: 90,
                    hidden: true,
                    readonly: true,
                    require: true,
                    align: 'left'
                },
                {
                    field: 'out_no',
                    title: '出库单号',
                    type: 'string',
                    width: 150,
                    require: true,
                    align: 'left',
                    sort: true,
                    link: true
                },
                {
                    field: 'out_type',
                    title: '出库单类型',
                    type: 'string',
                    width: 120,
                    require: true,
                    align: 'left',
                    bind: { key: "out_type", data: [] }
                },
                {
                    field: 'client_no',
                    title: '客户代码',
                    type: 'string',
                    width: 120,
                    align: 'left'
                },
                {
                    field: 'client_name',
                    title: '客户名称',
                    type: 'string',
                    width: 150,
                    align: 'left'
                },
                {
                    field: 'warehouse_no',
                    title: '库房号',
                    type: 'string',
                    width: 100,
                    align: 'left',
                    bind: { key: "warehouseNuber", data: [] }
                },
                {
                    field: 'account_time',
                    title: '出库记账时间',
                    type: 'datetime',
                    width: 160,
                    align: 'left'
                },
                {
                    field: 'outStatus',
                    title: '状态',
                    type: 'string',
                    width: 120,
                    align: 'left',
                    // bind: { key: "outStatus", data: [] }
                    // edit:{type:""}
                },
                // {
                //     field: 'creater',
                //     title: '创建人',
                //     type: 'string',
                //     width: 90,
                //     align: 'left'
                // },
                {
                    field: 'createDate',
                    title: '创建时间',
                    type: 'datetime',
                    width: 160,
                    align: 'left',
                    sort: true
                },
                // {
                //     field: 'modifier',
                //     title: '修改人',
                //     type: 'string',
                //     width: 100,
                //     align: 'left'
                // },
                {
                    field: 'modifyDate',
                    title: '修改时间',
                    type: 'datetime',
                    width: 160,
                    align: 'left',
                    sort: true
                }
            ]);
            
            const detail = ref({
                cnName: "出库单明细",
                table: "DeliveryOrderDetail",
                url: "/DeliveryOrderDetail/",
                columns: [
                    {
                        field: 'id',
                        title: '主键',
                        type: 'int',
                        width: 90,
                        hidden: true,
                        readonly: true,
                        require: true,
                        align: 'left'
                    },
                    {
                        field: 'deliveryOrderId',
                        title: '关联出库单ID',
                        type: 'int',
                        width: 120,
                        require: true,
                        align: 'left',
                        sort: true,
                        hidden: true
                    },
                    {
                        field: 'reservoirarea',
                        title: '库区',
                        type: 'string',
                        width: 120,
                        align: 'left',
                        bind: { key: "warehouseNuber", data: [] },
                        // edit:{type:""}

                    },
                    {
                        field: "goods_no",
                        title: "物料名称",
                        type: "string",
                        width: 150,
                        align: "left",
                        required: true,
                        // edit:{type:""},
                        bind: { key: "MaterielNames", data: [] },
                    },
                    {
                        field: 'goods_no',
                        title: '药品编码',
                        type: 'string',
                        width: 150,
                        require: true,
                        align: 'left',
                        bind: { key: "medicineGoods", data: [] },
                        // edit:{type:""}
                    },
                    {
                        field: 'order_qty',
                        title: '订单数量',
                        type: 'decimal',
                        width: 100,
                        require: true,
                        align: 'left',
                        // edit:{type:"number"}
                    },
                       {
                        field: 'order_Outqty',
                        title: '完成数量',
                        type: 'decimal',
                        width: 100,
                        require: true,
                        align: 'left',
                        edit:{type:"number"}
                    },
                    {
                        field: 'batch_num',
                        title: '批号',
                        type: 'string',
                        width: 120,
                        require: true,
                        align: 'left',
                        edit:{type:""}
                    },
                    {
                        field: 'exp_date',
                        title: '校期',
                        type: 'string',
                        width: 120,
                        align: 'left',
                        edit:{type:""}
                    },
                    {
                        field: 'ootDetailStatus',
                        title: '状态',
                        type: 'string',
                        width: 120,
                        align: 'left',
                        // edit:{type:""}
                    },
                    {
                        field: 'status',
                        title: '同步状态',
                        type: 'int',
                        width: 120,
                        align: 'left',
                        bind: { key: "syncStatus", data: [] },
                        // edit:{type:'select',dataKey:'syncStatus',data:[]}
                    },
                    {
                        field: 'creater',
                        title: '创建人',
                        type: 'string',
                        width: 90,
                        align: 'left'
                    },
                    {
                        field: 'createDate',
                        title: '创建时间',
                        type: 'datetime',
                        width: 160,
                        align: 'left',
                        sort: true
                    },
                    {
                        field: 'modifier',
                        title: '修改人',
                        type: 'string',
                        width: 100,
                        align: 'left'
                    },
                    {
                        field: 'modifyDate',
                        title: '修改时间',
                        type: 'datetime',
                        width: 160,
                        align: 'left',
                        sort: true
                    }
                ],
                sortName: "id",
                key: "id"
            });
            
            return {
                table,
                extend,
                editFormFields,
                editFormOptions,
                searchFormFields,
                searchFormOptions,
                columns,
                detail,
            };
        },
import extend from "@/extension/outbound/outboundOrder.js";
import { ref, defineComponent } from "vue";
export default defineComponent({
  setup() {
    const table = ref({
      key: "id",
      footer: "Foots",
      cnName: "出库单",
      name: "DeliveryOrder",
      url: "/DeliveryOrder/",
      sortName: "id",
    });

    const editFormFields = ref({
      out_no: "",
      out_type: "",
      client_no: "",
      client_name: "",
      warehouse_no: "",
      account_time: "",
      outStatus: "",
      locationCode: "",
    });

    const editFormOptions = ref([
      [
        {
          title: "出库单号",
          field: "out_no",
          type: "string",
          required: true,
          width: 150,
        },
        {
          title: "出库单类型",
          field: "out_type",
          type: "select",
          dataKey: "out_type",
          data: [],
          required: true,
          width: 120,
        },
      ],
      [
        {
          title: "客户代码",
          field: "client_no",
          type: "string",
          width: 120,
        },
        {
          title: "客户名称",
          field: "client_name",
          type: "string",
          width: 150,
        },
      ],
      [
        {
          title: "库房号",
          field: "warehouse_no",
          type: "select",
          dataKey: "warehouseNuber",
          data: [],
          width: 100,
        },
        {
          title: "状态",
          field: "outStatus",
          type: "string",
          dataKey: "outStatus",
          data: [],
          width: 120,
        },
      ],
    ]);

    const searchFormFields = ref({
      out_no: "",
      out_type: "",
      client_no: "",
      client_name: "",
      warehouse_no: "",
      outStatus: "",
      account_time: "",
    });

    const searchFormOptions = ref([
      [
        { title: "出库单号", field: "out_no", type: "like" },
        { title: "客户代码", field: "client_no", type: "like" },
        {
          title: "库房号",
          field: "warehouse_no",
          type: "select",
          dataKey: "warehouseNuber",
          data: [],
        },
        {
          title: "出库单类型",
          field: "out_type",
          type: "select",
          dataKey: "out_type",
          data: [],
        },
      ],
      [
        // {
        //     title: "状态",
        //     field: "outStatus",
        //     type: "select",
        //     dataKey: "outStatus",
        //     data: [],
        // },
        { title: "客户名称", field: "client_name", type: "like" },
        { title: "出库记账时间", field: "account_time", type: "datetime" },
      ],
    ]);

    const columns = ref([
      {
        field: "id",
        title: "主键",
        type: "int",
        width: 90,
        hidden: true,
        readonly: true,
        require: true,
        align: "left",
      },
      {
        field: "out_no",
        title: "出库单号",
        type: "string",
        width: 150,
        require: true,
        align: "left",
        sort: true,
        link: true,
      },
      {
        field: "out_type",
        title: "出库单类型",
        type: "string",
        width: 120,
        require: true,
        align: "left",
        bind: { key: "out_type", data: [] },
      },
      {
        field: "client_no",
        title: "客户代码",
        type: "string",
        width: 120,
        align: "left",
      },
      {
        field: "client_name",
        title: "客户名称",
        type: "string",
        width: 150,
        align: "left",
      },
      {
        field: "warehouse_no",
        title: "库房号",
        type: "string",
        width: 100,
        align: "left",
        bind: { key: "warehouseNuber", data: [] },
      },
      {
        field: "account_time",
        title: "出库记账时间",
        type: "datetime",
        width: 160,
        align: "left",
      },
      {
        field: "outStatus",
        title: "状态",
        type: "string",
        width: 120,
        align: "left",
        // bind: { key: "outStatus", data: [] }
        // edit:{type:""}
      },
      // {
      //     field: 'creater',
      //     title: '创建人',
      //     type: 'string',
      //     width: 90,
      //     align: 'left'
      // },
      {
        field: "createDate",
        title: "创建时间",
        type: "datetime",
        width: 160,
        align: "left",
        sort: true,
      },
      // {
      //     field: 'modifier',
      //     title: '修改人',
      //     type: 'string',
      //     width: 100,
      //     align: 'left'
      // },
      {
        field: "modifyDate",
        title: "修改时间",
        type: "datetime",
        width: 160,
        align: "left",
        sort: true,
      },
    ]);

    const detail = ref({
      cnName: "出库单明细",
      table: "DeliveryOrderDetail",
      url: "/DeliveryOrderDetail/",
      columns: [
        {
          field: "id",
          title: "主键",
          type: "int",
          width: 90,
          hidden: true,
          readonly: true,
          require: true,
          align: "left",
        },
        {
          field: "deliveryOrderId",
          title: "关联出库单ID",
          type: "int",
          width: 120,
          require: true,
          align: "left",
          sort: true,
          hidden: true,
        },
        {
          field: "reservoirarea",
          title: "库区",
          type: "string",
          width: 120,
          align: "left",
          bind: { key: "warehouseNuber", data: [] },
          hidden: true,
        },
        {
          field: "goods_no",
          title: "物料名称",
          type: "string",
          width: 150,
          align: "left",
          required: true,
          // edit:{type:""},
          bind: { key: "MaterielNames", data: [] },
        },
        {
          field: "goods_no",
          title: "药品编码",
          type: "string",
          width: 150,
          require: true,
          align: "left",
          bind: { key: "medicineGoods", data: [] },
          edit: true,
        },
        {
          field: "order_qty",
          title: "订单数量",
          type: "decimal",
          width: 100,
          require: true,
          align: "left",
          // edit:{type:"number"}
        },
        {
          field: "order_Outqty",
          title: "完成数量",
          type: "decimal",
          width: 100,
          require: true,
          align: "left",
          // edit:{type:"number"}
        },
        {
          field: "batch_num",
          title: "批号",
          type: "string",
          width: 120,
          require: true,
          align: "left",
          edit: true,
        },
        {
          field: "exp_date",
          title: "效期",
          type: "string",
          width: 120,
          align: "left",
          // edit:{type:""}
        },
        {
          field: "locationCode",
          title: "货位号",
          type: "string",
          width: 120,
          align: "left",
          hidden: true,
          edit: true,
        },
        {
          field: "ootDetailStatus",
          title: "状态",
          type: "string",
          width: 120,
          align: "left",
          // edit:{type:""}
        },
        {
          field: "status",
          title: "同步状态",
          type: "int",
          width: 120,
          align: "left",
          bind: { key: "syncStatus", data: [] },
          // edit:{type:'select',dataKey:'syncStatus',data:[]}
        },
        {
          field: "creater",
          title: "创建人",
          type: "string",
          width: 90,
          align: "left",
        },
        {
          field: "createDate",
          title: "创建时间",
          type: "datetime",
          width: 160,
          align: "left",
          sort: true,
        },
        {
          field: "modifier",
          title: "修改人",
          type: "string",
          width: 100,
          align: "left",
          hidden: true,
        },
        {
          field: "modifyDate",
          title: "修改时间",
          type: "datetime",
          width: 160,
          align: "left",
          hidden: true,
          sort: true,
        },
      ],
      sortName: "id",
      key: "id",
    });

    return {
      table,
      extend,
      editFormFields,
      editFormOptions,
      searchFormFields,
      searchFormOptions,
      columns,
      detail,
    };
  },
});
</script>

 н¨Îļþ¼Ð/WMS/src/views/outbound/outboundOrder_Hty.vue

@@ -5,311 +5,322 @@
 *业务请在@/extension/widesea_wcs/order/Dt_OutboundOrder_Hty.js此处编写
 -->
<template>
    <view-grid ref="grid"
               :columns="columns"
               :detail="detail"
               :editFormFields="editFormFields"
               :editFormOptions="editFormOptions"
               :searchFormFields="searchFormFields"
               :searchFormOptions="searchFormOptions"
               :table="table"
               :extend="extend">
    </view-grid>
  <view-grid
    ref="grid"
    :columns="columns"
    :detail="detail"
    :editFormFields="editFormFields"
    :editFormOptions="editFormOptions"
    :searchFormFields="searchFormFields"
    :searchFormOptions="searchFormOptions"
    :table="table"
    :extend="extend"
  >
  </view-grid>
</template>
<script>
    import extend from "@/extension/outbound/outboundOrder_Hty.js";
    import { ref, defineComponent } from "vue";
    export default defineComponent({
        setup() {
            const table = ref({
                key: 'id',
                footer: "Foots",
                cnName: '历史出库单',
                name: 'DeliveryOrderHty',
                url: "/DeliveryOrderHty/",
                sortName: "id"
            });
            const editFormFields = ref({});
            const editFormOptions = ref([]);
            const searchFormFields = ref({
                out_no: "",
                out_type: "",
                client_no: "",
                client_name: "",
                warehouse_no: "",
                outStatus: "",
                account_time: "",
            });
            const searchFormOptions = ref([
                [
                    { title: "出库单号", field: "out_no", type: "like" },
                    { title: "客户代码", field: "client_no", type: "like" },
                    {
                        title: "出库单类型",
                        field: "out_type",
                        type: "select",
                        dataKey: "out_type",
                        data: [],
                    },
                ],
                [
                    {
                        title: "状态",
                        field: "outStatus",
                        type: "select",
                        dataKey: "outStatus",
                        data: [],
                    },
                    { title: "客户名称", field: "client_name", type: "like" },
                    { title: "出库记账时间", field: "account_time", type: "datetime" },
                ]
            ]);
            const columns = ref([
                {
                    field: 'id',
                    title: '历史记录主键',
                    type: 'int',
                    width: 120,
                    hidden: true,
                    readonly: true,
                    require: true,
                    align: 'left'
                },
                {
                    field: 'sourceId',
                    title: '原主键',
                    type: 'int',
                    width: 100,
                    align: 'left'
                },
                {
                    field: 'out_no',
                    title: '出库单号',
                    type: 'string',
                    width: 150,
                    require: true,
                    align: 'left',
                    sort: true,
                    link: true
                },
                {
                    field: 'out_type',
                    title: '出库单类型',
                    type: 'string',
                    width: 120,
                    require: true,
                    align: 'left',
                    bind: { key: "out_type", data: [] }
                },
                {
                    field: 'client_no',
                    title: '客户代码',
                    type: 'string',
                    width: 120,
                    align: 'left'
                },
                {
                    field: 'client_name',
                    title: '客户名称',
                    type: 'string',
                    width: 150,
                    align: 'left'
                },
                {
                    field: 'warehouse_no',
                    title: '库发号',
                    type: 'string',
                    width: 100,
                    align: 'left',
                    bind: { key: "warehouseNuber", data: [] }
                },
                {
                    field: 'account_time',
                    title: '出库记账时间',
                    type: 'datetime',
                    width: 160,
                    align: 'left'
                },
                {
                    field: 'outStatus',
                    title: '头标状态',
                    type: 'string',
                    width: 120,
                    align: 'left',
                    bind: { key: "outStatus", data: [] }
                },
                // {
                //     field: 'creater',
                //     title: '创建人',
                //     type: 'string',
                //     width: 90,
                //     align: 'left'
                // },
                {
                    field: 'createDate',
                    title: '创建时间',
                    type: 'datetime',
                    width: 160,
                    align: 'left',
                    sort: true
                },
                // {
                //     field: 'modifier',
                //     title: '修改人',
                //     type: 'string',
                //     width: 100,
                //     align: 'left'
                // },
                // {
                //     field: 'modifyDate',
                //     title: '修改时间',
                //     type: 'datetime',
                //     width: 160,
                //     align: 'left',
                //     sort: true
                // }
            ]);
            const detail = ref({
                cnName: "历史出库单明细",
                table: "DtDeliveryOrderDetailHty",
                columns: [
                    {
                        field: 'id',
                        title: '历史记录主键',
                        type: 'int',
                        width: 120,
                        hidden: true,
                        readonly: true,
                        require: true,
                        align: 'left'
                    },
                    {
                        field: 'sourceId',
                        title: '原主键',
                        type: 'int',
                        width: 100,
                        align: 'left'
                    },
                    // {
                    //     field: 'deliveryOrderId',
                    //     title: '关联出库单ID',
                    //     type: 'int',
                    //     width: 120,
                    //     require: true,
                    //     align: 'left',
                    //     sort: true,
                    //     hidden: true
                    // },
                    {
                        field: 'reservoirarea',
                        title: '库区',
                        type: 'string',
                        width: 120,
                        align: 'left',
                        bind: { key: "warehouseNuber", data: [] }
                    },
                        {
                        field: "goods_no",
                        title: "物料名称",
                        type: "string",
                        width: 150,
                        align: "left",
                        required: true,
                        edit:{type:""},
                        bind: { key: "MaterielNames", data: [] },
                    },
                    {
                        field: 'goods_no',
                        title: '药品编码',
                        type: 'string',
                        width: 150,
                        require: true,
                        align: 'left',
                        bind: { key: "medicineGoods", data: [] }
                    },
                    {
                        field: 'order_qty',
                        title: '订单数量',
                        type: 'decimal',
                        width: 100,
                        require: true,
                        align: 'left'
                    },
                    {
                        field: 'batch_num',
                        title: '批号',
                        type: 'string',
                        width: 120,
                        require: true,
                        align: 'left'
                    },
                    {
                        field: 'exp_date',
                        title: '校期',
                        type: 'string',
                        width: 120,
                        align: 'left'
                    },
                    {
                        field: 'ootDetailStatus',
                        title: '状态',
                        type: 'string',
                        width: 120,
                        align: 'left',
                        bind: { key: "ootDetailStatus", data: [] }
                    },
                    {
                        field: 'status',
                        title: '同步状态',
                        type: 'int',
                        width: 120,
                        align: 'left',
                        bind: { key: "syncStatus", data: [] }
                    },
                    {
                        field: 'creater',
                        title: '创建人',
                        type: 'string',
                        width: 90,
                        align: 'left'
                    },
                    {
                        field: 'createDate',
                        title: '创建时间',
                        type: 'datetime',
                        width: 160,
                        align: 'left',
                        sort: true
                    },
                    {
                        field: 'modifier',
                        title: '修改人',
                        type: 'string',
                        width: 100,
                        align: 'left'
                    },
                    {
                        field: 'modifyDate',
                        title: '修改时间',
                        type: 'datetime',
                        width: 160,
                        align: 'left',
                        sort: true
                    }
                ],
                sortName: "id",
                key: "id"
            });
            return {
                table,
                extend,
                editFormFields,
                editFormOptions,
                searchFormFields,
                searchFormOptions,
                columns,
                detail,
            };
        },
import extend from "@/extension/outbound/outboundOrder_Hty.js";
import { ref, defineComponent } from "vue";
export default defineComponent({
  setup() {
    const table = ref({
      key: "id",
      footer: "Foots",
      cnName: "历史出库单",
      name: "DeliveryOrderHty",
      url: "/DeliveryOrderHty/",
      sortName: "id",
    });
    const editFormFields = ref({});
    const editFormOptions = ref([]);
    const searchFormFields = ref({
      out_no: "",
      out_type: "",
      client_no: "",
      client_name: "",
      warehouse_no: "",
      outStatus: "",
      account_time: "",
    });
    const searchFormOptions = ref([
      [
        { title: "出库单号", field: "out_no", type: "like" },
        { title: "客户代码", field: "client_no", type: "like" },
        {
          title: "出库单类型",
          field: "out_type",
          type: "select",
          dataKey: "out_type",
          data: [],
        },
      ],
      [
        {
          title: "状态",
          field: "outStatus",
          type: "select",
          dataKey: "outStatus",
          data: [],
        },
        { title: "客户名称", field: "client_name", type: "like" },
        { title: "出库记账时间", field: "account_time", type: "datetime" },
      ],
    ]);
    const columns = ref([
      {
        field: "id",
        title: "历史记录主键",
        type: "int",
        width: 120,
        hidden: true,
        readonly: true,
        require: true,
        align: "left",
      },
      {
        field: "sourceId",
        title: "原主键",
        type: "int",
        width: 100,
        align: "left",
      },
      {
        field: "out_no",
        title: "出库单号",
        type: "string",
        width: 150,
        require: true,
        align: "left",
        sort: true,
        link: true,
      },
      {
        field: "out_type",
        title: "出库单类型",
        type: "string",
        width: 120,
        require: true,
        align: "left",
        bind: { key: "out_type", data: [] },
      },
      {
        field: "client_no",
        title: "客户代码",
        type: "string",
        width: 120,
        align: "left",
      },
      {
        field: "client_name",
        title: "客户名称",
        type: "string",
        width: 150,
        align: "left",
      },
      {
        field: "warehouse_no",
        title: "库发号",
        type: "string",
        width: 100,
        align: "left",
        bind: { key: "warehouseNuber", data: [] },
      },
      {
        field: "account_time",
        title: "出库记账时间",
        type: "datetime",
        width: 160,
        align: "left",
      },
      {
        field: "outStatus",
        title: "头标状态",
        type: "string",
        width: 120,
        align: "left",
        bind: { key: "outStatus", data: [] },
      },
      // {
      //     field: 'creater',
      //     title: '创建人',
      //     type: 'string',
      //     width: 90,
      //     align: 'left'
      // },
      {
        field: "createDate",
        title: "创建时间",
        type: "datetime",
        width: 160,
        align: "left",
        sort: true,
      },
      // {
      //     field: 'modifier',
      //     title: '修改人',
      //     type: 'string',
      //     width: 100,
      //     align: 'left'
      // },
      // {
      //     field: 'modifyDate',
      //     title: '修改时间',
      //     type: 'datetime',
      //     width: 160,
      //     align: 'left',
      //     sort: true
      // }
    ]);
    const detail = ref({
      cnName: "历史出库单明细",
      table: "DtDeliveryOrderDetailHty",
      columns: [
        {
          field: "id",
          title: "历史记录主键",
          type: "int",
          width: 120,
          hidden: true,
          readonly: true,
          require: true,
          align: "left",
        },
        {
          field: "sourceId",
          title: "原主键",
          type: "int",
          width: 100,
          align: "left",
        },
        // {
        //     field: 'deliveryOrderId',
        //     title: '关联出库单ID',
        //     type: 'int',
        //     width: 120,
        //     require: true,
        //     align: 'left',
        //     sort: true,
        //     hidden: true
        // },
        {
          field: "reservoirarea",
          title: "库区",
          type: "string",
          width: 120,
          align: "left",
          bind: { key: "warehouseNuber", data: [] },
        },
        {
          field: "goods_no",
          title: "物料名称",
          type: "string",
          width: 150,
          align: "left",
          required: true,
          edit: { type: "" },
          bind: { key: "MaterielNames", data: [] },
        },
        {
          field: "goods_no",
          title: "药品编码",
          type: "string",
          width: 150,
          require: true,
          align: "left",
          bind: { key: "medicineGoods", data: [] },
        },
        {
          field: "order_qty",
          title: "订单数量",
          type: "decimal",
          width: 100,
          require: true,
          align: "left",
        },
        {
          field: "order_Outqty",
          title: "完成数量",
          type: "decimal",
          width: 100,
          require: true,
          align: "left",
          // edit:{type:"number"}
        },
        {
          field: "batch_num",
          title: "批号",
          type: "string",
          width: 120,
          require: true,
          align: "left",
        },
        {
          field: "exp_date",
          title: "校期",
          type: "string",
          width: 120,
          align: "left",
        },
        {
          field: "ootDetailStatus",
          title: "状态",
          type: "string",
          width: 120,
          align: "left",
          bind: { key: "ootDetailStatus", data: [] },
        },
        {
          field: "status",
          title: "同步状态",
          type: "int",
          width: 120,
          align: "left",
          bind: { key: "syncStatus", data: [] },
        },
        {
          field: "creater",
          title: "创建人",
          type: "string",
          width: 90,
          align: "left",
        },
        {
          field: "createDate",
          title: "创建时间",
          type: "datetime",
          width: 160,
          align: "left",
          sort: true,
        },
        {
          field: "modifier",
          title: "修改人",
          type: "string",
          width: 100,
          align: "left",
        },
        {
          field: "modifyDate",
          title: "修改时间",
          type: "datetime",
          width: 160,
          align: "left",
          sort: true,
        },
      ],
      sortName: "id",
      key: "id",
    });
    return {
      table,
      extend,
      editFormFields,
      editFormOptions,
      searchFormFields,
      searchFormOptions,
      columns,
      detail,
    };
  },
});
</script>

 н¨Îļþ¼Ð/WMS/src/views/stock/stockInfo.vue

@@ -131,6 +131,7 @@
          title: "盘点差异数",
          type: "number",
          span: 8

        },
        
      ],
@@ -331,6 +332,17 @@
        type: "number",
        width: 100,
        align: "left",
         cellStyle: (row) => {
          const value = row.supplyQuantity;
          if (value > 0) {
            return { color: "#00ff00" }; // ç»¿è‰²
          } else if (value < 0) {
            return { color: "#ff0000" }; // çº¢è‰²
          }
          // else {
          //   return { color: '#000000' }; // é»‘色
          // }
        },
      },
      {
        field: "inDate",