diff --git a/fe/PC/src/utils/detailsTableColumns/index.js b/fe/PC/src/utils/detailsTableColumns/index.js
index 4dc7ef91d..64e4f4661 100644
--- a/fe/PC/src/utils/detailsTableColumns/index.js
+++ b/fe/PC/src/utils/detailsTableColumns/index.js
@@ -12,12 +12,12 @@ export const Dict = [
 ]
 
 // 原料管理
-/**/
-// 供应商发货通知 已调整
+// 供应商发货通知 20230404
 export const SupplierAsn =  [
   { label: "物品代码", prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
-  { label: "物品描述", prop: "itemDesc1" },
+  { label: "物品描述1", prop: "itemDesc1" },
+  { label: "物品描述2", prop: "itemDesc2" },
   { label: "发货数量", prop: "qty" },
   { label: "物品单位", prop: "uom" },
   { label: "生产批次", prop: "lot" },
@@ -31,22 +31,31 @@ export const SupplierAsn =  [
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
   { label: "发货单号", prop: 'number', width: orderWidth },
   { label: "订单号", prop: 'poNumber', width: orderWidth },
+  { label: "订单行", prop: 'poLine', width: orderWidth },
   // -----------------------------------------------------------------------
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "上次修改者Id", prop: "lastModifierId" },
   { label: "标包数量", prop: 'stdPackQty' },
-  { label: "标包计量单位", prop: 'stdPackUom' },
+  // { label: "标包计量单位", prop: 'stdPackUom' },
   { label: "供应商包装数量", prop: 'supplierPackQty' },
   { label: "供应商包装计量单位", prop: 'supplierPackUom' },
   { label: "供应商批次", prop: 'supplierBatch' },
+  { label: "转换率", prop: 'convertRate' },
+  { label: "筹措员代码", prop: 'planUserCode' },
   { label: "备注", prop: 'remark' },
+  { label: "ID", prop: 'id' },
+  { label: "创建者ID", prop: 'creatorId' },
+  { label: "主表ID", prop: 'masterID' },
+  { label: "事务代码", prop: "tenantId" },
   // -----------------------------------------------------------------------
 ]
 
-// 采购订单信息 已调整
+// 采购订单信息 20230404
 export const PurchaseOrder =  [
   { label: "物品代码", prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
-  { label: "物品描述", prop: "itemDesc1" },
+  { label: "物品描述1", prop: "itemDesc1" },
+  { label: "物品描述2", prop: "itemDesc2" },
   { label: "发货数量", prop: "qty" },
   { label: "物品单位", prop: "uom" },
   { label: "生产批次", prop: "lot" },
@@ -54,17 +63,32 @@ export const PurchaseOrder =  [
   { label: "项目编号", prop: "projectCode" },
   { label: "类型", prop: "ctype", type: "filter", filters: "SupplierAsnCtypeSta" },
   { label: "生产时间", prop: "produceDate", type: "dateTime" },
+  { label: "已发货数量", prop: "shippedQty" },
+  { label: "已收货数量", prop: "receivedQty" },
+  { label: "已退货数量", prop: "returnedQty" },
+  { label: "已上架数量", prop: "putAwayQty" },
   // -----------------------------------------------------------------------
+  { label: "筹措员代码", prop: 'planUserCode' },
+  { label: "要求到货时间", prop: "planArriveDate", type: "dateTime" },
   { label: "过期时间", prop: "expireDate", type: "dateTime" },
+  { label: "发货单号", prop: 'number' },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "标包计量单位", prop: 'stdPackUom' },
+  { label: "上次修改者Id", prop: "lastModifierId" },
   { label: "标包数量", prop: 'stdPackQty' },
   { label: "订单行", prop: 'poLine' },
   { label: "供应商包装计量单位", prop: 'supplierPackUom' },
   { label: "供应商包装数量", prop: 'supplierPackQty' },
   { label: "转换率", prop: 'convertRate' },
   { label: "是否寄存订单", prop: 'isConsignment' },
+  { label: "备注", prop: 'remark' },
+  { label: "订单备注", prop: 'orderRemark' },
+  { label: "事务代码", prop: "tenantId" },
   { label: "lineStatus", prop: 'lineStatus' },
+  { label: "id", prop: 'id' },
+  { label: "创建时间", prop: 'creationTime', type: "dateTime" },
+  { label: "创建者ID", prop: 'creatorId' },
+  { label: "主表ID", prop: 'masterID' },
+  // { label: "标包计量单位", prop: 'stdPackUom' },
   // -----------------------------------------------------------------------
 ]
 // 到货通知 已调整
diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js
index 7cf490cdd..0e6d3aec8 100644
--- a/fe/PC/src/utils/tableColumns/index.js
+++ b/fe/PC/src/utils/tableColumns/index.js
@@ -1046,8 +1046,7 @@ export const documentBasic = [
 
 
 // 原料管理
-/**/
-// 供应商发货通知 已调整
+// 供应商发货通知 20230404
 export const SupplierAsn = [
   {
     label: "发货单号",
@@ -1058,27 +1057,40 @@ export const SupplierAsn = [
   },
   { label: "订单号", prop: "poNumber",width: orderWidth },
   { label: "供应商代码", prop: "supplierCode" },
-  { label: "供应商名称", prop: "supplierName",showProp: true },
+  { label: "供应商名称", prop: "supplierName" },
   { label: "供应商地址", prop: "supplierAddress" },
   { label: "要求到货日期", prop: "planArriveDate", type: "dateTime" },
   { label: "发货日期", prop: "shipDate",type: "dateTime" },
-  { label: "筹措员代码", prop: "contactUserName" },
   { label: "订单备注", prop: 'remark' },
   { label: "操作员", prop: 'worker' },
   // -----------------------------------------------------------------------
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "公司", prop: 'company' },
+  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "创建者ID", prop: 'creatorId' },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
-  { label: "仓库", prop: 'warehouseCode' },
   { label: "要货计划单号", prop: 'rpNumber' },
   { label: "车牌号", prop: 'truckNumber' },
   { label: "收货口", prop: 'dockCode' },
-  { label: "联系人电话", prop: 'contactUserPhone' },
-  { label: "联系人邮件", prop: 'contactUserEmail' },
+  { label: "创建时间", prop: 'creationTime', type: "dateTime" },
+  { label: "联系人姓名", prop: 'contactName' },
+  { label: "联系人电话", prop: 'contactPhone' },
+  { label: "联系人邮件", prop: 'contactEmail' },
+  { label: "到期日期", prop: 'dueDate', type: "dateTime" },
+  { label: "时间窗口", prop: 'timeWindow' },
+  { label: "筹措员代码", prop: 'planUserCode' },
+  { label: "事务代码", prop: "tenantId" },
   { label: "status", prop: 'status' },
+  { label: "createType", prop: 'createType' },
+  // { label: "联系人电话", prop: 'contactUserPhone' },
+  // { label: "联系人邮件", prop: 'contactUserEmail' },
+  // { label: "仓库", prop: 'warehouseCode' },
+  // { label: "公司", prop: 'company' },
+  // { label: "筹措员代码", prop: "contactUserName" },
+  // { label: "供应商名称", prop: "supplierName",showProp: true },
+  // { label: "供应商地址", prop: "supplierAddress" },
   // -----------------------------------------------------------------------
 ]
-// 采购订单信息 已调整
+// 采购订单信息 20230404
 export const PurchaseOrder = [
   {
     label: "采购订单号",
@@ -1090,25 +1102,31 @@ export const PurchaseOrder = [
   { label: "供应商代码", prop: "supplierCode" },
   { label: "供应商名称", prop: "supplierName" },
   { label: "供应商地址", prop: "supplierAddress",showProp: true },
-  { label: "筹措员代码", prop: "contactUserName" },
   { label: "订单备注", prop: 'remark' },
   { label: "创建时间", prop: 'creationTime', type:'dateTime' },
   { label: "操作员", prop: 'worker' },
   // -----------------------------------------------------------------------
-  { label: "发货日期", prop: "shipDate",type: "dateTime" },
-  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "公司", prop: 'company' },
+  { label: "联系人姓名", prop: 'contactName' },
+  { label: "联系人电话", prop: 'contactPhone' },
+  { label: "联系人邮件", prop: 'contactEmail' },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
-  { label: "仓库", prop: 'warehouseCode' },
   { label: "订单类型", prop: 'poType' },
   { label: "是否寄存订单", prop: 'isConsignment' },
   { label: "订单日期", prop: 'orderDate',type: "dateTime" },
   { label: "截止日期", prop: 'dueDate',type: "dateTime" },
   { label: "版本", prop: 'version' },
   { label: "税率", prop: 'taxRate' },
-  { label: "联系人电话", prop: 'contactUserPhone' },
-  { label: "联系人邮件", prop: 'contactUserEmail' },
   { label: "orderStatus", prop: 'orderStatus' },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "创建者ID", prop: 'creatorId' },
+  { label: "事务代码", prop: "tenantId" },
+  // { label: "公司", prop: 'company' },
+  // { label: "筹措员代码", prop: "contactUserName" },
+  // { label: "发货日期", prop: "shipDate",type: "dateTime" },
+  // { label: "联系人电话", prop: 'contactUserPhone' },
+  // { label: "联系人邮件", prop: 'contactUserEmail' },
+  // { label: "仓库", prop: 'warehouseCode' },
   // -----------------------------------------------------------------------
 ]
 // 到货通知 已调整
diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js
index e6251f8ba..deee9c778 100644
--- a/fe/PC/src/utils/tabsDesTions/index.js
+++ b/fe/PC/src/utils/tabsDesTions/index.js
@@ -813,69 +813,68 @@ export const documentBasic = [
 ]
 
 // 原料管理
-/**/
-// 供应商发货通知 已调整 20221220
+// 供应商发货通知 20230404
 export const SupplierAsn =  [
   { label: "发货单号", prop: "number" },
   { label: "订单号", prop: "poNumber" },
   { label: "供应商代码", prop: "supplierCode" },
-  { label: "供应商名称", prop: "supplierName" },
-  { label: "供应商地址", prop: "supplierAddress" },
-  { label: "要求到货日期", prop: 'planArriveDate', type:'dateTime' },
-  { label: "发货日期", prop: 'shipDate', type:'dateTime' },
-  { label: "实际到货日期", prop: "dueDate",type: "dateTime" },
-  { label: "筹措员代码", prop: "planUserCode" },
+  // { label: "供应商名称", prop: "supplierName" },
+  // { label: "供应商地址", prop: "supplierAddress" },
+  { label: "要求到货日期", prop: "planArriveDate", type: "dateTime" },
+  { label: "发货日期", prop: "shipDate",type: "dateTime" },
   { label: "订单备注", prop: 'remark' },
   { label: "操作员", prop: 'worker' },
   // -----------------------------------------------------------------------
-  { label: "创建时间", prop: 'creationTime', type:'dateTime' },
-  { label: "创建者Id", prop: "creatorId" },
-  { label: "事务代码", prop: "tenantId" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
   { label: "上次修改者Id", prop: "lastModifierId" },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
-  { label: "仓库", prop: 'warehouseCode' },
   { label: "要货计划单号", prop: 'rpNumber' },
   { label: "车牌号", prop: 'truckNumber' },
   { label: "收货口", prop: 'dockCode' },
+  { label: "创建时间", prop: 'creationTime', type: "dateTime" },
+  { label: "联系人姓名", prop: 'contactName' },
+  { label: "联系人电话", prop: 'contactPhone' },
+  { label: "联系人邮件", prop: 'contactEmail' },
+  { label: "到期日期", prop: 'dueDate', type: "dateTime" },
   { label: "时间窗口", prop: 'timeWindow' },
-  { label: "联系人姓名", prop: 'contactUserName' },
-  { label: "联系人电话", prop: 'contactUserPhone' },
-  { label: "联系人邮件", prop: 'contactUserEmail' },
+  { label: "筹措员代码", prop: 'planUserCode' },
+  { label: "status", prop: 'status' },
   { label: "id", prop: "id" },
+  { label: "创建者ID", prop: 'creatorId' },
   { label: "createType", prop: 'createType' },
-  { label: "status", prop: 'status' },
-  { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
-// 采购订单信息  已调整 20221220
+// 采购订单信息 20230404
 export const PurchaseOrder =  [
   { label: "采购订单号", prop: 'number' },
   { label: "供应商代码", prop: "supplierCode" },
   { label: "供应商名称", prop: "supplierName" },
   { label: "供应商地址", prop: "supplierAddress" },
-  { label: "筹措员代码", prop: "contactUserName" },
   { label: "订单备注", prop: 'remark' },
   { label: "创建时间", prop: 'creationTime', type:'dateTime' },
   { label: "创建者Id", prop: "creatorId" },
   { label: "操作员", prop: 'worker' },
   // -----------------------------------------------------------------------
+  { label: "联系人姓名", prop: 'contactName' },
+  { label: "联系人电话", prop: 'contactPhone' },
+  { label: "联系人邮件", prop: 'contactEmail' },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
   { label: "上次修改者Id", prop: "lastModifierId" },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
   { label: "事务代码", prop: "tenantId" },
-  { label: "仓库", prop: 'warehouseCode' },
   { label: "订单类型", prop: 'poType' },
   { label: "是否寄存订单", prop: 'isConsignment', type: "filter", filters: "whetherOrNot" },
   { label: "订单日期", prop: 'orderDate',type: "dateTime" },
   { label: "截止日期", prop: 'dueDate',type: "dateTime" },
   { label: "版本", prop: 'version' },
   { label: "税率", prop: 'taxRate' },
-  { label: "联系人电话", prop: 'contactUserPhone' },
-  { label: "联系人邮件", prop: 'contactUserEmail' },
   { label: "orderStatus", prop: 'orderStatus' },
   { label: "id", prop: "id" },
-  { label: "公司", prop: 'company' },
+  // { label: "公司", prop: 'company' },
+  // { label: "仓库", prop: 'warehouseCode' },
+  // { label: "筹措员代码", prop: "contactUserName" },
+  // { label: "联系人电话", prop: 'contactUserPhone' },
+  // { label: "联系人邮件", prop: 'contactUserEmail' },
   // -----------------------------------------------------------------------
 ]
 // 到货通知 已调整 20221220
diff --git a/fe/PC/src/views/rawMaterialManage/purchaseReceipt/SupplierAsn-msQuery.vue b/fe/PC/src/views/rawMaterialManage/purchaseReceipt/SupplierAsn-msQuery.vue
index df0664e9a..2416b205a 100644
--- a/fe/PC/src/views/rawMaterialManage/purchaseReceipt/SupplierAsn-msQuery.vue
+++ b/fe/PC/src/views/rawMaterialManage/purchaseReceipt/SupplierAsn-msQuery.vue
@@ -25,14 +25,6 @@
       :httpOverallSearchData="httpOverallSearchData"
     >
     </tablePagination>
-    <!-- 表格导入 -->
-    <!-- <upload-excel-component 
-      :DrawerLoading="Loading.DrawerLoading"
-      :before-upload="beforeUpload"
-      :show="displayDialog.importDialog"
-      @postImportDown="importDown()"
-      @submitForm="uploadSubmitForm"
-    /> -->
     <!-- 抽屉 -->
     <curren-Drawer
       :title="tableColumns"
@@ -56,17 +48,11 @@
   </div>
 </template>
 <script>
-import { supplierAsnCreateMany } from "@/api/wms-api"
 import { tableMixins } from "@/mixins/TableMixins"
 import { LoadingMixins } from "@/mixins/LoadingMixins"
 import { drawerMixins } from "@/mixins/drawerMixins"
 import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
 import { mixins } from "@/mixins/mixins"
-import UploadExcelComponent from '@/components/UploadExcel/index.vue'
-import { supplierAsnExcel } from "@/filters/excelOrReportsOption";
-import {SupplierAsnCtypeStaBack} from "@/filters/status"
-import { formatTimeToT,formatTimeStampToNorm } from "@/utils/formatTime"
-import store  from '@/store'
 export default {
   name: "SupplierAsn",
   mixins: [
@@ -76,7 +62,6 @@ export default {
     TableHeaderMixins,
     mixins,
   ],
-  components: { UploadExcelComponent },
   computed: {
     editDialog: {
       get: function () {
@@ -87,7 +72,6 @@ export default {
   data () {
     return {
       URL: 'wms/store/supplier-asn',
-      // importUploadURL:"wms/store/supplier-asn/newImport",
       //常用按钮数据
       currenButtonData: [
         // this.defaultImportBtn(),//导入
@@ -100,139 +84,6 @@ export default {
   mounted () {
     this.paging();
   },
-  methods: {
-    // 创建外部主表数据
-    build(data,str){
-      
-      return {
-        str:str,//用于对比数据
-        details:[],
-        supplierCode:data[supplierAsnExcel.supplierCode],
-        planUserCode:data[supplierAsnExcel.planUserCode],
-        contactUserName:data[supplierAsnExcel.planUserCode],
-        planArriveDate:formatTimeStampToNorm(data[supplierAsnExcel.planArriveDate],'datetime'),
-        shipDate:formatTimeStampToNorm(data[supplierAsnExcel.shipDate],'datetime'),
-        remark:data[supplierAsnExcel.remark],
-        // 接口需要默认配置项：
-        company:localStorage.getItem("company"),
-        warehouseCode:localStorage.getItem("warehouseCode"),//仓库
-        dockCode:"FWDY",//收货口
-        rpNumber:"123456",//要货计划单号
-        timeWindow:"00:00-24:00",//时间窗口
-      }
-    },
-    // 创建详情detail数据
-    builddDeails(data,item){
-      data.details.push({
-        ctype:SupplierAsnCtypeStaBack(item[supplierAsnExcel.details.ctype]) || null,
-        projectCode:item[supplierAsnExcel.details.projectCode] || null,
-        itemCode:item[supplierAsnExcel.details.itemCode] || null,
-        uom:item[supplierAsnExcel.details.uom] || null,
-        qty:item[supplierAsnExcel.details.qty] || null,
-        recommendErpCode:item[supplierAsnExcel.details.recommendErpCode] || null,
-        lot:item[supplierAsnExcel.details.lot] || null,
-        supplierBatch:item[supplierAsnExcel.details.lot] ? item[supplierAsnExcel.details.lot].replaceAll('-','') : '',
-        produceDate:formatTimeStampToNorm(item[supplierAsnExcel.details.produceDate],'datetime'),
-        expireDate:formatTimeStampToNorm(item[supplierAsnExcel.details.expireDate],'datetime'),
-        packingCode:item['明细-箱标签'] || null,
-        // 默认配置项：
-        warehouseCode:localStorage.getItem("warehouseCode"),//仓库
-      })
-    },
-    uploadSubmitForm(index,data){
-      // 确定
-      if(index == '1'){
-        let _result = data.results;
-        let _data = [];
-        // 查询物品代码是否重复
-        // let _itemArr = [];
-        // let _hasSame = false
-        // data.results.forEach(item=>{
-        //   if(_itemArr.indexOf(item[supplierAsnExcel.details.itemCode]) >= 0){
-        //     _hasSame = true
-        //   }else{
-        //     _itemArr.push(item[supplierAsnExcel.details.itemCode])
-        //   }
-        // })
-        // if(_hasSame){
-        //   this.$message.error("模板中存在相同物品代码，请修改模板重新导入")
-        //   return 
-        // }
-        // 查重重组
-        for(let i=0;i<_result.length;i++){
-          let _itemStr = ""
-          // _itemStr =(_result[i][supplierAsnExcel.poNumber] || '') + (_result[i][supplierAsnExcel.number] || '')
-          let entity=this.build(_result[i],_itemStr);
-    
-         if(_data.find(e => e.str == _itemStr)){
-          continue;
-         }
-         _result.forEach((element,key) => {
-            // let temp =(element[supplierAsnExcel.poNumber] || '') + (element[supplierAsnExcel.number] || '')
-            let temp = ""
-            if(temp==_itemStr){
-              this.builddDeails(entity,element);
-            }
-          });
-          _data.push(entity);
-        }
-        // 提交数据处理
-        _data.forEach(item=>{
-          item.createType = 1
-          item.planArriveDate = formatTimeToT(item.planArriveDate)
-          item.shipDate = formatTimeToT(item.shipDate)
-          item.details.forEach(item_d=>{
-            item_d.produceDate = formatTimeToT(item_d.produceDate)
-            item_d.expireDate = formatTimeToT(item_d.expireDate)
-            item_d.itemName = ""
-          })
-          item.worker = store.getters.name.userName;
-          return delete item.str
-        })
-        this.Loading.appMainLoading = true
-        supplierAsnCreateMany(_data)
-          .then((response) => {
-            this.$message.success("创建成功！")
-            this.Loading.appMainLoading = false
-            this.displayDialog.importDialog = false;
-            this.paging();
-          })
-          .catch(()=>{
-            this.Loading.appMainLoading = false
-            this.$message.error("创建失败，请重试。")
-          })
-      }
-      // 取消
-      else{
-        if(!data.results || data.results.length <= 0){
-          this.displayDialog.importDialog = false;
-          return;
-        }
-        this.$confirm('您还未提交, 是否取消?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          this.displayDialog.importDialog = false;
-        }).catch(() => {
-          document.getElementsByClassName("v-modal")[0].style.display = "none"
-        });
-      }
-    },
-    beforeUpload(file) {
-      // const isLt1M = file.size / 1024 / 1024 < 1
-      // if (isLt1M) {
-      //   return true
-      // }
-      // this.$message({
-      //   message: 'Please do not upload files larger than 1m in size.',
-      //   type: 'warning'
-      // })
-      // return false
-      return true
-    }
-
-  },
 };
 </script>
 <style lang="scss" scoped>