调拨出库开发调试完成

src/api/wms/transferissueJobMain/index.ts

@@ -83,4 +83,19 @@ export const exportTransferissueJobMain = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/transferissue-job-main/get-import-template' })
-}
+}
+
+// 关闭-调拨出库任务主
+export const closeTransferissueJobMain = (id: number) => {
+  return request.download({ url: '/wms/transferissue-job-main/close?id=' + id })
+}
+
+// 承接-调拨出库任务主
+export const acceptTransferissueJobMain = (id: number) => {
+  return request.download({ url: '/wms/transferissue-job-main/accept?id=' + id })
+}
+
+// 放弃-调拨出库任务主
+export const abandonTransferissueJobMain = (id: number) => {
+  return request.download({ url: '/wms/transferissue-job-main/abandon?id=' + id })
+}

src/api/wms/transferissueRequestDetail/index.ts

@@ -21,6 +21,7 @@ export interface TransferissueRequestDetailVO {
   updateTime: Date
   updater: string
   fromOwnerCode: string
+  fromLocationCode: string
 }
 
 // 查询调拨出库申请子列表
@@ -62,4 +63,4 @@ export const exportTransferissueRequestDetail = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/transferissue-request-detail/get-import-template' })
-}
+}

src/api/wms/transferissueRequestMain/index.ts

@@ -44,22 +44,22 @@ export const getTransferissueRequestMain = async (id: number) => {
   return await request.get({ url: `/wms/transferissue-request-main/get?id=` + id })
 }
 
-// 新增调拨出库申请主
+// 新增-调拨出库申请主
 export const createTransferissueRequestMain = async (data: TransferissueRequestMainVO) => {
   return await request.post({ url: `/wms/transferissue-request-main/create`, data })
 }
 
-// 修改调拨出库申请主
+// 修改-调拨出库申请主
 export const updateTransferissueRequestMain = async (data: TransferissueRequestMainVO) => {
   return await request.put({ url: `/wms/transferissue-request-main/update`, data })
 }
 
-// 删除调拨出库申请主
+// 删除-调拨出库申请主
 export const deleteTransferissueRequestMain = async (id: number) => {
   return await request.delete({ url: `/wms/transferissue-request-main/delete?id=` + id })
 }
 
-// 导出调拨出库申请主 Excel
+// 导出-调拨出库申请主 Excel
 export const exportTransferissueRequestMain = async (params) => {
   return await request.download({ url: `/wms/transferissue-request-main/export-excel`, params })
 }
@@ -67,4 +67,34 @@ export const exportTransferissueRequestMain = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/transferissue-request-main/get-import-template' })
-}
+}
+
+// 关闭-调拨出库申请
+export const closeTransferissueRequestMain = async (id) => {
+  return await request.put({ url: `/wms/transferissue-request-main/close?id=` + id })
+}
+
+// 重新添加-调拨出库申请
+export const reAddTransferissueRequestMain = async (id) => {
+  return await request.put({ url: `/wms/transferissue-request-main/reAdd?id=` + id })
+}
+
+// 提交审批-调拨出库申请
+export const submitTransferissueRequestMain = async (id) => {
+  return await request.put({ url: `/wms/transferissue-request-main/submit?id=` + id })
+}
+
+// 审批驳回-调拨出库申请
+export const refusedTransferissueRequestMain = async (id) => {
+  return await request.put({ url: `/wms/transferissue-request-main/refused?id=` + id })
+}
+
+// 审批通过-调拨出库申请
+export const agreeTransferissueRequestMain = async (id) => {
+  return await request.put({ url: `/wms/transferissue-request-main/agree?id=` + id })
+}
+
+// 处理-调拨出库申请
+export const handleTransferissueRequestMain = async (id) => {
+  return await request.put({ url: `/wms/transferissue-request-main/handle?id=` + id })
+}

src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/index.vue

