Browse Source

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

intex_online20241228
宋国强 2 months ago
parent
commit
4442233198
  1. 2
      src/views/wms/deliversettlementManage/moldAllocation/customerStatement/index.vue
  2. 1
      src/views/wms/inventoryManage/balance/balance.data.ts
  3. 11
      src/views/wms/inventoryManage/package/index.vue
  4. 47
      src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
  5. 17
      src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
  6. 12
      src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
  7. 20
      src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
  8. 63
      src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
  9. 13
      src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
  10. 59
      src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
  11. 13
      src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
  12. 42
      src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/index.vue
  13. 39
      src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/index.vue

2
src/views/wms/deliversettlementManage/moldAllocation/customerStatement/index.vue

@ -175,7 +175,7 @@ routeName.value = route.name
const tableColumns = ref(CustomerStatementMain.allSchemas.tableColumns)
const apiPage = ref(CustomerStatementDetailApi.getCustomerStatementDetailPage)
const DetailAllSchemas = ref(CustomerStatementShareReconciliation.allSchemas)
const DetailAllSchemas = ref(CustomerStatementDetail.allSchemas)
const tabsExtend = ref(false)
const tableObjectExtend = ref()

1
src/views/wms/inventoryManage/balance/balance.data.ts

@ -74,6 +74,7 @@ export const Balance = useCrudSchemas(
label: '供应商批次',
field: 'altBatch',
sort: 'custom',
isTable: false,
table: {
width: 150
},

11
src/views/wms/inventoryManage/package/index.vue

@ -369,8 +369,15 @@ const handlePoint = async (row) => {
}
if (res.cgLabel) {
//
const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
window.open(src.value+'&asn_number='+res.cgLabel)
// const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
// window.open(src.value+'&asn_number='+res.cgLabel)
PackageApi.getPrintingLableId({packingNumbers:[row.number]}).then(res => {
console.log(res)
window.open(BASE_URL + '/jmreport/view/1016234988731322368?token=' + getAccessToken()+'&id=' + res)
}).catch(err => {
console.log(err)
message.error('创建标签失败')
})
}
if(!res.cgLabel&&!res.zzLabel){
message.warning('包装不存在,无法打印或者是线边物料数据不生成包装!')

47
src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue

@ -135,7 +135,7 @@ const tableColumns = ref([...ProductionreturnRequestMain.allSchemas.tableColumns
//
const detailListTableColumns =cloneDeep(ProductionreturnRequestDetailLabel.allSchemas)
const detailListTableColumnsRules =cloneDeep(ProductionreturnRequestDetailLabel)
const detailListTableColumnsRules =cloneDeep(ProductionreturnRequestDetailLabelRules)
const isCreateLabel = ref(false)
const formLabelRef = ref()
const labelType = ref('') //
@ -704,20 +704,51 @@ const searchTableSuccess1 = async (formField, searchField, val, formRef, type, r
return
}
// window.open(src.value + '&asn_number=' + val.map(item1=>item1.number).join(','))
let array = []//
let array1 = []//
let packingNumbers = []
val.forEach((item,index) => {
packingNumbers.push(item.number)
await PackageApi.batchPrintingLable(val.map(item1=>item1.number).join(',')).then(res => {
if (item.itemType == '可采购') {
array.push(item)
}
if (item.itemType == '可制造') {
array1.push(item)
}
})
if (array.length>0) {
await PackageApi.getPrintingLableId({packingNumbers:array.map(item1=>item1.number)}).then(res => {
console.log(res)
if (labelType.value == 'cg') {
const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
window.open(src.value+'&asn_number='+res)
} else {
const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
window.open(src.value+'&asn_number='+res)
window.open(BASE_URL + '/jmreport/view/1016234988731322368?token=' + getAccessToken()+'&id=' + res)
}).catch(err => {
console.log(err)
message.error('创建标签失败')
})
}
if (array1.length > 0) {
await PackageApi.batchPrintingLable(array1.map(item1=>item1.number).join(',')).then(res => {
console.log(res)
const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
window.open(src.value + '&asn_number=' + res)
}).catch(err => {
console.log(err)
message.error('创建标签失败')
})
}
// await PackageApi.batchPrintingLable(val.map(item1=>item1.number).join(',')).then(res => {
// console.log(res)
// if (labelType.value == 'cg') {
// const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
// window.open(src.value+'&asn_number='+res)
// } else {
// const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
// window.open(src.value+'&asn_number='+res)
// }
// }).catch(err => {
// console.log(err)
// message.error('')
// })
}
//

17
src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts

@ -1478,6 +1478,8 @@ export const ProductionreturnRequestDetailLabel = useCrudSchemas(reactive<CrudSc
},
tableForm: {
disabled: true,
type: 'FormDate',
format: 'YYYYMMDD',
valueFormat: 'YYYYMMDD',
},
form: {
@ -1670,7 +1672,11 @@ export const ProductionreturnRequestDetailLabelRules = reactive({
],
productionLineCodePackage: [
{ required: true, message: '请选择生产线', trigger: 'change' }
]
],
batch: [
{ required: true, message: '请输入批次', trigger: ['blur', 'change'] }
],
})
@ -1724,6 +1730,13 @@ export const SupplierdeliverRequestPackage = useCrudSchemas(reactive<CrudSchema[
width: 150,
},
},
{
label: '物料类型',
field: 'itemType',
sort: 'custom',
tableForm: {
disabled: true
}
},
]))

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

@ -254,6 +254,12 @@ InventorymoveRequestDetail.allSchemas.tableFormColumns.map(item => {
if(item.field == 'itemCode') {
if (fromInventoryStatus.value) {
item.tableForm.searchCondition = [
{
key:'fromWarehouseCode',
value:'fromWarehouseCode',
message: '请选择从仓库代码!',
isMainValue: true
},
{
key: 'businessType',
value: businessType.value ,
@ -268,6 +274,12 @@ InventorymoveRequestDetail.allSchemas.tableFormColumns.map(item => {
]
} else if (fromInventoryStatus.value == null) {
item.tableForm.searchCondition = [
{
key:'fromWarehouseCode',
value:'fromWarehouseCode',
message: '请选择从仓库代码!',
isMainValue: true
},
{
key: 'businessType',
value: businessType.value ,

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

@ -527,6 +527,16 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
searchTitle: '库存余额信息',
searchAllSchemas: BalancePopWindow.allSchemas,
searchPage: BalanceApi.selectLocationTypeToBalance,
searchCondition: [{
key:'fromWarehouseCode',
value:'fromWarehouseCode',
message: '请选择从仓库代码!',
isMainValue: true
},{
key: 'available',
value: 'TRUE',
isMainValue: false
}],
},
form: {
// labelMessage: '信息提示说明!!!',
@ -537,6 +547,16 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
searchTitle: '库存余额信息',
searchAllSchemas: BalancePopWindow.allSchemas,
searchPage: BalanceApi.selectLocationTypeToBalance,
searchCondition: [{
key:'fromWarehouseCode',
value:'fromWarehouseCode',
message: '请选择从仓库代码!',
isMainValue: true
},{
key: 'available',
value: 'TRUE',
isMainValue: false
}],
}
}
},

63
src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue

@ -195,6 +195,7 @@ import * as ConfigApi from '@/api/infra/config'
import { usePageLoading } from '@/hooks/web/usePageLoading'
import {exportProductreceiptRequestMainPredict} from "@/api/wms/productreceiptRequestMain";
import * as ItemPackageApi from "@/api/wms/itempackage";
import * as ruleApi from '@/api/wms/rule/index'
const { loadStart, loadDone } = usePageLoading()
//
//
@ -481,6 +482,7 @@ const butttondata = (row, $index) => {
]
}
let toManagementPrecision = ref('')
// -
const buttonTableClick = async (val, row) => {
if (val == 'mainClose') {
@ -622,6 +624,19 @@ const buttonTableClick = async (val, row) => {
return
}
})
ruleApi.getManagementPrecision({
itemCodes: [item['itemCode']],
locationCode: item.toLocationCode
}).then((res) => {
toManagementPrecision.value = res[0].ManagementPrecision
})
if ( toManagementPrecision.value == 'BY_BATCH') {
// row['fromBatchFormItemType'] = 'FormDate'
row['disabled_batch'] = false
} else {
// row['fromBatchFormItemType'] = ''
row['disabled_batch'] = true
}
})
} else if (val == 'mainHandle') {
//
@ -959,22 +974,52 @@ const searchTableSuccessLabel = async (formField, searchField, val, formRef, typ
return
}
// window.open(src.value + '&asn_number=' + val.map(item1=>item1.number).join(','))
let array = []//
let array1 = []//
let packingNumbers = []
val.forEach((item,index) => {
packingNumbers.push(item.number)
await PackageApi.batchPrintingLable(val.map((item1) => item1.number).join(','))
.then((res) => {
if (item.itemType == '可采购') {
array.push(item)
}
if (item.itemType == '可制造') {
array1.push(item)
}
})
if (array.length>0) {
await PackageApi.getPrintingLableId({packingNumbers:array.map(item1=>item1.number)}).then(res => {
console.log(res)
if (labelType.value == 'cg') {
const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
window.open(src.value + '&asn_number=' + res)
} else {
window.open(BASE_URL + '/jmreport/view/1016234988731322368?token=' + getAccessToken()+'&id=' + res)
}).catch(err => {
console.log(err)
message.error('创建标签失败')
})
}
if (array1.length > 0) {
await PackageApi.batchPrintingLable(array1.map(item1=>item1.number).join(',')).then(res => {
const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
window.open(src.value + '&asn_number=' + res)
}
})
.catch((err) => {
}).catch(err => {
console.log(err)
message.error('创建标签失败')
})
}
// await PackageApi.batchPrintingLable(val.map((item1) => item1.number).join(','))
// .then((res) => {
// console.log(res)
// if (labelType.value == 'cg') {
// const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
// window.open(src.value + '&asn_number=' + res)
// } else {
// const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
// window.open(src.value + '&asn_number=' + res)
// }
// })
// .catch((err) => {
// console.log(err)
// message.error('')
// })
}
const getDefaultWorkshopCode = async () => {
const data = await ConfigApi.getConfigPage({

13
src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts

@ -1727,8 +1727,12 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
width: 150
},
tableForm: {
disabled: true
}
disabled: true,
type: 'FormDate',
placeholder: '请选择从批次',
valueFormat: 'YYYYMMDD',
format: 'YYYYMMDD',
},
},
{
label: '数量',
@ -2131,6 +2135,9 @@ export const ProductreceiptRequestLabelRules = reactive({
],
productionLineCodePackage: [
{ required: true, message: '请选择生产线', trigger: 'change' }
]
],
batch: [
{ required: true, message: '请选择批次', trigger: ['change','blur'] }
],
})

59
src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue

@ -155,6 +155,7 @@ import { formatDate } from '@/utils/formatTime'
import * as WorkshopApi from '@/api/wms/workshop'
import * as ConfigApi from '@/api/infra/config'
import { usePageLoading } from '@/hooks/web/usePageLoading'
import * as ruleApi from '@/api/wms/rule/index'
const { loadStart, loadDone } = usePageLoading()
//
//
@ -381,6 +382,7 @@ const butttondata = (row,$index) => {
// -
const toManagementPrecision = ref('')
const buttonTableClick = async (val, row) => {
if (val == 'mainClose') { //
await message.confirm('确认要关闭吗?')
@ -505,6 +507,19 @@ const buttonTableClick = async (val, row) => {
return
}
})
ruleApi.getManagementPrecision({
itemCodes: [item['itemCode']],
locationCode: item.toLocationCode
}).then((res) => {
toManagementPrecision.value = res[0].ManagementPrecision
if ( toManagementPrecision.value == 'BY_BATCH') {
// row['fromBatchFormItemType'] = 'FormDate'
item['disabled_batch'] = true
} else if(toManagementPrecision.value == 'BY_QUANTITY') {
// row['fromBatchFormItemType'] = ''
item['disabled_batch'] = false
}
})
})
} else if (val == 'mainHandle') { //
@ -818,20 +833,50 @@ const searchTableSuccess1 = async (formField, searchField, val, formRef, type, r
return
}
// window.open(src.value + '&asn_number=' + val.map(item1=>item1.number).join(','))
let array = []//
let array1 = []//
let packingNumbers = []
val.forEach((item,index) => {
packingNumbers.push(item.number)
await PackageApi.batchPrintingLable(val.map(item1=>item1.number).join(',')).then(res => {
if (item.itemType == '可采购') {
array.push(item)
}
if (item.itemType == '可制造') {
array1.push(item)
}
})
if (array.length>0) {
await PackageApi.getPrintingLableId({packingNumbers:array.map(item1=>item1.number)}).then(res => {
console.log(res)
if (labelType.value == 'cg') {
const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
window.open(src.value+'&asn_number='+res)
} else {
const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
window.open(src.value+'&asn_number='+res)
window.open(BASE_URL + '/jmreport/view/1016234988731322368?token=' + getAccessToken()+'&id=' + res)
}).catch(err => {
console.log(err)
message.error('创建标签失败')
})
}
if (array1.length > 0) {
await PackageApi.batchPrintingLable(array1.map(item1=>item1.number).join(',')).then(res => {
const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
window.open(src.value + '&asn_number=' + res)
}).catch(err => {
console.log(err)
message.error('创建标签失败')
})
}
// await PackageApi.batchPrintingLable(val.map(item1=>item1.number).join(',')).then(res => {
// console.log(res)
// if (labelType.value == 'cg') {
// const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
// window.open(src.value+'&asn_number='+res)
// } else {
// const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
// window.open(src.value+'&asn_number='+res)
// }
// }).catch(err => {
// console.log(err)
// message.error('')
// })
}
const getDefaultWorkshopCode = async () => {
const data = await ConfigApi.getConfigPage({

13
src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts

@ -1732,8 +1732,12 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
width: 150
},
tableForm: {
disabled:true
}
disabled: true,
type:'FormDate',
placeholder: '请选择从批次',
valueFormat: 'YYYYMMDD',
format: 'YYYYMMDD',
},
},
{
label: '数量',
@ -2090,6 +2094,9 @@ export const ProductreceiptRequestLabelRules = reactive({
],
productionLineCodePackage: [
{ required: true, message: '请选择生产线', trigger: 'change' }
]
],
batch: [
{ required: true, message: '请选择批次', trigger: ['change', 'blur'] }
],
})

42
src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/index.vue

@ -168,11 +168,11 @@ import {
PurchasereceiptRequestDetail,
PurchasereceiptRequestDetailRules,
PurchasereceiptRequestDetailLabel,
PurchasereceiptRequestDetailPackingNumber
} from './purchasereceiptRequestMain.data'
PurchasereceiptRequestDetailPackingNumber,
} from './purchasereceiptRequestMain.data'
import {
SupplierdeliverRequestPackage
} from '../../supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data'
PurchasereceiptRequestPackage
} from '@/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data'
import { PurchaseDetail } from '../../supplierdeliver/purchaseMain/purchaseMain.data'
import * as PackageApi from '@/api/wms/package'
import * as PurchasereceiptRequestMainApi from '@/api/wms/purchasereceiptRequestMain'
@ -559,7 +559,7 @@ const labelPrint = async (row) => {
const { getList:getListPrint } = tableMethods
await getListPrint()
tableObject.loading = false
const tableColumns = SupplierdeliverRequestPackage.allSchemas.tableFormColumns
const tableColumns = PurchasereceiptRequestPackage.allSchemas.tableFormColumns
tableColumns.forEach((item) => {
item.width = item.table?.width
})
@ -580,14 +580,44 @@ const searchTableSuccess1 = async (formField, searchField, val, formRef, type, r
return
}
// window.open(src.value + '&asn_number=' + val.map(item1=>item1.number).join(','))
let array = []//
let array1 = []//
let packingNumbers = []
val.forEach((item,index) => {
packingNumbers.push(item.number)
await PackageApi.batchPrintingLable(val.map(item1=>item1.number).join(',')).then(res => {
if (item.itemType == '可采购') {
array.push(item)
}
if (item.itemType == '可制造') {
array1.push(item)
}
})
if (array.length>0) {
await PackageApi.getPrintingLableId({packingNumbers:array.map(item1=>item1.number)}).then(res => {
console.log(res)
window.open(BASE_URL + '/jmreport/view/1016234988731322368?token=' + getAccessToken()+'&id=' + res)
}).catch(err => {
console.log(err)
message.error('创建标签失败')
})
}
if (array1.length > 0) {
await PackageApi.batchPrintingLable(array1.map(item1=>item1.number).join(',')).then(res => {
console.log(res)
window.open(src.value + '&asn_number=' + res)
}).catch(err => {
console.log(err)
message.error('创建标签失败')
})
}
// await PackageApi.batchPrintingLable(val.map(item1=>item1.number).join(',')).then(res => {
// console.log(res)
// window.open(src.value + '&asn_number=' + res)
// }).catch(err => {
// console.log(err)
// message.error('')
// })
}
const updateTableData = (tableList)=>{

39
src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/index.vue

@ -171,8 +171,8 @@ import {
PurchasereceiptRequestDetailPackingNumber
} from './purchasereceiptRequestMain.data'
import {
SupplierdeliverRequestPackage
} from '../../supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data'
PurchasereceiptRequestPackage
} from '@/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data'
import { PurchaseDetail } from '../../supplierdeliver/purchaseMain/purchaseMain.data'
import * as PackageApi from '@/api/wms/package'
import * as PurchasereceiptRequestMainApi from '@/api/wms/purchasereceiptRequestMain'
@ -188,6 +188,7 @@ import { getJmreportBaseUrl } from '@/utils/systemParam'
import { getReportUrl } from '@/utils/systemParam'
import { dateFormatter2 } from '@/utils/formatTime'
import { usePageLoading } from '@/hooks/web/usePageLoading'
const { loadStart, loadDone } = usePageLoading()
//
defineOptions({ name: 'ToolPurchasereceiptRequestMain' })
@ -559,7 +560,7 @@ const labelPrint = async (row) => {
const { getList:getListPrint } = tableMethods
await getListPrint()
tableObject.loading = false
const tableColumns = SupplierdeliverRequestPackage.allSchemas.tableFormColumns
const tableColumns = PurchasereceiptRequestPackage.allSchemas.tableFormColumns
tableColumns.forEach((item) => {
item.width = item.table?.width
})
@ -580,14 +581,44 @@ const searchTableSuccess1 = async (formField, searchField, val, formRef, type, r
return
}
// window.open(src.value + '&asn_number=' + val.map(item1=>item1.number).join(','))
let array = []//
let array1 = []//
let packingNumbers = []
val.forEach((item,index) => {
packingNumbers.push(item.number)
await PackageApi.batchPrintingLable(val.map(item1=>item1.number).join(',')).then(res => {
if (item.itemType == '可采购') {
array.push(item)
}
if (item.itemType == '可制造') {
array1.push(item)
}
})
if (array.length>0) {
await PackageApi.getPrintingLableId({packingNumbers:array.map(item1=>item1.number)}).then(res => {
console.log(res)
window.open(BASE_URL + '/jmreport/view/1016234988731322368?token=' + getAccessToken()+'&id=' + res)
}).catch(err => {
console.log(err)
message.error('创建标签失败')
})
}
if (array1.length > 0) {
await PackageApi.batchPrintingLable(array1.map(item1=>item1.number).join(',')).then(res => {
console.log(res)
window.open(src.value + '&asn_number=' + res)
}).catch(err => {
console.log(err)
message.error('创建标签失败')
})
}
// await PackageApi.batchPrintingLable(val.map(item1=>item1.number).join(',')).then(res => {
// console.log(res)
// window.open(src.value + '&asn_number=' + res)
// }).catch(err => {
// console.log(err)
// message.error('')
// })
}
const updateTableData = (tableList)=>{

Loading…
Cancel
Save