From c92ae409bf43eed30d0b9ad5ac4090b137e2b022 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Tue, 3 Dec 2024 14:59:24 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90nev-pc=E3=80=91=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E7=AB=99=E5=BA=93=E4=BD=8D=E5=85=B3=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PC/src/utils/index.js                      |   6 +
 fe/PC/src/utils/tableColumns/index.js         |  16 ++
 fe/PC/src/utils/tabsDesTions/index.js         |  16 ++
 .../WarehouseManage/PostionLocation.vue       | 186 ++++++++++++++++++
 4 files changed, 224 insertions(+)
 create mode 100644 fe/PC/src/views/basicData/WarehouseManage/PostionLocation.vue

diff --git a/fe/PC/src/utils/index.js b/fe/PC/src/utils/index.js
index 781813c50..c8fc7d57c 100644
--- a/fe/PC/src/utils/index.js
+++ b/fe/PC/src/utils/index.js
@@ -593,6 +593,12 @@ export function initInterfaceType(res){
       _item.interfaceType = '【TYRP】-【储位、线边仓调拨单 和  客户储位调拨单】'
     } else if (item.transType == 31 && item.transSubType == 3105) {
       _item.interfaceType = '【TYRP】-【储位、线边仓调拨单 和  客户储位调拨单】'
+    } else if (item.transType == 31 && item.transSubType == 3106) {
+      _item.interfaceType = '【TYRP】-【线边仓调拨单】'
+    } else if (item.transType == 31 && item.transSubType == 3107) {
+      _item.interfaceType = '【TYRP】-【线边仓调拨单】'
+    } else if (item.transType == 31 && item.transSubType == 3108) {
+      _item.interfaceType = '【TYRP】-【线边仓调拨单】'
     } else if (item.transType == 21) {
       _item.interfaceType = '【TYRP】-【缴库单】'
     } else if (item.transType == 23 && item.transSubType == 2301) {
diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js
index 1587b0a29..8fe8800ab 100644
--- a/fe/PC/src/utils/tableColumns/index.js
+++ b/fe/PC/src/utils/tableColumns/index.js
@@ -479,6 +479,7 @@ export const Location = [
   { label: "列号", prop: "columnCode" },
   { label: "拣料优先级", prop: "pickPriority" },
   { label: "拣料顺序", prop: "pickOrder" },
+  // { label: "是否AGV配送", prop: "enableAgv", type: "filter", filters: "whetherOrNot" },
   { label: "是否混物品", prop: "enableMixItem", type: "filter", filters: "whetherOrNot" },
   { label: "是否混批次", prop: "enableMixLot", type: "filter", filters: "whetherOrNot" },
   { label: "是否混状态", prop: "enableMixStatus", type: "filter", filters: "whetherOrNot" },
@@ -527,6 +528,21 @@ export const ItemStoreRelation = [
   { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
 ]
 
+// 工作站库位零件关系
+export const PostionLocation = [
+  {
+    label: "工作站编号",
+    prop: "code",
+    fixed: "left",
+    type: "name"
+  },
+  { label: "工作站名称", prop: "name" },
+  { label: "库位", prop: "locationCode" },
+  { label: "备注", prop: "remark" },
+  { label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
+  { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
+]
+
 // 库位可用容量信息
 export const InventoryLocationCapacity = [
   {
diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js
index f27c4da2e..5f0c6558d 100644
--- a/fe/PC/src/utils/tabsDesTions/index.js
+++ b/fe/PC/src/utils/tabsDesTions/index.js
@@ -332,6 +332,7 @@ export const Location =  [
   { label: "列号", prop: "columnCode" },
   { label: "拣料优先级", prop: "pickPriority" },
   { label: "拣料顺序", prop: "pickOrder" },
+  // { label: "是否AGV配送", prop: "enableAgv", type: "filter", filters: "whetherOrNot" },
   { label: "是否混物品", prop: "enableMixItem", type: "filter", filters: "whetherOrNot" },
   { label: "是否混批次", prop: "enableMixLot", type: "filter", filters: "whetherOrNot" },
   { label: "是否混状态", prop: "enableMixStatus", type: "filter", filters: "whetherOrNot" },
@@ -373,6 +374,21 @@ export const ItemStoreRelation =  [
   { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
 ]
 
+// 工作站库位零件关系
+export const PostionLocation = [
+  {
+    label: "工作站编号",
+    prop: "code",
+    fixed: "left",
+    type: "name"
+  },
+  { label: "工作站名称", prop: "name" },
+  { label: "库位", prop: "locationCode" },
+  { label: "备注", prop: "remark" },
+  { label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
+  { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
+]
+
 // 库位可用容量信息 
 export const InventoryLocationCapacity =  [
   { label: _Names.locationCode, prop: "locationCode" },
diff --git a/fe/PC/src/views/basicData/WarehouseManage/PostionLocation.vue b/fe/PC/src/views/basicData/WarehouseManage/PostionLocation.vue
new file mode 100644
index 000000000..44a27122a
--- /dev/null
+++ b/fe/PC/src/views/basicData/WarehouseManage/PostionLocation.vue
@@ -0,0 +1,186 @@
+<template>
+  <div class="page-box" v-loading="Loading.appMainLoading">
+    <tablePagination
+      :currenButtonData="currenButtonData"
+      :tableData="tableData"
+      :tableLoading="Loading.tableLoading"
+      :tableColumns="tableColumns"
+      @rowDrop="rowDrop"
+      :totalCount="totalCount"
+      :multipleSelection="multipleSelection"
+      :MaxResultCount="PageListParams.MaxResultCount"
+      @topbutton="topbutton"
+      @inlineDialog="inlineDialog"
+      @sortChange="sortChange"
+      @alertoldSkipCount="alertoldSkipCount"
+      @alterResultCount="alterResultCount"
+      @handleSelectionChange="handleSelectionChange"
+      @buttonOperationClick="buttonOperationClick"
+      :currentPageProps="oldSkipCount"
+      :quicklySearchOption="quicklySearchOption"
+      @quicklySearchClick="quicklySearchClick"
+      @quicklySearchClear="quicklySearchClear"
+      :primarySearchOption="primarySearchOption"
+      @overallSearchFormClick="overallSearchFormClick"
+      :httpOverallSearchData="httpOverallSearchData"
+    >
+    </tablePagination>
+    <!-- 新增与编辑 -->
+    <newAndEdiDialog
+      :loading="Loading.newAndEdiLoading"
+      :active="active"
+      :pageStatus="pageStatus"
+      :formReveal="formReveal"
+      :formTitle="formTitle"
+      :displayDialog="editDialog"
+      :FormData="formReveal ? CreateFormData : editFormData"
+      :Form="formReveal ? CreateForm : editForm"
+      :Options="editOptions"
+      :Handle="editHandle"
+      :Rules="formReveal ? editRules.cerateRule : editRules.editRule"
+      @FormSubmit="FormSubmit"
+      @close="FormClose"
+      @goBack="goBack"
+    ></newAndEdiDialog>
+    <!-- 搜索按钮——窗体组件 -->
+    <searchPage
+      ref="searchTable"
+      :tableLoading="Loading.autoTableLoading"
+      :advancedFilter="advancedFilter()"
+      :filterPageListParams="filterPageListParams"
+      :formTitle="searchTitle"
+      :displayDialog="displayDialog.AddNewDialog"
+      :searchTableData="searchData"
+      :searchTableColumns="searchColumns"
+      :searchTotalCount="searchTotalCount"
+      :supplierItemPage="searchPageListParams"
+      @handleSelectionChange="prepareFormData"
+      @SizeChange="searchAlterResultCount($event, searchPageListParams)"
+      @CurrentChange="searchAlertoldSkipCount($event, searchPageListParams)"
+      @tableButtonClick="searchSubmit(arguments)"
+    ></searchPage>
+    <!-- 新导入 disabledMethod 导入方式禁用 disabledIsAllowPartImport 是否局部导入禁用-->
+    <!-- methodValue 导入方式默认选项  是否局部导入 默认选项  -->
+    <importFile
+      :loading="Loading.importLoading"
+      :show="displayDialog.importDialog"
+      :URL="URL"
+      :disabledMethod = {method1:false,method2:false,method3:false}
+      :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false}
+      isAllowPartImportValue="1"
+      @importClick="postImportMergeClick(arguments)"
+      @postImportDown="importDown"
+    ></importFile>
+    <curren-Drawer
+      :title="tableColumns"
+      :tableColumns="tableColumns"
+      :DrawerLoading="Loading.DrawerLoading"
+      :drawer="displayDialog.detailsDialog"
+      :dropdownData="dropdownData"
+      :propsData="propsData"
+      :tabsDesTions="tabsDesTions"
+      :tableLoading="tableLoading"
+      :dropdownTabsData="[]"
+      @drawerShut="(val) => (displayDialog.detailsDialog = val)"
+      @drawerbutton="drawerbutton"
+      @handleCommand="drawerHandle"
+      @close-value="closeValue"
+      :firstTabs="firstTabs"
+    ></curren-Drawer>
+  </div>
+</template>
+<script>
+import { postCreate, postUpdate } 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 { newAndEdiDialogMixins } from "@/mixins/newAndEdiDialogMixins"
+import { mixins } from "@/mixins/mixins"
+import { filterSelectMixins } from '@/mixins/filter-Select'
+export default {
+  name: "PostionLocation",
+  mixins: [
+    tableMixins,
+    LoadingMixins,
+    drawerMixins,
+    TableHeaderMixins,
+    mixins,
+    filterSelectMixins,
+    newAndEdiDialogMixins
+  ],
+  computed: {
+    editDialog: {
+      get: function () {
+        return this.displayDialog.newDialog || this.displayDialog.editDialog;
+      },
+    },
+  },
+  data () {
+    return {
+      URL: 'basedata/PostionLocation',
+      tableLoading: false,
+      //常用按钮数据
+      currenButtonData: [
+        this.defaultAddBtn(),//新增
+        this.defaultImportBtn(),//导入
+        this.defaultExportBtn(),//导出
+        this.defaultFieldSettingBtn(),//字段设置
+        this.defaultFreshBtn(),//刷新
+        this.defaultFilterBtn(),//筛选
+      ],
+      //新增
+      CreateFormData: {
+        code:null,
+        name:null,
+        locationCode:"",
+        remark:null
+      },
+      //编辑
+      editFormData: {
+        code:null,
+        name:null,
+        locationCode:"",
+        remark:null
+      },
+      editOptions: {},
+      CreateForm: [
+        { type: "input", label: "工作站编号", prop: "code", colSpan: 12 },
+        { type: "input", label: "工作站名称", prop: "name", colSpan: 12 },
+        { type: "filterSelect", label: "库位", prop: "locationCode", optionsLabel: "name", optionsValue: "code", 
+          focus: (type,val) => { return this.getFilterList(type, val, "basedata/location")},//,[{logic:"And",column:"type",action:"==",value:"2"}]
+          searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.CreateFormData)}, //,[{logic:"And",column:"type",action:"==",value:"2"}]
+          colSpan: 12
+        },
+        { type: "input", label: "备注", prop: "remark", colSpan: 12 },
+      ],
+      editForm: [
+        { type: "input", label: "工作站编号", prop: "code", colSpan: 12,disabled:true },
+        { type: "input", label: "工作站名称", prop: "name", colSpan: 12 },
+        { type: "filterSelect", label: "库位", prop: "locationCode", optionsLabel: "name", optionsValue: "code", 
+          focus: (type,val) => { return this.getFilterList(type, val, "basedata/location")},//,[{logic:"And",column:"type",action:"==",value:"2"}]
+          searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.editFormData)}, //,[{logic:"And",column:"type",action:"==",value:"2"}]
+          colSpan: 12
+        },
+        { type: "input", label: "备注", prop: "remark", colSpan: 12 },
+      ],
+      editRules: {
+        cerateRule: {
+          code: [{ required: true, trigger: "change", message: "不可为空" },],
+          locationCode: [{ required: true, trigger: "change", message: "不可为空" },],
+        },
+        editRule: {
+          code: [{ required: true, trigger: "change", message: "不可为空" },],
+          locationCode: [{ required: true, trigger: "change", message: "不可为空" },],
+        }
+      },
+    };
+  },
+  mounted () {
+    this.paging();
+  },
+};
+</script>
+<style lang="scss" scoped>
+@import "../../../styles/basicData.scss";
+</style>
\ No newline at end of file