Merge branch 'master' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui

src/api/wms/containerUnbindRecordDetail/index.ts

@@ -0,0 +1,57 @@
+import request from '@/config/axios'
+
+export interface ContainerUnbindRecordDetailVO {
+  id: number
+  containerContentType: string
+  contentNumber: string
+  itemCode: string
+  batch: string
+  inventoryStatus: string
+  uom: string
+  qty: number
+  masterId: number
+  number: string
+  siteId: string
+  remark: string
+}
+
+// 查询器具解绑记录子列表
+export const getContainerUnbindRecordDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/container-unbind-record-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/container-unbind-record-detail/page`, params })
+  }
+}
+
+// 查询器具解绑记录子详情
+export const getContainerUnbindRecordDetail = async (id: number) => {
+  return await request.get({ url: `/wms/container-unbind-record-detail/get?id=` + id })
+}
+
+// 新增器具解绑记录子
+export const createContainerUnbindRecordDetail = async (data: ContainerUnbindRecordDetailVO) => {
+  return await request.post({ url: `/wms/container-unbind-record-detail/create`, data })
+}
+
+// 修改器具解绑记录子
+export const updateContainerUnbindRecordDetail = async (data: ContainerUnbindRecordDetailVO) => {
+  return await request.put({ url: `/wms/container-unbind-record-detail/update`, data })
+}
+
+// 删除器具解绑记录子
+export const deleteContainerUnbindRecordDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/container-unbind-record-detail/delete?id=` + id })
+}
+
+// 导出器具解绑记录子 Excel
+export const exportContainerUnbindRecordDetail = async (params) => {
+  return await request.download({ url: `/wms/container-unbind-record-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/container-unbind-record-detail/get-import-template' })
+}

src/api/wms/containerUnbindRecordMain/index.ts

@@ -0,0 +1,69 @@
+import request from '@/config/axios'
+
+export interface ContainerUnbindRecordMainVO {
+  id: number
+  number: string
+  containerNumber: string
+  fromWarehouseCode: string
+  toWarehouseCode: string
+  outTransactionType: string
+  inTransactionType: string
+  executeTime: Date
+  activeDate: Date
+  available: string
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  userGroupCode: string
+  interfaceType: string
+  businessType: string
+  remark: string
+  extraProperties: string
+  siteId: string
+  code: string
+  fromLocationTypes: string
+  toLocationTypes: string
+  fromAreaCodes: string
+  toAreaCodes: string
+}
+
+// 查询器具解绑记录主列表
+export const getContainerUnbindRecordMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/container-unbind-record-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/container-unbind-record-main/page`, params })
+  }
+}
+
+// 查询器具解绑记录主详情
+export const getContainerUnbindRecordMain = async (id: number) => {
+  return await request.get({ url: `/wms/container-unbind-record-main/get?id=` + id })
+}
+
+// 新增器具解绑记录主
+export const createContainerUnbindRecordMain = async (data: ContainerUnbindRecordMainVO) => {
+  return await request.post({ url: `/wms/container-unbind-record-main/create`, data })
+}
+
+// 修改器具解绑记录主
+export const updateContainerUnbindRecordMain = async (data: ContainerUnbindRecordMainVO) => {
+  return await request.put({ url: `/wms/container-unbind-record-main/update`, data })
+}
+
+// 删除器具解绑记录主
+export const deleteContainerUnbindRecordMain = async (id: number) => {
+  return await request.delete({ url: `/wms/container-unbind-record-main/delete?id=` + id })
+}
+
+// 导出器具解绑记录主 Excel
+export const exportContainerUnbindRecordMain = async (params) => {
+  return await request.download({ url: `/wms/container-unbind-record-main/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/container-unbind-record-main/get-import-template' })
+}

src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts

@@ -460,14 +460,14 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
   },
-  {
+  // {
-    label: '包装号',
+  //   label: '包装号',
-    field: 'packingNumber',
+  //   field: 'packingNumber',
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    },
+  //   },
-  },
+  // },
   {
     label: '从包装号',
     field: 'fromPackingNumber',

src/views/wms/inventoryManage/containerinit/containerUnbindRecord/containerUnbindRecordMain.data.ts

@@ -0,0 +1,164 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const ContainerUnbindRecordMainRules = reactive({
+})
+
+export const ContainerUnbindRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isForm: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+// 表单校验
+export const ContainerUnbindRecordDetailRules = reactive({
+
+})
+
+export const ContainerUnbindRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '内容物类型',
+    field: 'containerContentType',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      component: 'SelectV2'
+    },
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '内容物号',
+    field: 'contentNumber',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    sort: 'custom',
+    form: {
+      component: 'Radio'
+    },
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    sort: 'custom',
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    table: {
+      width: 150
+    },
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))

src/views/wms/inventoryManage/containerinit/containerUnbindRecord/index.vue

@@ -0,0 +1,285 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="ContainerUnbindRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ContainerUnbindRecordMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="getList"
+    :rules="ContainerUnbindRecordMainRules"
+    :formAllSchemas="ContainerUnbindRecordMain.allSchemas"
+    :searchTableParams="searchTableParams"
+    :tableAllSchemas="ContainerUnbindRecordDetail.allSchemas"
+    :tableFormRules="ContainerUnbindRecordDetailRules"
+    :tableData="tableData"
+    :apiUpdate="ContainerUnbindRecordMainApi.updateContainerUnbindRecordMain"
+    :apiCreate="ContainerUnbindRecordMainApi.createContainerUnbindRecordMain"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @submitForm="submitForm"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="ContainerUnbindRecordMain.allSchemas"
+    :detailAllSchemas="ContainerUnbindRecordDetail.allSchemas"
+    :detail-all-schemas-rules="ContainerUnbindRecordDetailRules"
+    :searchTableParams="searchTableParams"
+    :apiCreate="ContainerUnbindRecordDetailApi.createContainerUnbindRecordDetail"
+    :apiUpdate="ContainerUnbindRecordDetailApi.updateContainerUnbindRecordDetail"
+    :apiPage="ContainerUnbindRecordDetailApi.getContainerUnbindRecordDetailPage"
+    :apiDelete="ContainerUnbindRecordDetailApi.deleteContainerUnbindRecordDetail"
+  />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/container-unbind-record-main/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { ContainerUnbindRecordMain,ContainerUnbindRecordMainRules,ContainerUnbindRecordDetail,ContainerUnbindRecordDetailRules } from './containerUnbindRecordMain.data'
+import * as ContainerUnbindRecordMainApi from '@/api/wms/containerUnbindRecordMain'
+import * as ContainerUnbindRecordDetailApi from '@/api/wms/containerUnbindRecordDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+
+defineOptions({ name: 'ContainerUnbindRecordMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(ContainerUnbindRecordMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询列表页面参数设置
+const searchTableParams = ref([
+//{
+//  formField: 'productItemCode',
+//  searchTableTitle: '物料信息',
+//  searchTableAllSchemas: Itembasic.allSchemas,
+//  searchTablePage: ItembasicApi.getItembasicPage
+//}
+])
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ContainerUnbindRecordMainApi.getContainerUnbindRecordMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:containerUnbindRecordMain:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:containerUnbindRecordMain:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:containerUnbindRecordMain:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    getList()
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:containerUnbindRecordMain:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:containerUnbindRecordMain:delete'}), // 删除
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicContainerUnbindRecordMain')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await ContainerUnbindRecordMainApi.deleteContainerUnbindRecordMain(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ContainerUnbindRecordMainApi.exportContainerUnbindRecordMain(setSearchParams)
+    download.excel(data, '器具解绑记录主.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  data.subList = tableData.value // 拼接子表数据参数
+  try {
+    if (formType === 'create') {
+      await ContainerUnbindRecordMainApi.createContainerUnbindRecordMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await ContainerUnbindRecordMainApi.updateContainerUnbindRecordMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    basicFormRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    basicFormRef.value.formLoading = false
+  }
+}
+
+const tableData = ref([])
+
+const tableFormKeys = {}
+ContainerUnbindRecordDetail.allSchemas.tableFormColumns.forEach(item => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+
+// 添加明细
+const handleAddTable = () => {
+  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  tableData.value.splice(index, 1)
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '器具解绑记录主导入模版.xls'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await ContainerUnbindRecordMainApi.importTemplate()
+})
+
+</script>

src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue

@@ -167,6 +167,38 @@ InventorymoveRequestDetail.allSchemas.tableFormColumns.map(item => {
       item.tableForm.disabled = false
     }
   }
+  if(item.field == "toLocationCode"){
+    if (toInventoryStatus.value == 'HOLD') {
+      item.tableForm.searchCondition = [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },
+      {
+        key: 'type',
+        value: 'HOLD',
+        isMainValue: false
+      }]
+    }
+    if (toInventoryStatus.value == 'SCRAP') {
+      item.tableForm.searchCondition = [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },
+      {
+        key: 'type',
+        value: 'SCRAP',
+        isMainValue: false
+      }]
+    }else {
+      item.tableForm.searchCondition = {
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }
+    }
+  }
 })
 
 // 字段设置 更新主列表字段

src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts

@@ -839,9 +839,9 @@ export const InventorymoveRequestDetailRules = reactive({
   // toBatch: [
   //   { required: true, message: '请输入到批次', trigger: 'blur' }
   // ],
-  // toLocationCode: [
+  toLocationCode: [
-  //   { required: true, message: '请选择到库位代码', trigger: 'change' }
+    { required: true, message: '请选择到库位代码', trigger: 'change' }
-  // ],
+  ],
   // toInventoryStatus: [
   //   { required: true, message: '请选择到库存状态', trigger: 'change' }
   // ],

src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue

@@ -143,10 +143,10 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
       row['supplierQty'] = val[0]['supplierQty']
       row['supplierUom'] = val[0]['supplierUom']
       row['inventoryStatus'] = val[0]['inventoryStatus']
-      row['fromLocationCode'] = val[0]['locationCode']
+      row['fromLocationCode'] = val[0]['fromLocationCode']
-      row['toLocationCode'] = val[0]['toLocationCode']
+      row['toLocationCode'] = ''
-      row['fromLocationGroupCode'] = val[0]['locationGroupCode']
+      row['fromLocationGroupCode'] = val[0]['fromLocationGroupCode']
-      row['toLocationGroupCode'] = val[0]['toLocationGroupCode']
+      row['toLocationGroupCode'] = ''
       row['fromAreaCode'] = val[0]['areaCode']
       row['toAreaCode'] = val[0]['toAreaCode']
       row['fromQwnerCode'] = val[0]['fromQwnerCode']
@@ -177,9 +177,6 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
             item.batch = item.toBatch
             item.packingNumber = item.toPackingNumber
             item.containerNumber = item.toContainerNumber
-            let fromLocationCode = item.fromLocationCode
-            item.fromLocationCode = item.toLocationCode
-            item.toLocationCode = fromLocationCode
           })
           isShowButton.value = false
           PurchasereturnRequestDetail.allSchemas.tableFormColumns.map((item) => {
@@ -187,6 +184,9 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
             if (item.field == 'remark') {
               item.tableForm.disabled = false
             }
+            if (item.field == 'qty') {
+              item.tableForm.disabled = false
+            }
             if (item.field == 'reason') {
               item.tableForm.disabled = false
             }
@@ -330,6 +330,7 @@ const buttonTableClick = async (val, row) => {
 const formRef = ref()
 const openForm = async (type: string, row?: number) => {
   tableData.value = [] // 重置明细数据
+  isShowButton.value = true
   formRef.value.open(type, row)
 }
 

src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts

@@ -735,6 +735,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     }, 
+    isTableForm:false,
     tableForm:{
       disabled:true
     }
@@ -757,6 +758,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     }, 
+    isTableForm:false,
     tableForm:{
       disabled:true
     }