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

生产外入库申请：创建标签后，选择单据添加物料号，保存后再次创建标签 失败

intex_online20250327
叶佳兴 2 weeks ago
parent
78080640e7
commit
3791d4d6f8
4 changed files with 976 additions and 957 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 61
      src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
  2. 24
      src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
  3. 288
      src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
  4. 2
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue

61
src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
View File

@ -92,6 +92,9 @@
<Detail
ref="detailRef"
:isBasic="false"
:detailButtonIsShowAdd="false"
:detailButtonIsShowEdit="false"
:detailButtonIsShowDelete="false"
:allSchemas="UnplannedreceiptRequestMain.allSchemas"
:detailAllSchemas="UnplannedreceiptRequestDetail.allSchemas"
:detailAllSchemasRules="UnplannedreceiptRequestDetailRules"
@ -635,7 +638,6 @@ const buttonTableClick = async (val, row) => {
tableObject.loading = false
}
}
}
/** 关闭按钮操作 */
@ -955,24 +957,28 @@ const submitFormLabel = async (formType, data) => {
try {
formLabelRef.value.formLoading = true
detatableData.tableList.forEach(async (item) => {
const unitConversion = await UnitConversionApi.getUnitConversionByCode(item.itemCode);
const unitConversion = await UnitConversionApi.getUnitConversionByCode(item.itemCode)
let convertRate = 1 //转换率
let purchaseUom = item.uom //采购计量单位
let purchaseStdQty //采购标包数量
if (unitConversion != null) {
if(unitConversion.convertRate!=null&&unitConversion.convertRate!='' && unitConversion.convertRate!=0){
convertRate = unitConversion.convertRate;
if (
unitConversion.convertRate != null &&
unitConversion.convertRate != '' &&
unitConversion.convertRate != 0
) {
convertRate = unitConversion.convertRate
}
if (unitConversion.purchaseUom != null && unitConversion.purchaseUom != '') {
purchaseUom = unitConversion.purchaseUom;
purchaseUom = unitConversion.purchaseUom
}
}
let purchaseQty = (item.qty / convertRate).toFixed(5);//采购每包中实际的数量
purchaseStdQty = (item.packQty / convertRate).toFixed(5);//采购每包中实际的数量
item.purchaseQty = purchaseQty;//采购实际每包数量
item.convertRate = convertRate;//转换率
item.purchaseStdQty = purchaseStdQty;//采购标包数量
item.purchaseUom = purchaseUom;//采购计量单位
let purchaseQty = (item.qty / convertRate).toFixed(5) //采购每包中实际的数量
purchaseStdQty = (item.packQty / convertRate).toFixed(5) //采购每包中实际的数量
item.purchaseQty = purchaseQty //采购实际每包数量
item.convertRate = convertRate //转换率
item.purchaseStdQty = purchaseStdQty //采购标包数量
item.purchaseUom = purchaseUom //采购计量单位
console.log('item======================', item)
await PackageApi.createPackageLabel(item)
.then((res) => {
@ -1067,13 +1073,15 @@ const labelPrint = async (row) => {
try {
await PackageApi.getPackagePage({
requestNumber: row.number
}).then((res) => {
})
.then((res) => {
if (res.list.length > 0) {
isCreateLabel.value = true
} else {
isCreateLabel.value = false
}
}).catch((err) => {
})
.catch((err) => {
isCreateLabel.value = false
console.log(err)
})
@ -1082,18 +1090,35 @@ const labelPrint = async (row) => {
// labelPrint(row)
await UnplannedreceiptRequestDetailApi.getDetailList(row.masterId).then(async (res) => {
if (res.length > 0) {
const itemType = res.some((item) => item.itemType == '可采购' && item.itemBasicType =='TOOL')//跳转协定品标签
const itemType2 = res.some((item) => item.itemType == '可采购' && item.itemBasicType !='TOOL')
const itemType = res.some(
(item) => item.itemType == '可采购' && item.itemBasicType == 'TOOL'
) //跳转协定品标签
const itemType2 = res.some(
(item) => item.itemType == '可采购' && item.itemBasicType != 'TOOL'
)
const itemType1 = res.some((item) => item.itemType == '可制造')
if (itemType) {
window.open( BASE_URL + '/jmreport/view/1028102732077142016?token=' + getAccessToken() + '&request_number=' + row.number )
window.open(
BASE_URL +
'/jmreport/view/1028102732077142016?token=' +
getAccessToken() +
'&request_number=' +
row.number
)
}
if (itemType2) {
window.open( BASE_URL + '/jmreport/view/1016234988731322368?token=' + getAccessToken() + '&request_number=' + row.number )
window.open(
BASE_URL +
'/jmreport/view/1016234988731322368?token=' +
getAccessToken() +
'&request_number=' +
row.number
)
}
if (itemType1) {
// window.open(src.value + '&request_number=' + row.number)
await PackageApi.batchPrintingLableForYT(row.number).then((res) => {
await PackageApi.batchPrintingLableForYT(row.number)
.then((res) => {
console.log(res)
const src = ref(
BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()

24
src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
View File

@ -1423,18 +1423,18 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
isTableForm: false,
isForm: false
},
{
label: '操作',
field: 'action',
isDetail: false,
hiddenInMain:true,
isForm: false ,
table: {
width: 150,
fixed: 'right'
},
isTableForm:false,
}
// {
// label: '操作',
// field: 'action',
// isDetail: false,
// hiddenInMain:true,
// isForm: false ,
// table: {
// width: 150,
// fixed: 'right'
// },
// isTableForm:false,
// }
]))
function validateQty(rule, value, callback) {
if (value>0) {

288
src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
View File

@ -26,7 +26,7 @@ const queryParams = {
// 获取当前操作人的部门
import { useUserStore } from '@/store/modules/user'
import { TableColumn } from '@/types/table'
import {getLocationPageRepleinsh} from "@/api/wms/location";
import { getLocationPageRepleinsh } from '@/api/wms/location'
const userStore = useUserStore()
const userDept = userStore.userSelfInfo.dept
// id 转str 否则form回显匹配不到
@ -36,7 +36,8 @@ import {getLocationPageRepleinsh} from "@/api/wms/location";
/**
* @returns {Array} 补料申请主表
*/
export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
export const RepleinshRequestMain = useCrudSchemas(
reactive<CrudSchema[]>([
{
label: '单据号',
field: 'number',
@ -47,7 +48,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
},
isForm: false,
isSearch: true,
sortSearchDefault:1,
sortSearchDefault: 1
},
{
label: '状态',
@ -69,65 +70,6 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
}
}
},
{
label: '到库位代码',
field: 'toLocationCode',
sort: 'custom',
table: {
width: 150
},
hiddenInMain:true,
// isTableForm: false,
form: {
// labelMessage: '信息提示说明！！！',
componentProps: {
enterSearch:true,
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择到库位代码', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '库位信息', // 查询弹窗标题
searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
searchPage: LocationApi.getLocationPageRepleinsh, // 查询弹窗所需分页方法
searchCondition:[{
key: 'available',
value: 'TRUE',
isMainValue: false
}],
verificationParams: [{
key: 'code',
action: '==',
value: '',
isMainValue: false,
isSearch: true,
isFormModel: true,
}], // 失去焦点校验参数
}
},
tableForm:{
isInpuFocusShow: true,
searchListPlaceholder: '请选择到库位代码', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '库位信息', // 查询弹窗标题
searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
searchPage: LocationApi.getLocationPageRepleinsh, // 查询弹窗所需分页方法
searchCondition:[{
key: 'available',
value: 'TRUE',
isMainValue: false
}]
},
},
{
label: '来源',
field: 'sourceType',
sort: 'custom',
table: {
width: 150
},
isForm: false,
isTable: true,
isDetail: true
},
{
label: '生产线代码',
field: 'productionLineCode',
@ -185,6 +127,72 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
dateFormat: 'YYYY-MM-DD'
}
},
{
label: '到库位代码',
field: 'toLocationCode',
sort: 'custom',
table: {
width: 150
},
hiddenInMain: true,
// isTableForm: false,
form: {
// labelMessage: '信息提示说明！！！',
componentProps: {
enterSearch: true,
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择到库位代码', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '库位信息', // 查询弹窗标题
searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
searchPage: LocationApi.getLocationPageRepleinsh, // 查询弹窗所需分页方法
searchCondition: [
{
key: 'available',
value: 'TRUE',
isMainValue: false
}
],
verificationParams: [
{
key: 'code',
action: '==',
value: '',
isMainValue: false,
isSearch: true,
isFormModel: true
}
] // 失去焦点校验参数
}
},
tableForm: {
isInpuFocusShow: true,
searchListPlaceholder: '请选择到库位代码', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '库位信息', // 查询弹窗标题
searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
searchPage: LocationApi.getLocationPageRepleinsh, // 查询弹窗所需分页方法
searchCondition: [
{
key: 'available',
value: 'TRUE',
isMainValue: false
}
]
}
},
{
label: '来源',
field: 'sourceType',
sort: 'custom',
table: {
width: 150
},
isForm: false,
isTable: true,
isDetail: true
},
{
label: '便次',
field: 'deliNo',
@ -197,8 +205,8 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
form: {
component: 'InputNumber',
componentProps: {
min: 1,
},
min: 1
}
}
},
{
@ -211,7 +219,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isForm: false,
isForm: false
},
{
label: '到库区类型范围',
@ -223,7 +231,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isForm: false,
isForm: false
},
{
label: '从库区代码范围',
@ -233,7 +241,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 150
},
isTable: false,
isForm: false,
isForm: false
},
{
label: '到库区代码范围',
@ -243,7 +251,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 150
},
isTable: false,
isForm: false,
isForm: false
},
{
label: '申请时间',
@ -263,10 +271,10 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
style: { width: '100%' },
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
},
isForm: false,
isForm: false
},
{
label: '截止时间',
@ -286,9 +294,9 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
style: { width: '100%' },
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
}
},
},
{
label: '部门',
@ -329,7 +337,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
disabled: true
}
},
isForm: false,
isForm: false
},
{
label: '备注',
@ -482,7 +490,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
componentProps: {
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
},
isForm: false,
@ -493,8 +501,8 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
valueFormat: 'YYYY-MM-DD HH:mm:ss',
type: 'daterange',
defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
},
},
}
}
},
{
label: '创建者',
@ -504,7 +512,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 150
},
isTable: true,
isForm: false,
isForm: false
},
{
label: '最后更新时间',
@ -526,10 +534,10 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
style: { width: '100%' },
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
},
isForm: false,
isForm: false
},
{
label: '最后更新者',
@ -541,8 +549,8 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
hiddenInMain: true,
isTable: false,
isDetail: true,
isForm: false,
},
isForm: false
}
// {
// label: '操作',
// field: 'action',
@ -573,52 +581,32 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
// },
// sortTableDefault:8,
// },
]))
])
)
//表单校验
export const RepleinshRequestMainRules = reactive({
fromWarehouseCode: [
{ required: true, message: '请输入从仓库代码', trigger: 'blur' }
],
fromAreaTypes: [
{ required: true, message: '请选择从库区类型范围', trigger: 'change' }
],
toWarehouseCode: [
{ required: true, message: '请输入到仓库代码', trigger: 'blur' }
],
toAreaTypes: [
{ required: true, message: '请选择到库区类型范围', trigger: 'change' }
],
departmentCode: [
{ required: true, message: '请输入部门', trigger: 'blur' }
],
autoCommit: [
{ required: true, message: '请选择是否自动提交', trigger: 'change' }
],
autoAgree: [
{ required: true, message: '请选择是否自动通过', trigger: 'change' }
],
autoExecute: [
{ required: true, message: '请选择是否自动执行', trigger: 'change' }
],
toLocationCode: [
{ required: true, message: '请输入到库位代码', trigger: ['change', 'blur']}
],
fromWarehouseCode: [{ required: true, message: '请输入从仓库代码', trigger: 'blur' }],
fromAreaTypes: [{ required: true, message: '请选择从库区类型范围', trigger: 'change' }],
toWarehouseCode: [{ required: true, message: '请输入到仓库代码', trigger: 'blur' }],
toAreaTypes: [{ required: true, message: '请选择到库区类型范围', trigger: 'change' }],
departmentCode: [{ required: true, message: '请输入部门', trigger: 'blur' }],
autoCommit: [{ required: true, message: '请选择是否自动提交', trigger: 'change' }],
autoAgree: [{ required: true, message: '请选择是否自动通过', trigger: 'change' }],
autoExecute: [{ required: true, message: '请选择是否自动执行', trigger: 'change' }],
toLocationCode: [{ required: true, message: '请输入到库位代码', trigger: ['change', 'blur'] }],
directCreateRecord: [
{ required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' }
],
businessType: [
{ required: true, message: '请输入业务类型', trigger: 'blur' }
],
remark: [
{ max: 50, message: '不得超过50个字符', trigger: 'blur' }
],
businessType: [{ required: true, message: '请输入业务类型', trigger: 'blur' }],
remark: [{ max: 50, message: '不得超过50个字符', trigger: 'blur' }]
})
/**
* @returns {Array} 补料申请子表
*/
export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
export const RepleinshRequestDetail = useCrudSchemas(
reactive<CrudSchema[]>([
{
label: '品番',
field: 'itemCode',
@ -638,11 +626,13 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
searchTitle: '物料基础信息', // 查询弹窗标题
searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法
searchCondition:[{
searchCondition: [
{
key: 'available',
value: 'TRUE',
isMainValue: false
}]
}
]
}
},
tableForm: {
@ -654,25 +644,30 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
searchTitle: '物料基础信息', // 查询弹窗标题
searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法
searchCondition:[{
searchCondition: [
{
key: 'available',
value: 'TRUE',
isMainValue: false
},{
},
{
key: 'businessTypeCode',
value: queryParams.businessTypeCode
}],
}
],
verificationPage: ItembasicApi.getItemListByCodes, // 校验数去焦点输入是否正确的方法
isShowTableFormSearch: true,
verificationParams: [{
verificationParams: [
{
key: 'code',
action: '==',
value: '',
isMainValue: false,
isSearch: true,
isFormModel: true,
}], // 失去焦点校验参数
},
isFormModel: true
}
] // 失去焦点校验参数
}
},
{
label: '品名',
@ -680,7 +675,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
sortTableDefault: 4,
isTableForm: false,
isForm: false,
isForm: false
},
{
label: '背番',
@ -702,7 +697,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
},
hiddenInMain: true,
isTableForm: false,
isForm: false,
isForm: false
},
{
label: '数量',
@ -710,7 +705,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
sortTableDefault: 4,
isTableForm: false,
isForm: false,
isForm: false
},
{
label: '计量单位',
@ -747,7 +742,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
isTableForm: false,
form: {
componentProps: {
disabled:true,
disabled: true
}
}
},
@ -787,11 +782,13 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
value: 'OK',
componentProps: {
disabled: true,
searchCondition:[{
searchCondition: [
{
key: 'available',
value: 'TRUE',
isMainValue: false
}]
}
]
}
},
table: {
@ -830,7 +827,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
width: 150
},
isTable: false,
hiddenInMain:true,
hiddenInMain: true
},
{
label: '创建时间',
@ -850,7 +847,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
style: { width: '100%' },
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
},
isTableForm: false,
@ -878,7 +875,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
hiddenInMain: true,
isTableForm: false,
isTable: false,
isForm: false,
isForm: false
},
{
@ -891,7 +888,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
hiddenInMain: true,
isTableForm: false,
sortTableDefault: 1,
isTable:false,
isTable: false
},
{
label: '订单行',
@ -903,7 +900,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
hiddenInMain: true,
isTableForm: false,
sortTableDefault: 2,
isTable:false,
isTable: false
},
{
@ -916,7 +913,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
isTableForm: false,
isForm: false,
hiddenInMain: true,
isTable:false,
isTable: false
},
{
label: '到货主代码',
@ -928,7 +925,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
isTableForm: false,
isForm: false,
hiddenInMain: true,
isTable:false,
isTable: false
},
{
label: '最后更新时间',
@ -948,7 +945,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
style: { width: '100%' },
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
},
hiddenInMain: true,
@ -966,7 +963,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
hiddenInMain: true,
isTable: false,
isForm: false
},
}
// {
// label: '未执行任务数量',
// field: 'unexecutedQty',
@ -992,7 +989,8 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
// },
// isTableForm:false,
// }
]))
])
)
//表单校验
export const RepleinshRequestDetailRules = reactive({
@ -1002,10 +1000,6 @@ export const RepleinshRequestDetailRules = reactive({
// toLocationCode: [
// { required: true, message: '请输入到库位代码', trigger: 'blur' }
// ],
itemCode: [
{ required: true, message: '请输入品番', trigger: 'blur' }
],
remark: [
{ max: 50, message: '不得超过50个字符', trigger: 'blur' }
],
itemCode: [{ required: true, message: '请输入品番', trigger: 'blur' }],
remark: [{ max: 50, message: '不得超过50个字符', trigger: 'blur' }]
})

2
src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
View File

@ -212,7 +212,7 @@ const { getList, setSearchParams } = tableMethods
// 列表头部按钮
const HeadButttondata = [
defaultButtons.defaultExportBtn({hasPermi:'wms:supplierinvoice-record-main:export'}), // 导出
defaultButtons.mainLisSelectiontPointBtn(null), // 批量打印
// defaultButtons.mainLisSelectiontPointBtn(null), // 批量打印
defaultButtons.defaultFreshBtn(null), // 刷新
defaultButtons.defaultFilterBtn(null), // 筛选
defaultButtons.defaultSetBtn(null), // 设置

Write Preview
Loading…
Cancel
Save