From 5055dc3a9445dee1a85f3a74754e4bb29d73094b Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Tue, 16 Apr 2024 13:10:39 +0800 Subject: [PATCH 1/5] =?UTF-8?q?excel:=E5=85=B3=E4=BA=8E=E8=A6=81=E8=B4=A7?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E7=9A=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliver/purchasePlanMain/index.vue | 6 ++++++ .../purchasePlanMain/purchasePlanMain.data.ts | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue index 9e86245c7..b34d082ac 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue @@ -75,6 +75,7 @@ import * as PurchaseDetailApi from '@/api/wms/purchaseDetail' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' import { PurchaseDetail } from '../purchaseMain/purchaseMain.data' + import dayjs from 'dayjs' // 要货计划 defineOptions({ name: 'PurchasePlanMain' }) @@ -313,6 +314,11 @@ const getSearchTableData = async (number,formField,searchField)=>{ const openForm = async (type : string, row ?: number) => { tableData.value = [] // 重置明细数据 formRef.value.open(type, row) + if('create'==type){ + nextTick(async () => { + formRef.value.formRef.setValues({deliveryDate:dayjs().format('YYYY-MM-DD')}) + }) + } } // 获取部门 用于详情 部门回显 const { wsCache } = useCache() diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts index 9a4167f45..1e10f60a9 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts @@ -412,7 +412,8 @@ export const PurchasePlanDetail = useCrudSchemas(reactive([ width: 180 }, tableForm: { - isInpuFocusShow: true, + disabled: true, + isInpuFocusShow: false, searchListPlaceholder: '请选择订单号', searchField: 'number', searchTitle: '采购订单信息', @@ -490,7 +491,8 @@ export const PurchasePlanDetail = useCrudSchemas(reactive([ }, tableForm: { multiple:true, - isInpuFocusShow: true, + disabled: true, + isInpuFocusShow: false, searchListPlaceholder: '请选择订单行', searchField: 'lineNumber', searchTitle: '采购订单信息', From 0a082de5deb82f93cd238732d90b22b01d4623fc Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Tue, 16 Apr 2024 13:30:43 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=B8=8A=E6=9E=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=92=8C=E8=A1=A5=E6=96=99=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E4=B8=AD=E6=98=BE=E7=A4=BA=E7=89=A9=E6=96=99=E5=8F=B7=E3=80=81?= =?UTF-8?q?=E6=9D=A5=E6=BA=90=E5=BA=93=E4=BD=8D=E3=80=81=E7=9B=AE=E6=A0=87?= =?UTF-8?q?=E5=BA=93=E4=BD=8D=E3=80=81=E6=95=B0=E9=87=8F=E3=80=81=E5=8D=95?= =?UTF-8?q?=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repleinshJobMain/repleinshJobMain.data.ts | 43 +++++++++++++++++++ .../putawayJobMain/putawayJobMain.data.ts | 43 +++++++++++++++++++ 2 files changed, 86 insertions(+) diff --git a/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts index eddd68caa..81d9c430d 100644 --- a/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts +++ b/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts @@ -457,6 +457,49 @@ export const RepleinshJobMain = useCrudSchemas(reactive([ } }, }, + { + label: '物料号', + field: 'code', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '来源库位', + field: 'fromLocationCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '目标库位', + field: 'toLocationCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '数量', + field: 'qty', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '单位', + field: 'unit', + sort: 'custom', + dictType: DICT_TYPE.PACK_UNIT, + dictClass: 'string', + isSearch: false, + table: { + width: 150 + }, + }, { label: '创建者', field: 'creator', diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts index 3bb41dcd2..3b98cefbc 100644 --- a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts +++ b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts @@ -487,6 +487,49 @@ export const PutawayJobMain = useCrudSchemas(reactive([ } } }, + { + label: '物料号', + field: 'code', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '来源库位', + field: 'fromLocationCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '目标库位', + field: 'toLocationCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '数量', + field: 'qty', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '单位', + field: 'unit', + sort: 'custom', + dictType: DICT_TYPE.PACK_UNIT, + dictClass: 'string', + isSearch: false, + table: { + width: 150 + }, + }, { label: '操作', field: 'action', From 179772056665ccc50629c71d4e4ebbaba8640565 Mon Sep 17 00:00:00 2001 From: zhousq Date: Tue, 16 Apr 2024 14:05:15 +0800 Subject: [PATCH 3/5] =?UTF-8?q?2024-4*-16=20=E5=B7=A5=E8=89=BA=E8=B7=AF?= =?UTF-8?q?=E7=94=B1=E9=85=8D=E7=BD=AE=E4=B8=AD=E5=88=9D=E5=A7=8B=E5=8C=96?= =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E7=9A=84=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/mes/processroute/index.ts | 5 +++ .../processroute/components/configDialog.vue | 35 +++++++++++-------- 2 files changed, 26 insertions(+), 14 deletions(-) diff --git a/src/api/mes/processroute/index.ts b/src/api/mes/processroute/index.ts index 04e7c6abd..b18879dc3 100644 --- a/src/api/mes/processroute/index.ts +++ b/src/api/mes/processroute/index.ts @@ -30,6 +30,11 @@ export const getProcessroutePage = async (params) => { export const getProcessroute = async (id: number) => { return await request.get({ url: `/mes/processroute/get?id=` + id }) } +// 查询工艺路线定义的工序列表 +export const getProcessrouteNodeList = async (code:any) => { + return await request.get({ url: `/mes/processrouteNodeDetail/getRouteNodes?code=`+code }) +} + // 新增工艺路线定义 export const createProcessroute = async (data: ProcessrouteVO) => { diff --git a/src/views/mes/processroute/components/configDialog.vue b/src/views/mes/processroute/components/configDialog.vue index d68b94120..cf4426e07 100644 --- a/src/views/mes/processroute/components/configDialog.vue +++ b/src/views/mes/processroute/components/configDialog.vue @@ -145,7 +145,6 @@ import { start_node, end_node, createGraph, getNewNode } from './graphbase.data' import {ProcessSearch} from '../../publicUtil/processSearch.data' import * as ProcessrouteApi from '@/api/mes/processroute' import { Graph } from '@antv/x6' -import { get } from 'http' const graphContainer = ref(null) defineOptions({ name: 'ProcessRouteConfig' }) const isShowDrawer = ref(false) @@ -234,11 +233,12 @@ const openDetail = (row: any) => { materialData.value = [] mouldData.value = [] workStationList.value = [] - graph.value.on('node:click', ({ e, x, y, node, view }) => { + graph.value.on('node:dblclick', ({ e, x, y, node, view }) => { nodeClick(e, x, y, node, view) }) graph.value.fromJSON(graphJson.cells) }) + getProcessList(rowData.value.processrouteCode) getItembasicInfo(rowData.value.productCode) getRemarkList() getFileList() @@ -275,17 +275,24 @@ const getPatternPage = async (code) => { const getWorkstationPage = async (code) => { return await ProcessrouteApi.getWorkstationPage(code); } -const processListParmas = ref({ - name: '', - workshopCode: '', - productionLineCode:'', - pageNum: 1, - pageSize: 50 -}) -/**获取工序列表 */ -const getProcessList = async () => { - const res = await ProcessrouteApi.getProcessList(processListParmas.value) - processData.value = res.list +// const processListParmas = ref({ +// name: '', +// workshopCode: '', +// productionLineCode:'', +// pageNum: 1, +// pageSize: 50 +// }) +// /**获取基础工序列表 */ +// const getProcessList = async () => { +// const res = await ProcessrouteApi.getProcessList(processListParmas.value) +// processData.value = res.list +// //return res +// } +/**获取工艺路线定义的工序列表 */ +const getProcessList = async (code) => { + console.log('code',code) + const res = await ProcessrouteApi.getProcessrouteNodeList(code) + processData.value = res //return res } // 并行执行所有异步操作 @@ -353,7 +360,7 @@ defineExpose({ openDetail, createGraph }) // 提供 open 方法，用于打开 onMounted?.(() => { //registerNodes() - getProcessList() + //getProcessList() }) //保存图形 const saveResult = async () => { From 520c22f7d34d5019cdbfab2c9df432795af7af65 Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Tue, 16 Apr 2024 14:11:46 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E7=BF=BB=E5=8C=85=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E6=94=AF=E6=8C=81=E8=A1=A5=E6=89=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 8 ++-- .../packageoverRetrospect/index.vue | 39 ++++++++++++++++++- .../packageoverRetrospect.data.ts | 10 +++++ 3 files changed, 52 insertions(+), 5 deletions(-) diff --git a/.env.development b/.env.development index fdfc9d74e..de969391d 100644 --- a/.env.development +++ b/.env.development @@ -4,10 +4,10 @@ NODE_ENV=development VITE_DEV=false # 请求路径 -VITE_BASE_URL='http://localhost:12080' +VITE_BASE_URL='http://192.168.0.108:12080' # 上传路径 -VITE_UPLOAD_URL='http://localhost:12080/api/admin-api/infra/file/upload' +VITE_UPLOAD_URL='http://192.168.0.108:12080/api/admin-api/infra/file/upload' # 接口前缀 VITE_API_BASEPATH=/dev-api @@ -31,7 +31,7 @@ VITE_SOURCEMAP=false VITE_OUT_DIR=dist # 自定义接口路径 -VITE_INTERFACE_URL='http://localhost:12080/magic/web/index.html' +VITE_INTERFACE_URL='http://192.168.0.108:12080/magic/web/index.html' # 积木报表请求路径 -VITE_JMREPORT_BASE_URL='http://localhost:12080' \ No newline at end of file +VITE_JMREPORT_BASE_URL='http://192.168.0.108:12080' \ No newline at end of file diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/index.vue b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/index.vue index 674d15de0..8389e39ab 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/index.vue +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/index.vue @@ -32,6 +32,9 @@ {{ row.number }} + @@ -42,9 +45,11 @@