Browse Source

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

master_hella_20240701
陈薪名 9 months ago
parent
commit
30610cbf47
  1. 15
      src/api/wms/purchasereceiptJobMain/index.ts
  2. 1
      src/api/wms/purchasereceiptRequestDetail/index.ts
  3. 5
      src/api/wms/purchasereceiptRequestMain/index.ts
  4. 14
      src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts
  5. 10
      src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
  6. 39
      src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue
  7. 35
      src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/index.vue
  8. 3
      src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/sparereceiptRecordMain.data.ts
  9. 11
      src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue
  10. 16
      src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts

15
src/api/wms/purchasereceiptJobMain/index.ts

@ -109,3 +109,18 @@ export const importTemplate = () => {
export const closePurchasereceiptJobMain = (id: number) => {
return request.put({ url: '/wms/purchasereceipt-job-main/close?id=' + id })
}
// 执行备件收货任务主
export const executePurchasereceiptJobMainSpare = (id: number) => {
return request.put({ url: '/wms/purchasereceipt-job-main/executeSpare?id=' + id })
}
// 放弃备件收货任务主
export const abandonPurchasereceiptJobMainSpare = (id: number) => {
return request.put({ url: '/wms/purchasereceipt-job-main/abandon?id=' + id })
}
// 承接采购收货任务主
export const acceptPurchasereceiptJobMain = (id: number) => {
return request.put({ url: '/wms/purchasereceipt-job-main/accept?id=' + id })
}

1
src/api/wms/purchasereceiptRequestDetail/index.ts

@ -32,6 +32,7 @@ export interface PurchasereceiptRequestDetailVO {
toOwnerCode: string
createTime: Date
creator: string
labelStatus: string
}
// 查询采购收货申请子列表

5
src/api/wms/purchasereceiptRequestMain/index.ts

@ -63,6 +63,11 @@ export const createPurchasereceiptRequestMain = async (data: PurchasereceiptRequ
return await request.post({ url: `/wms/purchasereceipt-request-main/create`, data })
}
// 新增备件收货申请主
export const createPurchasereceiptRequestMainSpare = async (data: PurchasereceiptRequestMainVO) => {
return await request.post({ url: `/wms/purchasereceipt-request-main/createSpare`, data })
}
// 修改采购收货申请主
export const updatePurchasereceiptRequestMain = async (data: PurchasereceiptRequestMainVO) => {
return await request.put({ url: `/wms/purchasereceipt-request-main/update`, data })

14
src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts

@ -67,7 +67,7 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
label: '入库包装规格',
field: 'inPackUnit',
sort: 'custom',
isSearch: true,
isSearch: false,
table: {
width: 150
},
@ -94,7 +94,7 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
label: '出库包装规格',
field: 'outPackUnit',
sort: 'custom',
isSearch: true,
isSearch: false,
table: {
width: 150
},
@ -186,7 +186,7 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
label: '补料来源库区',
field: 'repleinshFromArea',
sort: 'custom',
isSearch: true,
isSearch: false,
table: {
width: 150
},
@ -228,7 +228,7 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
label: '管理精度',
field: 'manageMode',
sort: 'custom',
isSearch: true,
isSearch: false,
dictType: DICT_TYPE.MANAGEMENT_MODE,
dictClass: 'string',
// colorType: 'danger',
@ -301,7 +301,7 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
label: '是否可用',
field: 'available',
sort: 'custom',
isSearch: true,
isSearch: false,
dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string',
// colorType: 'danger',
@ -322,13 +322,13 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
label: '出库后剩余库存自动转换为出库包装规格',
field: 'surplusToOutpackunit',
sort: 'custom',
isSearch: true,
isSearch: false,
},
{
label: '超过高储是否允许叫料',
field: 'allowIssueRequest',
sort: 'custom',
isSearch: true,
isSearch: false,
},
{
label: '优先空库位',

10
src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts

@ -445,6 +445,16 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
}
}
},
{
label: '标签状态',
field: 'labelStatus',
sort: 'custom',
table: {
width: 150
},
isForm: false,
isSearch: false,
},
{
label: '操作',
field: 'action',

39
src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue

@ -172,10 +172,10 @@ const isShowMainButton = (row,val) => {
// -
const butttondata = (row) => {
return [
// defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), //
defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-job-main:accept'}), //
defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-job-main:close'}), //
// defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), //
// defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), //
defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:purchasereceipt-job-main:abandon'}), //
defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:purchasereceipt-job-main:execute'}), //
]
}
@ -183,15 +183,38 @@ const butttondata = (row) => {
const buttonTableClick = async (val, row) => {
if (val == 'mainJobExe') { //
console.log('列表-操作按钮事件-执行')
handleExecuteSpare(row.id)
} else if (val == 'mainJobAba') { //
console.log('列表-操作按钮事件-放弃')
handleAbandon(row.id)
} else if (val == 'mainJobClo') { //
handleClose(row.id)
} else if (val == 'mainJobAcc') { //
console.log('列表-操作按钮事件-承接')
handleAccept(row.id)
}
}
/** 执行按钮操作 */
const handleExecuteSpare = async (id: number) => {
try {
await message.confirm("是否确认执行任务!")
await PurchasereceiptJobMainApi.executePurchasereceiptJobMainSpare(id)
message.success("执行成功")
await getList()
} catch {}
}
/** 放弃按钮操作 */
const handleAbandon = async (id: number) => {
try {
await message.confirm("是否确认放弃任务!")
await PurchasereceiptJobMainApi.abandonPurchasereceiptJobMainSpare(id)
message.success("放弃成功")
await getList()
} catch {}
}
/** 关闭按钮操作 */
const handleClose = async (id: number) => {
try {
@ -202,6 +225,16 @@ const handleClose = async (id: number) => {
} catch {}
}
/** 承接按钮操作 */
const handleAccept = async (id: number) => {
try {
await message.confirm("是否承接任务!")
await PurchasereceiptJobMainApi.acceptPurchasereceiptJobMain(id)
message.success("承接成功")
await getList()
} catch {}
}
/** 详情操作 */
const detailRef = ref()
const openDetail = (row: any, titleName: any, titleValue: any) => {

35
src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/index.vue

@ -125,46 +125,17 @@ const buttonBaseClick = (val, item) => {
// -
const butttondata = (row) => {
return [
defaultButtons.mainInspectRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createInspectRequest',hide:!row.inspectRequestFlag}),//
defaultButtons.mainPutawayRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createPutawayRequest',hide:!row.putawayRequestFlag}),//
]
}
// -
const buttonTableClick = async (val, row) => {
if (val == 'putawayRequest') { //
handleCreatePutawayRequest(row.number)
}else if(val == 'inspectRequest'){//
handleCreateInspectRequest(row.number)
}
}
/** 生成采购上架申请按钮操作 */
const handleCreatePutawayRequest = async (number:string) => {
try{
await message.confirm(t('确认生成上架申请吗?'))
tableObject.loading = true
await PurchasereceiptRecordMainApi.createPutawayRequest(number)
message.success(t('上架申请生成成功'))
await getList()
}catch{}finally{
tableObject.loading = false
}
}
/** 生成到货检验申请按钮操作 */
const handleCreateInspectRequest = async (number:string) => {
try{
await message.confirm(t('确认生成到货检验申请吗?'))
tableObject.loading = true
await PurchasereceiptRecordMainApi.createPutawayRequest(number)
message.success(t('到货检验申请生成成功'))
await getList()
}catch{}finally{
tableObject.loading = false
}
}
//
/** 详情操作 */
const detailRef = ref()

3
src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/sparereceiptRecordMain.data.ts

@ -353,9 +353,10 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
label: '操作',
field: 'action',
isDetail: false,
isTable:false,
isForm: false,
table: {
width: 300,
width: 150,
fixed: 'right'
},
}

11
src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue

@ -137,8 +137,6 @@ const updataTableColumns = (val) => {
//
const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
//console.log("formRef",formRef)
//console.log("supplierCode",formRef.value.formRef.formModel.supplierCode)
nextTick(() => {
if (type == 'tableForm') {
//
@ -238,7 +236,10 @@ const isShowMainButton = (row,val) => {
//
const isASNShowMainButton = (row,val) => {
if (val.indexOf(row.status) > -1) {
if(row.sourceType == 'ASN_ExternalReceipt'){
if(row.sourceType == 'spare_PartsReceipt' && row.labelStatus == '3'){
return true
}
if(row.sourceType == 'spare_PartsReceipt' && row.labelStatus == '1'){
return false
}
} else {
@ -300,7 +301,6 @@ const buttonTableClick = async (val, row) => {
}
}
//
const isCreateLabel = ref(false)
const formLabelRef = ref()
@ -330,7 +330,6 @@ const labelPrint = async (row) => {
window.open(src.value + '&asn_number=' + row.asnNumber)
}
/** 添加/修改操作 */
const formRef = ref()
const openForm =async (type: string, row?: number) => {
@ -469,7 +468,7 @@ const submitForm = async (formType, data) => {
data.subList = tableData.value //
try {
if (formType === 'create') {
await PurchasereceiptRequestMainApi.createPurchasereceiptRequestMain(data)
await PurchasereceiptRequestMainApi.createPurchasereceiptRequestMainSpare(data)
message.success(t('common.createSuccess'))
} else {
await PurchasereceiptRequestMainApi.updatePurchasereceiptRequestMain(data)

16
src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts

@ -446,6 +446,16 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
}
}
},
{
label: '标签状态',
field: 'labelStatus',
sort: 'custom',
table: {
width: 150
},
isForm: false,
isSearch: false,
},
{
label: '操作',
field: 'action',
@ -1073,18 +1083,12 @@ export const PurchasereceiptRequestDetailRules = reactive({
expireDate: [
{ required: true, message: '请输入过期日期', trigger: 'change' }
],
packQty: [
{ required: true, message: '请输入包装数量', trigger: 'blur' }
],
poNumber: [
{ required: true, message: '请输入订单号', trigger: 'change' }
],
poLine: [
{ required: true, message: '请输入订单行', trigger: 'change' }
],
packUnit: [
{ required: true, message: '请选择包装规格', trigger: 'change' }
],
convertRate: [
{ required: true, message: '请输入转换率', trigger: 'blur' }
],

Loading…
Cancel
Save