sfms3.0
/
sfms3.0-ui
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

装配收货子子表记录生成

master_hella_20240701
chenfang 1 year ago
parent
450e8fbfb1
commit
974924b1e8
6 changed files with 330 additions and 160 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 51
      src/api/wms/productreceiptDetailb/index.ts
  2. 139
      src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue
  3. 157
      src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/index.vue
  4. 20
      src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts
  5. 8
      src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue
  6. 113
      src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts

51
src/api/wms/productreceiptDetailb/index.ts
View File

@ -0,0 +1,51 @@
import request from '@/config/axios'
export interface ProductreceiptDetailbVO {
id: number
packingNumber: string
batch: string
masterId: number
number: string
itemCode: string
itemName: string
outsideItemCode: string
outsideProduceDate: string
outsideSerialNumber: string
remark: string
}
// 查询制品收货记录子列表
export const getProductreceiptDetailbPage = async (params) => {
if (params.isSearch) {
delete params.isSearch
const data = {...params}
return await request.post({ url: '/wms/productreceipt-detailb/senior', data })
} else {
return await request.get({ url: `/wms/productreceipt-detailb/page`, params })
}
}
// 查询制品收货记录子详情
export const getProductreceiptDetailb = async (id: number) => {
return await request.get({ url: `/wms/productreceipt-detailb/get?id=` + id })
}
// 新增制品收货记录子
export const createProductreceiptDetailb = async (data: ProductreceiptDetailbVO) => {
return await request.post({ url: `/wms/productreceipt-detailb/create`, data })
}
// 修改制品收货记录子
export const updateProductreceiptDetailb = async (data: ProductreceiptDetailbVO) => {
return await request.put({ url: `/wms/productreceipt-detailb/update`, data })
}
// 删除制品收货记录子
export const deleteProductreceiptDetailb = async (id: number) => {
return await request.delete({ url: `/wms/productreceipt-detailb/delete?id=` + id })
}
// 导出制品收货记录子 Excel
export const exportProductreceiptDetailb = async (params) => {
return await request.download({ url: `/wms/productreceipt-detailb/export-excel`, params })
}

139
src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue
View File