@@ -71,6 +71,8 @@ import { TransferissueJobMain,TransferissueJobMainRules,TransferissueJobDetail,T
 import * as TransferissueJobMainApi from '@/api/wms/transferissueJobMain'
 import * as TransferissueJobDetailApi from '@/api/wms/transferissueJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as PurchasereceiptJobMainApi from "@/api/wms/purchasereceiptJobMain";
+import {acceptTransferissueJobMain} from "@/api/wms/transferissueJobMain";
 
 // 调拨出库任务主
 defineOptions({ name: 'TransferissueJobMain' })
@@ -174,9 +176,9 @@ const isShowMainButton = (row,val) => {
 // 列表-操作按钮
 const butttondata = (row) => {
   return [
-    defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
+    // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
-    defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
+    // defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:transferissue-job-main:close'}), // 关闭
-    defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
+    //defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
     // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
   ]
 }
@@ -187,13 +189,46 @@ const buttonTableClick = async (val, row) => {
     console.log('列表-操作按钮事件-执行')
   } else if (val == 'mainJobAba') { // 放弃
     console.log('列表-操作按钮事件-放弃')
+    handleAbandon(row.id)
   } else if (val == 'mainJobClo') { // 关闭
     console.log('列表-操作按钮事件-关闭')
+    handleClose(row.id)
   } else if (val == 'mainJobAcc') { // 承接
     console.log('列表-操作按钮事件-承接')
+    handleAccept(row.id)
   }
 }
 
+/** 放弃按钮操作 */
+const handleAbandon = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmColse'))
+    await TransferissueJobMainApi.abandonTransferissueJobMain(id)
+    message.success(t('common.closeSuccess'))
+    await getList()
+  } catch {}
+}
+
+/** 关闭按钮操作 */
+const handleClose = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmColse'))
+    await TransferissueJobMainApi.closeTransferissueJobMain(id)
+    message.success(t('common.closeSuccess'))
+    await getList()
+  } catch {}
+}
+
+/** 承接按钮操作 */
+const handleAccept = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmColse'))
+    await TransferissueJobMainApi.acceptTransferissueJobMain(id)
+    message.success(t('common.closeSuccess'))
+    await getList()
+  } catch {}
+}
+
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {

src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue

@@ -82,6 +82,9 @@ import { TransferissueRequestMain,TransferissueRequestMainRules,TransferissueReq
 import * as TransferissueRequestMainApi from '@/api/wms/transferissueRequestMain'
 import * as TransferissueRequestDetailApi from '@/api/wms/transferissueRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as PurchasereturnRequestMainApi from "@/api/wms/purchasereturnRequestMain";
+import {closeTransferissueRequestMain} from "@/api/wms/transferissueRequestMain";
+import * as PurchasereceiptRequestMainApi from "@/api/wms/purchasereceiptRequestMain";
 
 // 调拨出库申请
 defineOptions({ name: 'TransferissueRequestMain' })
@@ -104,13 +107,16 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
   nextTick(() => {
     if (type == 'tableForm') {
       // 明细查询页赋值
-      row[formField] = val[0][searchField]
+      if (formField == 'packingNumber') {
-      row['packingNumber'] = val[0]['packingNumber']
+        row['packingNumber'] = val[0]['packingNumber']
-      row['containerNumber'] = val[0]['containerNumber']
+        row['containerNumber'] = val[0]['containerNumber']
-      row['batch'] = val[0]['batch']
+        row['batch'] = val[0]['batch']
-      row['inventoryStatus'] = val[0]['inventoryStatus']
+        row['inventoryStatus'] = val[0]['inventoryStatus']
-      row['toLocationCode'] = val[0]['locationCode']
+        row['fromLocationCode'] = val[0]['locationCode']
-      row['itemCode'] = val[0]['itemCode']
+        row['itemCode'] = val[0]['itemCode']
+      } else {
+        row[formField] = val[0][searchField]
+      }
     } else {
       const setV = {}
       setV[formField] = val[0][searchField]
@@ -122,13 +128,16 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
 const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
   nextTick(() => {
     const setV = {}
-    setV[formField] = val[0][searchField]
+    if(formField == 'packingNumber'){
-    setV['packingNumber'] = val[0]['packingNumber']
+      setV['packingNumber'] = val[0]['packingNumber']
-    setV['containerNumber'] = val[0]['containerNumber']
+      setV['containerNumber'] = val[0]['containerNumber']
-    setV['batch'] = val[0]['batch']
+      setV['batch'] = val[0]['batch']
-    setV['inventoryStatus'] = val[0]['inventoryStatus']
+      setV['inventoryStatus'] = val[0]['inventoryStatus']
-    setV['toLocationCode'] = val[0]['locationCode']
+      setV['fromLocationCode'] = val[0]['locationCode']
-    setV['itemCode'] = val[0]['itemCode']
+      setV['itemCode'] = val[0]['itemCode']
+    }else {
+      setV[formField] = val[0][searchField]
+    }
     formRef.setValues(setV)
   })
 }
@@ -190,13 +199,13 @@ const isShowMainButton = (row,val) => {
 // 列表-操作按钮
 const butttondata = (row) => {
     return [
-        defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6'])}), // 关闭
+        defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:'wms:transferissue-request-main:close'}), // 关闭
-        defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5'])}), // 重新添加
+        defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:transferissue-request-main:reAdd'}), // 重新添加
-        defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1'])}), // 提交审批
+        defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:transferissue-request-main:submit'}), // 提交审批
-        defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2'])}), // 驳回
+        defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:transferissue-request-main:refused'}), // 驳回
-        defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2'])}), // 审批通过
+        defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:transferissue-request-main:agree'}), // 审批通过
-        defaultButtons.mainListEditBtn({hasPermi:'wms:transferissue-request-main:update'}), // 编辑
+        defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:transferissue-request-main:handle'}), // 处理
-        defaultButtons.mainListDeleteBtn({hasPermi:'wms:transferissue-request-main:delete'}), // 删除
+        defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:transferissue-request-main:update'}), // 编辑
     ]
 }
 
@@ -206,14 +215,21 @@ const butttondata = (row) => {
 const buttonTableClick = async (val, row) => {
   if (val == 'mainClose') { // 关闭
     console.log('列表-操作按钮事件-关闭')
+    handleClose(row.id)
   } else if (val == 'mainReAdd') { // 重新添加
     console.log('列表-操作按钮事件-重新添加')
+    handleReAdd(row.id)
   } else if (val == 'mainSubmit') { // 提交审批
     console.log('列表-操作按钮事件-提交审批')
+    handleSubmit(row.id)
   } else if (val == 'mainTurnDown') { // 驳回
     console.log('列表-操作按钮事件-驳回')
+    handleRefused(row.id)
   } else if (val == 'mainApprove') { // 审批通过
     console.log('列表-操作按钮事件-审批通过')
+    handleAgree(row.id)
+  } else if (val == 'mainHandle') { // 处理
+    handleHandle(row.id)
   } else if (val == 'edit') { // 编辑
     openForm('update', row)
   } else if (val == 'delete') { // 删除
@@ -221,6 +237,66 @@ const buttonTableClick = async (val, row) => {
   }
 }
 
+/** 关闭按钮操作 */
+const handleClose = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmColse'))
+    await TransferissueRequestMainApi.closeTransferissueRequestMain(id)
+    message.success(t('common.closeSuccess'))
+    await getList()
+  } catch {}
+}
+
+/** 重新添加按钮操作 */
+const handleReAdd = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmReAdd'))
+    await TransferissueRequestMainApi.reAddTransferissueRequestMain(id)
+    message.success(t('common.reAddSuccess'))
+    await getList()
+  } catch {}
+}
+
+/** 提交按钮操作 */
+const handleSubmit = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmSubmit'))
+    await TransferissueRequestMainApi.submitTransferissueRequestMain(id)
+    message.success(t('common.submitSuccess'))
+    await getList()
+  } catch {}
+}
+
+/** 审批驳回按钮操作 */
+const handleRefused = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmRefused'))
+    await TransferissueRequestMainApi.refusedTransferissueRequestMain(id)
+    message.success(t('common.refusedSuccess'))
+    await getList()
+  } catch {}
+}
+
+/** 审批通过按钮操作 */
+const handleAgree = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmAgree'))
+    await TransferissueRequestMainApi.agreeTransferissueRequestMain(id)
+    message.success(t('common.agreeSuccess'))
+    await getList()
+  } catch {}
+}
+
+/** 处理按钮操作 */
+const handleHandle = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmHandle'))
+    await TransferissueRequestMainApi.handleTransferissueRequestMain(id)
+    message.success(t('common.handleSuccess'))
+    await getList()
+  } catch {}
+}
+
 /** 添加/修改操作 */
 const formRef = ref()
 const openForm =async (type: string, row?: number) => {

src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts

@@ -11,6 +11,9 @@ import { Dock } from '@/views/wms/basicDataManage/factoryModeling/dock/dock.data
 import * as BalanceApi  from '@/api/wms/balance'
 import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
 
+import * as LocationApi from '@/api/wms/location'
+import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
+
 const { t } = useI18n() // 国际化
 
 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
@@ -24,6 +27,9 @@ const queryParams = {
 
  // 获取当前操作人的部门
 import { useUserStore } from '@/store/modules/user'
+import {Warehouse} from "@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data";
+import * as WarehouseApi from "@/api/wms/warehouse";
+
 const userStore = useUserStore()
 const userDept = userStore.userSelfInfo.dept
 
@@ -88,10 +94,11 @@ export const TransferissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '运输方式',
     field: 'transferMode',
     sort: 'custom',
+    dictType: DICT_TYPE.TRANSFER_MODE,
+    dictClass: 'string',
     table: {
       width: 150
     },
-    isSearch: true,
   },
   {
     label: '车牌号',
@@ -151,7 +158,30 @@ export const TransferissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isForm: false,
+    tableForm: {
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择仓库代码',
+      searchField: 'code',
+      searchTitle: '仓库信息',
+      searchAllSchemas: Warehouse.allSchemas,
+      searchPage: WarehouseApi.getWarehousePage
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '仓库信息', // 查询弹窗标题
+        searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
+        searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
   },
   {
     label: '到仓库代码',
@@ -160,7 +190,30 @@ export const TransferissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isForm: false,
+    tableForm: {
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择仓库代码',
+      searchField: 'code',
+      searchTitle: '仓库信息',
+      searchAllSchemas: Warehouse.allSchemas,
+      searchPage: WarehouseApi.getWarehousePage
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '仓库信息', // 查询弹窗标题
+        searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
+        searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
   },
   {
     label: '从库位类型范围',
@@ -189,7 +242,7 @@ export const TransferissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '从库区代码范围',
-    field: 'fromAreaCode',
+    field: 'fromAreaCodes',
     sort: 'custom',
     table: {
       width: 150
@@ -544,7 +597,12 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       searchField: 'packingNumber',
       searchTitle: '库存余额信息',
       searchAllSchemas: Balance.allSchemas,
-      searchPage: BalanceApi.getBalancePage
+      searchPage: BalanceApi.getBalancePage,
+      searchCondition: [{
+        key: 'warehouseCode',
+        value: 'fromWarehouseCode',
+        isMainValue: true,
+      }]
     },
     form: {
       // labelMessage: '信息提示说明！！！',
@@ -554,7 +612,12 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
         searchField: 'packingNumber',
         searchTitle: '库存余额信息',
         searchAllSchemas: Balance.allSchemas,
-        searchPage: BalanceApi.getBalancePage
+        searchPage: BalanceApi.getBalancePage,
+        searchCondition: [{
+          key: 'warehouseCode',
+          value: 'fromWarehouseCode',
+          isMainValue: true,
+        }]
       }
     }
   },
@@ -603,6 +666,17 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       type: 'Select'
     }
   },
+  {
+    label: '来源库位',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
   {
     label: '到库位代码',
     field: 'toLocationCode',
@@ -611,7 +685,32 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
     tableForm: {
-      disabled: true,
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择库位代码',
+      searchField: 'code',
+      searchTitle: '库位信息',
+      searchAllSchemas: Location.allSchemas,
+      searchPage: LocationApi.getLocationPage
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择库位代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '库位信息', // 查询弹窗标题
+        searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+        searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'warehouseCode',
+          value: 'toWarehouseCode',
+          isMainValue: true,
+        }]
+      }
     }
   },
   {
@@ -758,4 +857,4 @@ export const TransferissueRequestDetailRules = reactive({
   itemCode: [
     { required: true, message: '请选择物品代码', trigger: 'change' }
   ],
-})
+})