1

647556386

2026-01-28 9fb542290b866abad4ce7098609bbb799081ba15

1

 ÏîÄ¿´úÂë/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue

@@ -181,6 +181,12 @@
        align: "left"
      },
      {
        field: "isTestMaterials",
        title: "是否试产",
        width: 120,
        bind: { key: "isTestMaterials", data: [{ key: 0, value: "非试产物料" }, { key: 1, value: "试产物料" }] },
      },
      {
        field: "creater",
        title: "创建人",
        type: "string",

 ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_DTO/Inbound/InboundOrderAddDTO.cs

@@ -132,6 +132,8 @@

        public string factoryArea { get; set; }

        public int isTestMaterials { get; set; }

        public List<InBoundDetailsModel> details { get; set; }

    }
@@ -171,7 +173,6 @@
        public int status { get; set; }

        public string factoryArea { get; set; }

        public List<FeedbackInboundDetailsModel> details { get; set; }

    }

 ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_InboundService/InboundService.cs

@@ -18,6 +18,7 @@
using WIDESEA_Common.CommonEnum;
using WIDESEA_Common.OrderEnum;
using WIDESEA_Common.StockEnum;
using WIDESEA_Common.WareHouseEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.Helper;
@@ -172,6 +173,11 @@
                {
                    return content.Error($"一个采购单据里面不允许组盘两个仓库，请重新选择仓库，上一个组盘仓库为{isWarehouse.WarehouseCode}");
                }

                if (inboundOrder.BusinessType == "11" && inboundOrder.IsTestMaterials == 1 && (palletDto.WarehouseType != "1076" || palletDto.WarehouseType != "5057"))
                {
                    return content.Error($"该单据为试产物料，需要入库到试产仓，请重新根据厂区选择试产仓库进行组盘入库");
                }
                if (!_locationInfoService.QueryLocationCount(Convert.ToInt32(palletDto.locationType)))
                {
                    return content.Error($"该库区{palletDto.locationType}不存在空闲库位");

 ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_Model/Models/Inbound/Dt_InboundOrder.cs

@@ -81,6 +81,13 @@
        public int IsBatch { get; set; }

        /// <summary>
        /// å¤‡  æ³¨:是否试产
        /// é»˜è®¤å€¼:
        ///</summary>
        [SugarColumn(ColumnName = "isTestMaterials", ColumnDescription = "是否试产")]
        public int IsTestMaterials { get; set; }

        /// <summary>
        /// å¤‡  æ³¨:厂区
        /// é»˜è®¤å€¼:
        ///</summary>

 ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderController.cs

@@ -202,7 +202,7 @@
                dt_InboundOrder.IsBatch = item.isBatch;
                dt_InboundOrder.FactoryArea = item.factoryArea;
                dt_InboundOrder.CreateType = OrderCreateTypeEnum.UpperSystemPush.ObjToInt();

                dt_InboundOrder.IsTestMaterials = item.isTestMaterials;
                inboundOrders.Add(dt_InboundOrder);
            }