@ -172,83 +172,86 @@ const butttondata = (row) => {
const buttonTableClick = async (val, row) => { const buttonTableClick = async (val, row) => {
if (val == 'mainJobExe') { // 执行 if (val == 'mainJobExe') { // 执行
let aaa = { let aaa = {
"id": "1809190001478278226", "id": 8,
"requestNumber": "REC4620231212-0011", "requestNumber": "REQ1120240401-0001",
"productionPlanNumber": "WP20231212-0002", "productionPlanNumber": "WP20240401-0001",
"workShopCode": "work2", "workShopCode": "work1",
"team": "7", "team": "T01",
"shift": "8", "shift": "bc002",
"details": null, "details": null,
"requestTime": 1702376849000, "requestTime": 1711952813000,
"requestDueTime": null, "requestDueTime": null,
"status": "2", "status": "2",
"expiredTime": null, "expiredTime": null,
"updateTime": 1702376904000, "updateTime": 1711952823000,
"updater": "超级管理员", "updater": "超级管理员",
"jobStageStatus": null, "jobStageStatus": null,
"priority": null, "priority": null,
"priorityIncrement": null, "priorityIncrement": null,
"departmentCode": "103", "departmentCode": "100",
"acceptUserId": "1", "acceptUserId": "1",
"acceptTime": 1702376913000, "acceptTime": 1711952975000,
"completeUserId": "1", "completeUserId": null,
"completeTime": 1702377036000, "completeTime": null,
"toWarehouseCode": null, "toWarehouseCode": null,
"toAreaCodes": "", "toAreaCodes": "",
"fromAreaTypes": "WIP", "fromAreaTypes": "WIP",
"toAreaTypes": "WIP", "toAreaTypes": "WIP",
"number": "JOB2120231212-0001", "number": "JOB2120240401-0001",
"businessType": "ProductReceipt", "businessType": "ProductReceipt",
"remark": null, "remark": null,
"createTime": 1702376904000, "createTime": 1711952823000,
"creator": "超级管理员", "creator": "超级管理员",
"autoComplete": "FALSE", "autoComplete": "FALSE",
"allowModifyLocation": "FALSE", "allowModifyLocation": "FALSE",
"allowModifyQty": "TRUE", "allowModifyQty": "TRUE",
"allowBiggerQty": "TRUE", "allowBiggerQty": "TRUE",
"allowSmallerQty": "TRUE", "allowSmallerQty": "TRUE",
"allowModifyInventoryStatus": "TRUE", "allowModifyInventoryStatus": "TRUE",
"allowContinuousScanning": "TRUE", "allowContinuousScanning": "TRUE",
"allowPartialComplete": "TRUE", "allowPartialComplete": "TRUE",
"allowModifyBatch": "FALSE", "allowModifyBatch": "FALSE",
"allowModifyPackingNumber": "FALSE", "allowModifyPackingNumber": "FALSE",
"inInventoryStatuses": "OK", "inInventoryStatuses": "OK",
"outInventoryStatuses": "OK", "outInventoryStatuses": "OK",
"concurrencyStamp": null, "concurrencyStamp": 2,
"type": "assemble",
subList: [ subList: [
{ {
"id": "1809190000003953999", "id": 8,
"productionLineCode": "line4", "productionLineCode": "work1-line1",
"workStationCode": "station4", "workStationCode": "station1",
"processCode": null, "processCode": null,
"packingNumber": "PN-00113", "packingNumber": "PN0401-000072",
"containerNumber": null, "containerNumber": null,
"batch": "20231212", "batch": "20240401",
"produceDate": null, "produceDate": 1711987200000,
"expireDate": null, "expireDate": 1712073600000,
"inventoryStatus": "OK", "inventoryStatus": "OK",
"toLocationCode": "901",
"woNumber": null, "woNumber": null,
"woLine": null, "woLine": null,
"packQty": 8, "packQty": 5,
"packUnit": "BOX", "packUnit": "Box-05",
"itemCode": "item01", "itemCode": "399.960-12",
"itemName": "物料01", "itemName": "远光内侧反射镜(镀铝)右灯",
"itemDesc1": "", "itemDesc1": null,
"itemDesc2": "", "itemDesc2": null,
"projectCode": "xm01", "projectCode": null,
"qty": 2, "qty": 5,
"uom": "EA", "uom": "EA",
"number": "JOB2120231212-0001", "number": "JOB2120240401-0001",
"remark": null, "remark": null,
"createTime": 1702376904000, "createTime": 1711952823000,
"creator": "1", "creator": "超级管理员",
"toOwnerCode": null, "toOwnerCode": null,
handleQty: 10, "updateTime": 1711952823000,
toPackingNumber: '12', "updater": "超级管理员",
toContainerNumber: '001', handleQty: 5,
toBatch: '21', toPackingNumber: "PN0401-000072",
toInventoryStatus: 'OK', toContainerNumber: null,
toLocationCode: 'H03', toBatch: '20240401',
toInventoryStatus: 'OK'
} }
] ]
} }

157
src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/index.vue
View File

@ -171,83 +171,86 @@ const butttondata = (row) => {
const buttonTableClick = async (val, row) => { const buttonTableClick = async (val, row) => {
if (val == 'mainJobExe') { // 执行 if (val == 'mainJobExe') { // 执行
let aaa = { let aaa = {
"id": "1809190001478278226", "id": 8,
"requestNumber": "REC4620231212-0011", "requestNumber": "REQ1120240401-0001",
"productionPlanNumber": "WP20231212-0002", "productionPlanNumber": "WP20240401-0001",
"workShopCode": "work2", "workShopCode": "work1",
"team": "7", "team": "T01",
"shift": "8", "shift": "bc002",
"details": null, "details": null,
"requestTime": 1702376849000, "requestTime": 1711952813000,
"requestDueTime": null, "requestDueTime": null,
"status": "2", "status": "2",
"expiredTime": null, "expiredTime": null,
"updateTime": 1702376904000, "updateTime": 1711952823000,
"updater": "超级管理员", "updater": "超级管理员",
"jobStageStatus": null, "jobStageStatus": null,
"priority": null, "priority": null,
"priorityIncrement": null, "priorityIncrement": null,
"departmentCode": "103", "departmentCode": "100",
"acceptUserId": "1", "acceptUserId": "1",
"acceptTime": 1702376913000, "acceptTime": 1711952975000,
"completeUserId": "1", "completeUserId": null,
"completeTime": 1702377036000, "completeTime": null,
"toWarehouseCode": null, "toWarehouseCode": null,
"toAreaCodes": "", "toAreaCodes": "",
"fromAreaTypes": "WIP", "fromAreaTypes": "WIP",
"toAreaTypes": "WIP", "toAreaTypes": "WIP",
"number": "JOB2120231212-0001", "number": "JOB2120240401-0001",
"businessType": "ProductReceipt", "businessType": "ProductReceipt",
"remark": null, "remark": null,
"createTime": 1702376904000, "createTime": 1711952823000,
"creator": "超级管理员", "creator": "超级管理员",
"autoComplete": "FALSE", "autoComplete": "FALSE",
"allowModifyLocation": "FALSE", "allowModifyLocation": "FALSE",
"allowModifyQty": "TRUE", "allowModifyQty": "TRUE",
"allowBiggerQty": "TRUE", "allowBiggerQty": "TRUE",
"allowSmallerQty": "TRUE", "allowSmallerQty": "TRUE",
"allowModifyInventoryStatus": "TRUE", "allowModifyInventoryStatus": "TRUE",
"allowContinuousScanning": "TRUE", "allowContinuousScanning": "TRUE",
"allowPartialComplete": "TRUE", "allowPartialComplete": "TRUE",
"allowModifyBatch": "FALSE", "allowModifyBatch": "FALSE",
"allowModifyPackingNumber": "FALSE", "allowModifyPackingNumber": "FALSE",
"inInventoryStatuses": "OK", "inInventoryStatuses": "OK",
"outInventoryStatuses": "OK", "outInventoryStatuses": "OK",
"concurrencyStamp": null, "concurrencyStamp": 2,
subList: [ "type": "assemble",
{ "subList": [
"id": "1809190000003953999", {
"productionLineCode": "line4", "id": 8,
"workStationCode": "station4", "productionLineCode": "work1-line1",
"processCode": null, "workStationCode": "station1",
"packingNumber": "PN-00113", "processCode": null,
"containerNumber": null, "packingNumber": "PN0401-000072",
"batch": "20231212", "containerNumber": null,
"produceDate": null, "batch": "20240401",
"expireDate": null, "produceDate": 1711987200000,
"inventoryStatus": "OK", "expireDate": 1712073600000,
"woNumber": null, "inventoryStatus": "OK",
"woLine": null, "toLocationCode": "901",
"packQty": 8, "woNumber": null,
"packUnit": "BOX", "woLine": null,
"itemCode": "item01", "packQty": 5,
"itemName": "物料01", "packUnit": "Box-05",
"itemDesc1": "", "itemCode": "399.960-12",
"itemDesc2": "", "itemName": "远光内侧反射镜(镀铝)右灯",
"projectCode": "xm01", "itemDesc1": null,
"qty": 2, "itemDesc2": null,
"uom": "EA", "projectCode": null,
"number": "JOB2120231212-0001", "qty": 5,
"remark": null, "uom": "EA",
"createTime": 1702376904000, "number": "JOB2120240401-0001",
"creator": "1", "remark": null,
"toOwnerCode": null, "createTime": 1711952823000,
handleQty: 10, "creator": "超级管理员",
toPackingNumber: '12', "toOwnerCode": null,
toContainerNumber: '001', "updateTime": 1711952823000,
toBatch: '21', "updater": "超级管理员",
toInventoryStatus: 'OK', handleQty: 5,
toLocationCode: 'H03', toPackingNumber: "PN0401-000072",
toContainerNumber: null,
toBatch: '20240401',
toInventoryStatus: 'OK'
} }
] ]
} }

20
src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts
View File

@ -536,16 +536,16 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
} }
} }
}, },
// { {
// label: '操作', label: '操作',
// field: 'action', field: 'action',
// isDetail: false, isDetail: false,
// isForm: false, isForm: false,
// table: { table: {
// width: 120, width: 120,
// fixed: 'right' fixed: 'right'
// }, },
// } }
])) ]))
//表单校验 //表单校验

