Merge branch 'htq20251215' of http://115.159.85.185:8098/r/ZhongRui/ALDbany...

647556386

2026-03-19 c17d401cd7aa87f9c1adc25733a74da6a8a210e7

Merge branch 'htq20251215' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu into htq20251215

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

@@ -26,21 +26,17 @@
      orderStatus: "",
      warehouseId: "",
      supplierId: "",
      createType: "",
      isTestMaterials: "",
      operator: "",
    });
    const editFormOptions = ref([
      [
        {
          title: "单据类型",
          required: true,
          field: "orderType",
          type: "select",
          dataKey: "inOrderType",
          data: [],
        },
        {
          field: "inboundOrderNo",
          title: "单据编号",
          type: "string",
          readonly: true,
        },
        {
          title: "上游单据编号",
@@ -53,6 +49,29 @@
          type: "textarea",
        },
      ],
      [
        {
          title: "业务类型",
          field: "businessType",
          type: "select",
          dataKey: "businessType",
          data: [],
          require: true,
        },
        {
          title: "是否分批",
          field: "isBatch",
          type: "select",
          dataKey: "enable",
          data: [],
          require: true,
        },
        {
          title: "厂区",
          field: "factoryArea",
          type: "string",
        },
      ]
    ]);
    const searchFormFields = ref({
      inboundOrderNo: "",
@@ -254,7 +273,8 @@
          type: "string",
          width: 150,
          align: "left",
          bind: { key: "materielInfo", data: [] },
          edit: { type: "" },
          required: true,
        },
        {
          field: "batchNo",
@@ -297,7 +317,7 @@
          type: "decimal",
          width: 90,
          align: "left",
          required: true,
          edit: { type: "" },
        },
        {
          field: "orderQuantity",
@@ -309,6 +329,24 @@
          required: true,
        },
        {
          field: "barcodeQty",
          title: "条码数量",
          type: "decimal",
          width: 90,
          align: "left",
          edit: { type: "number" },
          required: true,
        },
        {
          field: "barcodeUnit",
          title: "条码单位",
          type: "string",
          width: 90,
          align: "left",
          edit: { type: "" },
          required: true,
        },
        {
          field: "receiptQuantity",
          title: "组盘数量",
          type: "int",

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

@@ -195,6 +195,10 @@
                {
                    return content.Error($"该单据为试产物料，需要入库到试产仓，请重新根据厂区选择试产仓库进行组盘入库");
                }
                if (inboundOrder.IsTestMaterials == 0 && (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_InboundOrderDetail.cs

@@ -1,6 +1,7 @@
using SqlSugar;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
@@ -65,7 +66,7 @@
        /// <summary>
        /// è®¢å•æ˜Žç»†çŠ¶æ€
        /// </summary>
        [SugarColumn(IsNullable = false, ColumnDescription = "订单明细状态")]
        [SugarColumn(IsNullable = false, ColumnDescription = "订单明细状态", DefaultValue = "0")]
        public int OrderDetailStatus { get; set; }

        /// <summary>
@@ -77,14 +78,14 @@
        /// <summary>
        /// æ”¶è´§å•æ˜Žç»†è¡Œå·
        /// </summary>
        [SugarColumn(IsNullable = false, ColumnDescription = "收货单明细行号")]
        [SugarColumn(IsNullable = false, ColumnDescription = "收货单明细行号", DefaultValue = "0")]
        public int RowNo { get; set; }

        /// <summary>
        /// è¡Œå·
        /// é»˜è®¤å€¼:
        ///</summary>
        [SugarColumn(ColumnName = "lineNo", ColumnDescription = "行号")]
        [SugarColumn(ColumnName = "lineNo", ColumnDescription = "行号", DefaultValue = "0")]
        public string? lineNo { get; set; }

        /// <summary>
@@ -98,7 +99,7 @@
        /// ä»“库
        /// é»˜è®¤å€¼:
        ///</summary>
        [SugarColumn(ColumnName = "warehouseCode", ColumnDescription = "仓库")]
        [SugarColumn(ColumnName = "warehouseCode", ColumnDescription = "仓库", DefaultValue = "")]
        public string? WarehouseCode { get; set; }

        /// <summary>
@@ -112,7 +113,7 @@
        /// å¤–箱条码
        /// é»˜è®¤å€¼:
        ///</summary>
        [SugarColumn(ColumnName = "outBoxbarcodes", ColumnDescription = "外箱条码")]
        [SugarColumn(ColumnName = "outBoxbarcodes", ColumnDescription = "外箱条码", DefaultValue = "")]
        public string? OutBoxbarcodes { get; set; }

        /// <summary>
@@ -144,6 +145,7 @@
        /// <summary>
        /// è™šæ‹Ÿå‡ºå…¥åº“数量
        /// </summary>
        [SugarColumn(IsNullable = true, ColumnDescription = "虚拟出入库数量")]
        public decimal NoStockOutQty { get; set; }

        /// <summary>