代码提交

heshaofeng

2025-11-27 8c5d68acc8c7ae8d04a0eae155db62f6562ce0be

代码提交

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

@@ -37,7 +37,7 @@
      key: "id",
      footer: "Foots",
      cnName: "调拨单",
      name: "Dt_AllocateOrder",
      name: "AllocateOrder",
      url: "/AllocateOrder/",
      sortName: "id",
    });

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

@@ -37,9 +37,9 @@
    const table = ref({
      key: "id",
      footer: "Foots",
      cnName: "调拨单(智仓调外部仓库)",
      name: "inboundOrder",
      url: "/InboundOrder/",
      cnName: "调拨单(外部仓调入智仓)",
      name: "AllocateOrder",
      url: "/AllocateOrder/",
      sortName: "id",
    });
    const editFormFields = ref({

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

@@ -245,7 +245,7 @@
          field: "materielCode",
          title: "物料编号",
          type: "select",
          width: 150,
          width: 120,
          align: "left",
          edit: { type: "" },
          required: true,
@@ -254,7 +254,7 @@
          field: "materielCode",
          title: "物料名称",
          type: "string",
          width: 100,
          width: 120,
          align: "left",
          bind: { key: "MaterielNames", data: [] },
        },
@@ -262,7 +262,7 @@
          field: "batchNo",
          title: "批次号",
          type: "decimal",
          width: 90,
          width: 150,
          align: "left",
          edit: { type: "" },
          required: true,
@@ -271,7 +271,7 @@
          field: "supplyCode",
          title: "供应商编号",
          type: "decimal",
          width: 90,
          width: 100,
          align: "left",
          edit: { type: "" },
          required: true,
@@ -288,7 +288,7 @@
          field: "barcode",
          title: "条码",
          type: "decimal",
          width: 90,
          width: 180,
          align: "left",
          edit: { type: "" },
          required: true,
@@ -306,21 +306,21 @@
          field: "receiptQuantity",
          title: "组盘数量",
          type: "int",
          width: 120,
          width: 90,
          align: "left",
        },
        {
          field: "overInQuantity",
          title: "上架数量",
          type: "string",
          width: 200,
          width: 90,
          align: "left",
        },
        {
          field: "orderDetailStatus",
          title: "订单明细状态",
          type: "string",
          width: 180,
          width: 100,
          align: "left",
          bind: { key: "orderDetailStatusEnum", data: [] },
        },

 ÏîÄ¿´úÂë/WIDESEA_WMSClient/src/views/outbound/allocateoutboundOrder.vue

@@ -38,7 +38,7 @@
    const table = ref({
      key: "id",
      footer: "Foots",
      cnName: "调拨单(外部仓库调智仓)",
      cnName: "调拨单(智仓调出外部仓)",
      name: "outboundOrder",
      url: "/OutboundOrder/",
      sortName: "id",

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

@@ -1,5 +1,6 @@
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
using System.Data.Common;
using System.Diagnostics.Eventing.Reader;
using System.Threading.Tasks;
@@ -33,6 +34,7 @@
        [HttpPost, Route("ReceiveAllocateOrder"), MethodParamsValidate, AllowAnonymous]
        public async Task<WebResponseContent> ReceiveAllocateOrder([FromBody] AllocateDto model)
        {
            _logger.LogInformation("AllocateOrderController ReceiveAllocateOrder:  " + JsonConvert.SerializeObject(model));
            Dt_AllocateOrder allocateOrder = new Dt_AllocateOrder
            {
                OrderNo = model.OrderNo,
@@ -41,12 +43,20 @@
                FactoryArea = model.FactoryArea,
                IsBatch = model.IsBatch,
                CreateType = model.OperationType,
                FromWarehouse=model.fromWarehouse,
                ToWarehouse=model.toWarehouse,                
                FromWarehouse = model.fromWarehouse,
                ToWarehouse = model.toWarehouse,
                Details = new List<Dt_AllocateOrderDetail>()
            };
            Enum.TryParse<BusinessTypeEnum>(allocateOrder.BusinessType, out var businessType);

            //allocateOrder.OrderType = businessType == BusinessTypeEnum.智仓调外部仓库 ? 215 : 115;
            if (businessType == BusinessTypeEnum.智仓调外部仓库)
            {
                allocateOrder.OrderType = 115;
            }
            else if (businessType == BusinessTypeEnum.外部仓库调智仓)
            {
                allocateOrder.OrderType = 215;
            }

            foreach (var detailDto in model.Details)
            {
@@ -70,7 +80,7 @@
                            BatchNo = barcodeDto.BatchNo,
                            BarcodeQty = barcodeDto.Qty,
                            BarcodeUnit = barcodeDto.Unit,
                            ValidDate=barcodeDto.validDate,
                            ValidDate = barcodeDto.validDate,

                        };
                        allocateOrder.Details.Add(orderDetail);