8
src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue
View File

@ -70,7 +70,7 @@
max-height="450px" max-height="450px"
> >
<Table <Table
:columns="BackflushRecordDetailb.allSchemas.tableColumns" :columns="ProductreceiptDetailb.allSchemas.tableColumns"
:data="detatableDataBom.tableList" :data="detatableDataBom.tableList"
:loading="detatableDataBom.loading" :loading="detatableDataBom.loading"
:pagination="{ :pagination="{
@ -85,11 +85,11 @@
<script setup lang="ts"> <script setup lang="ts">
import download from '@/utils/download' import download from '@/utils/download'
import { ProductreceiptRecordMain,ProductreceiptRecordMainRules,ProductreceiptRecordDetail,ProductreceiptRecordDetailRules, BackflushRecordDetailb } from './productreceiptAssembleRecordMain.data' import { ProductreceiptRecordMain,ProductreceiptRecordMainRules,ProductreceiptRecordDetail,ProductreceiptRecordDetailRules, ProductreceiptDetailb } from './productreceiptAssembleRecordMain.data'
import * as ProductreceiptRecordMainApi from '@/api/wms/productreceiptRecordMain' import * as ProductreceiptRecordMainApi from '@/api/wms/productreceiptRecordMain'
import * as ProductreceiptRecordDetailApi from '@/api/wms/productreceiptRecordDetail' import * as ProductreceiptRecordDetailApi from '@/api/wms/productreceiptRecordDetail'
import * as defaultButtons from '@/utils/disposition/defaultButtons' import * as defaultButtons from '@/utils/disposition/defaultButtons'
import * as BackflushRecordDetailbApi from '@/api/wms/backflushRecordDetailb' import * as ProductreceiptDetailbApi from '@/api/wms/productreceiptDetailb'
import { CACHE_KEY, useCache } from '@/hooks/web/useCache' import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
// 装配收货记录主 // 装配收货记录主
@ -118,7 +118,7 @@ const buttondataTable = ref([{
const DialogTitle = ref('Bom信息') const DialogTitle = ref('Bom信息')
const bomModelVisible = ref(false) const bomModelVisible = ref(false)
const { tableObject: detatableDataBom, tableMethods: detatableMethodsBom } =useTable({ const { tableObject: detatableDataBom, tableMethods: detatableMethodsBom } =useTable({
getListApi: BackflushRecordDetailbApi.getBackflushRecordDetailbPage getListApi: ProductreceiptDetailbApi.getProductreceiptDetailbPage
}) })
const { getList:getDetailListBom } = detatableMethodsBom const { getList:getDetailListBom } = detatableMethodsBom

113
src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts
View File

@ -957,3 +957,116 @@ export const BackflushRecordDetailbRules = reactive({
{ required: true, message: '请输入创建者', trigger: 'blur' } { required: true, message: '请输入创建者', trigger: 'blur' }
], ],
}) })
// 表单校验
export const ProductreceiptDetailbRules = reactive({
masterId: [required],
})
export const ProductreceiptDetailb = useCrudSchemas(reactive<CrudSchema[]>([
{
label: '包装号',
field: 'packingNumber',
sort: 'custom',
isSearch: true,
},
{
label: '批次',
field: 'batch',
sort: 'custom',
isSearch: true,
},
{
label: '主表ID',
field: 'masterId',
sort: 'custom',
isSearch: true,
form: {
component: 'InputNumber',
value: 0
},
},
{
label: '单据号',
field: 'number',
sort: 'custom',
isSearch: true,
},
{
label: '物品代码',
field: 'itemCode',
sort: 'custom',
isSearch: true,
},
{
label: '物品名称',
field: 'itemName',
sort: 'custom',
isSearch: true,
},
{
label: '外部零件号',
field: 'outsideItemCode',
sort: 'custom',
isSearch: true,
},
{
label: '外部生产日期',
field: 'outsideProduceDate',
sort: 'custom',
formatter: dateFormatter,
isSearch: true,
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')]
}
},
form: {
component: 'DatePicker',
componentProps: {
type: 'datetime',
valueFormat: 'x'
}
},
},
{
label: '外部流水号',
field: 'outsideSerialNumber',
sort: 'custom',
isSearch: true,
},
{
label: '备注',
field: 'remark',
sort: 'custom',
isSearch: true,
},
{
label: '创建时间',
field: 'createTime',
sort: 'custom',
formatter: dateFormatter,
isSearch: true,
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: 'action',
isForm: false,
table: {
width: 150,
fixed: 'right'
}
}
]))

Write Preview
Loading…
Cancel
Save