更新

wangxinhui

2025-02-07 f82745d3308c70ed787cbbf00652e2577e2c4218

更新

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/4ef9aa26-983d-4be3-b9d9-b250c0540681.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/7af258a1-75ee-4cab-a966-eaa9df544e99.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/9dd1bf7a-dee2-4f6e-8ac4-0b6e1e963918.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/a20853b2-b367-47ed-92fc-476646f17c71.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/c7c4fe2b-1337-4db8-9421-77da433aa08c.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue

@@ -225,12 +225,19 @@
          required: true,
        },
        {
          field: "materielCode",
          field: "materielName",
          title: "物料名称",
          type: "string",
          width: 100,
          align: "left",
          bind: { key: "MaterielNames", data: [] },
        },
        {
          field: "materielSpec",
          title: "物料规格",
          type: "select",
          type: "string",
          width: 100,
          align: "left",
        },
        {
          field: "batchNo",

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/views/inbound/purchaseOrder.vue

@@ -221,6 +221,14 @@
          width: 100,
          align: "left"
        },
        {
          field: "materielSpec",
          title: "物料规格",
          type: "select",
          type: "string",
          width: 100,
          align: "left",
        },
        // {
        //   field: "batchNo",
        //   title: "批次号",

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/views/inbound/receiveOrder.vue

@@ -274,6 +274,14 @@
          align: "left",
        },
        {
          field: "materielSpec",
          title: "物料规格",
          type: "select",
          type: "string",
          width: 100,
          align: "left",
        },
        {
          field: "lotNo",
          title: "批次号",
          type: "decimal",

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/1f069ca3-0197-4b08-8580-6ad491643add.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/2a0d6254-87a5-4e06-8f11-a55bef72e58d.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_DTO/Stock/StockViewDTO.cs

@@ -105,6 +105,18 @@
        public string MaterielCode { get; set; }

        /// <summary>
        /// ç‰©æ–™åç§°
        /// </summary>
        [ExporterHeader(DisplayName = "物料名称")]
        public string MaterielName { get; set; }

        /// <summary>
        /// ç‰©æ–™è§„æ ¼
        /// </summary>
        [ExporterHeader(DisplayName = "物料规格")]
        public string MaterielSpec { get; set; }

        /// <summary>
        /// ç‰©æ–™æ‰¹å·
        /// </summary>
        [ExporterHeader(DisplayName = "物料批号")]

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

@@ -362,6 +362,7 @@
                        BatchNo = model.LotNo,
                        MaterielCode = materielInfo.MaterielCode,
                        MaterielName = materielInfo.MaterielName,
                        MaterielSpec=materielInfo.MaterielSpec,
                        OrderNo = inboundOrder.InboundOrderNo,
                        SerialNumber = model.SerialNumber,
                        StockQuantity = model.Quantity,
@@ -469,6 +470,7 @@
                        BatchNo = model.LotNo,
                        MaterielCode = materielInfo.MaterielCode,
                        MaterielName = materielInfo.MaterielName,
                        MaterielSpec = materielInfo.MaterielSpec,
                        SerialNumber = model.SerialNumber,
                        StockQuantity = model.Quantity,
                        OutboundQuantity = 0,
@@ -649,6 +651,7 @@
                        BatchNo = model.LotNo,
                        MaterielCode = materielInfo.MaterielCode,
                        MaterielName = materielInfo.MaterielName,
                        MaterielSpec = materielInfo.MaterielSpec,
                        OrderNo = inboundOrder.InboundOrderNo,
                        SerialNumber = model.SerialNumber,
                        StockQuantity = model.Quantity,
@@ -791,6 +794,7 @@
                        BatchNo = model.LotNo,
                        MaterielCode = materielInfo.MaterielCode,
                        MaterielName = materielInfo.MaterielName,
                        MaterielSpec = materielInfo.MaterielSpec,
                        OrderNo = "",
                        SerialNumber = model.SerialNumber,
                        StockQuantity = model.Quantity,

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

@@ -99,6 +99,7 @@
                    {
                        MaterielCode = item.MCode,
                        MaterielName = materielInfo.MaterielName,
                        MaterielSpec = materielInfo.MaterielSpec,
                        PurchaseDetailQuantity = item.Qty,
                        PurchaseDetailReceiveQty = 0,
                        PurchaseDetailStatus = PurchaseOrderDetailStatusEnum.NotReceived.ObjToInt(),

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

@@ -150,6 +150,7 @@
                            MaterielCode = model.MaterielCode,
                            LotNo = model.LotNo,
                            MaterielName=materielInfo.MaterielName,
                            MaterielSpec=materielInfo.MaterielSpec,
                            ReceiveOrderId = receiveOrder.ReceiveOrderId,
                            PurchaseOrderDetailRowNo = purchaseOrderDetail.RowNo,
                            IfInspection = materielInfo.IsCheck.ObjToInt(),

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

@@ -263,6 +263,7 @@
                    {
                        MaterielCode = item.MaterielCode,
                        MaterielName = materielCodeInfos.FirstOrDefault(x => x.MaterielCode == item.MaterielCode)?.MaterielName ?? "",
                        MaterielSpec= materielCodeInfos.FirstOrDefault(x => x.MaterielCode == item.MaterielCode)?.MaterielSpec ?? "",
                        OrderDetailStatus = OrderDetailStatusEnum.New.ObjToInt(),
                        OrderQuantity = quantity,
                        OverInQuantity = 0,

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Inbound/Dt_InboundOrderDetail.cs

@@ -45,6 +45,12 @@
        public string BatchNo { get; set; }

        /// <summary>
        /// ç‰©æ–™è§„æ ¼
        /// </summary>
        [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "物料规格")]
        public string MaterielSpec { get; set; }

        /// <summary>
        /// å•æ®æ•°é‡
        /// </summary>
        [SugarColumn(IsNullable = false, ColumnDescription = "单据数量")]

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Inbound/Dt_PurchaseOrderDetail.cs

@@ -40,6 +40,12 @@
        public string MaterielCode { get; set; }

        /// <summary>
        /// ç‰©æ–™è§„æ ¼
        /// </summary>
        [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "物料规格")]
        public string MaterielSpec { get; set; }

        /// <summary>
        /// é‡‡è´­å•æ˜Žç»†çŠ¶æ€
        /// </summary>
        [SugarColumn(IsNullable = false, ColumnDescription = "采购单明细状态")]

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Inbound/Dt_ReceiveOrderDetail.cs

@@ -103,5 +103,11 @@
        /// </summary>
        [SugarColumn(IsNullable = true, Length = 100, ColumnDescription = "物料名称")]
        public string MaterielName { get; set; }

        /// <summary>
        /// ç‰©æ–™è§„æ ¼
        /// </summary>
        [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "物料规格")]
        public string MaterielSpec { get; set; }
    }
}

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Stock/Dt_StockInfoDetail.cs

