提交

heshaofeng

2025-11-11 a8c315dc781efcf605546c92468adc58020692c5

提交

 .gitignore

@@ -276,3 +276,6 @@
项目代码/WMS无仓储版/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.1091.29919/SemanticSymbols.db-wal
项目代码/WIDESEA_WMSClient/public/webconfig.js
项目代码/WIDESEA_WMSClient/public/webconfig.js
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Outbound.cs
项目代码/WIDESEA_WMSClient/src/api/http.js

 ÏîÄ¿´úÂë/WIDESEA_WMSClient/src/api/http.js

@@ -1,4 +1,5 @@
import axios from 'axios'

 import axios from 'axios'
import store from '../store/index'
// import {getCurrentInstance} from 'vue'
import { useRouter, useRoute } from 'vue-router'

 ÏîÄ¿´úÂë/WIDESEA_WMSClient/src/extension/outbound/extend/outOrderDetail.vue

@@ -154,6 +154,12 @@
          width: 90,
        },
        {
          prop: "supplyCode",
          title: "供应商编号",
          type: "string",
          width: 150,
        },
        {
          prop: "orderQuantity",
          title: "单据数量",
          type: "string",

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

@@ -24,17 +24,15 @@
    PalletDialog
  },
  setup() {
    // è¡¨æ ¼åŸºç¡€é…ç½®ï¼šå¯¹é½è°ƒæ‹¨å•å®žä½“
    const table = ref({
      key: "id",
      footer: "Foots",
      cnName: "调拨单",
      name: "allocateOrder",
      url: "/allocateOrder/", // åŽç«¯æŽ¥å£è·¯å¾„需与调拨单接口匹配
      url: "/allocateOrder/",
      sortName: "id",
    });

    // ç¼–辑表单字段：对应Dt_AllocateOrder可编辑属性
    const editFormFields = ref({
      orderNo: "",
      upperOrderNo: "",
@@ -48,7 +46,6 @@
      remark: "",
    });

    // ç¼–辑表单配置：按实体字段类型设置组件
    const editFormOptions = ref([
      [
        {
@@ -72,7 +69,7 @@
          title: "订单类型",
          field: "orderType",
          type: "select",
          dataKey: "allocateOrderType", // è°ƒæ‹¨å•ä¸“属枚举key
          dataKey: "allocateOrderType", 
          data: [],
          required: true,
        },
@@ -88,7 +85,7 @@
          title: "来源仓库",
          field: "fromWarehouse",
          type: "select",
          dataKey: "warehouses", // ä»“库枚举key（复用或单独配置）
          dataKey: "warehouses", 
          data: [],
          required: true,
        },
@@ -121,7 +118,7 @@
      ],
    ]);

    // æœç´¢è¡¨å•å­—段：对应Dt_AllocateOrder查询属性
    
    const searchFormFields = ref({
      orderNo: "",
      upperOrderNo: "",
@@ -137,7 +134,7 @@
      createDate: "",
    });

    // æœç´¢è¡¨å•é…ç½®ï¼šæŒ‰æŸ¥è¯¢éœ€æ±‚设置字段类型
   
    const searchFormOptions = ref([
      [
        { title: "单据编号", field: "orderNo", type: "like" },
@@ -179,7 +176,7 @@
      ],
    ]);

    // ä¸»è¡¨æ ¼åˆ—配置：完全对齐Dt_AllocateOrder字段
    
    const columns = ref([
      {
        field: "id",
@@ -338,11 +335,11 @@
          width: 150,
          align: "left",
          required: true,
          dataKey: "materielCodes", // ç‰©æ–™ç¼–码枚举key
          dataKey: "materielCodes", 
          data: [],
        },
        {
          field: "materielName", // å®žä½“中无该字段，需后端关联返回或调整为bind映射
          field: "materielName", 
          title: "物料名称",
          type: "string",
          width: 100,
@@ -466,7 +463,7 @@
      searchFormFields,
      searchFormOptions,
      columns,
      detail,
      detail, 
      palletVisible,
      currentPalletDocNo,
      handleOpenPalletDialog,

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

@@ -293,6 +293,15 @@
          required: true,
        },
        {
          field: "supplyCode",
          title: "供应商编号",
          type: "string",
          width: 90,
          align: "left",
          edit: { type: "string" },
          required: true,
        },
        {
          field: "orderQuantity",
          title: "单据数量",
          type: "string",

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

@@ -136,6 +136,13 @@
          align: "left",
        },
        {
          field: "supplyCode",
          title: "供应商编号",
          type: "string",
          width: 150,
          align: "left",
        },
        {
          field: "orderQuantity",
          title: "单据数量",
          type: "string",

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

@@ -598,5 +598,6 @@
              return content.Error("SumQuantity ç»Ÿè®¡åº“存数量失败，订单号：{OrderNo}");
            }
        }

    }
}

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

@@ -34,7 +34,7 @@
                Dt_StockInfo stockInfo ;
                if (string.IsNullOrEmpty(palletCode))
                {
                    stockInfo = _stockRepository.Db.Queryable<Dt_StockInfo>().Where(x => x.PalletType == PalletTypeEnum.Empty.ObjToInt()).First();
                    stockInfo = _stockRepository.Db.Queryable<Dt_StockInfo>().Where(x => x.PalletType == PalletTypeEnum.Empty.ObjToInt() && !string.IsNullOrWhiteSpace(x.LocationCode)).First();
                }
                else
                {