@@ -38,6 +38,13 @@
        [SugarColumn(IsNullable = false, Length = 200, ColumnDescription = "物料名称")]
        public string MaterielName { get; set; }


        /// <summary>
        /// ç‰©æ–™è§„æ ¼
        /// </summary>
        [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "物料规格")]
        public string MaterielSpec { get; set; }

        /// <summary>
        /// å•æ®ç¼–号
        /// </summary>

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs

@@ -71,7 +71,13 @@
                    return WebResponseContent.Instance.Error($"{upperOrderNo}领料单号已存在");
                }
            }
            saveModel.DetailData[0].Add("orderDetailStatus", OrderDetailStatusEnum.New.ObjToInt());
            if (saveModel.DetailData.Count>0)
            {
                for (int i = 0; i < saveModel.DetailData.Count; i++)
                {
                    saveModel.DetailData[i].Add("orderDetailStatus", OrderDetailStatusEnum.New.ObjToInt());
                }
            }
            return base.AddData(saveModel);
        }
        public WebResponseContent GetOutboundOrders(SaveModel saveModel)

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_StockRepository/StockInfoRepository.cs

@@ -69,7 +69,7 @@
        {
            if (!string.IsNullOrEmpty(lotNo))
            {
                return Db.Queryable<Dt_StockInfo>().Where(x => locationCodes.Contains(x.LocationCode)).Includes(x => x.Details).Where(x => x.Details.OrderBy(x=>x.EffectiveDate).Any(v => v.MaterielCode == materielCode && v.BatchNo == lotNo)).ToList();
                return Db.Queryable<Dt_StockInfo>().Where(x => locationCodes.Contains(x.LocationCode)).Includes(x => x.Details).Where(x => x.Details.Any(v => v.MaterielCode == materielCode && v.BatchNo == lotNo)).ToList();
            }
            else
            {

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_StockService/StockViewService.cs

@@ -146,6 +146,8 @@
                {
                    x.MaterielCode = string.Join(",", x.Details.Select(x => x.MaterielCode).Distinct());
                    x.BatchNo = string.Join(",", x.Details.Select(x => x.BatchNo).Distinct());
                    x.MaterielSpec = x.Details.FirstOrDefault()?.MaterielSpec ?? "";
                    x.MaterielName = x.Details.FirstOrDefault()?.MaterielName ?? "";
                }
                );
                return new PageGridData<StockViewDTO>(totalCount + pktotalCount, stockViewDTOs);
@@ -288,6 +290,8 @@
                    x.MaterielCode = (string.Join(",", x.Details.Select(x => x.MaterielCode).Distinct())) ?? "空箱";
                    x.BatchNo = (string.Join(",", x.Details.Select(x => x.BatchNo).Distinct())) ?? "无";
                    x.StockCounts = x.Details.Sum(x => x.StockQuantity).ToString() + x.Details.FirstOrDefault()?.Unit;
                    x.MaterielSpec= x.Details.FirstOrDefault()?.MaterielSpec ?? "";
                    x.MaterielName= x.Details.FirstOrDefault()?.MaterielName ?? "";
                }
                );