diff --git a/src/api/wms/package/index.ts b/src/api/wms/package/index.ts
index 64a9fbf06..8854a8b3d 100644
--- a/src/api/wms/package/index.ts
+++ b/src/api/wms/package/index.ts
@@ -101,6 +101,12 @@ export const batchPrintingLable = async (data: any) => {
return await request.post({ url: `/wms/package/batchPrintingLable`, data })
}
+
+// 批量打印标签多选
+export const batchPrintingLables = async (data: any) => {
+ return await request.post({ url: `/wms/package/batchPrintingLables`, data })
+}
+
// 打印标签获取包装列表
export const getLabel = async (id: number) => {
return await request.get({ url: `/wms/package/getLabel?id=` + id })
diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index 11aca3804..7f6ceb033 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -401,4 +401,5 @@ export enum DICT_TYPE {
PUBLISHE_STATUS = 'publishe_status', // 采购收货任务状态
PUBLISHE_STATUS_FIRST_INSPECTION = 'publishe_status_first_inspection', // 首件检验记录发布状态
RETURN_REASON_TYPE = 'return_reason_type', // 采购退货原因类型
+ SCRAPPING_REASON = 'scrapping_reason', //制品子件报废原因
}
diff --git a/src/views/qms/inspectionRequest/index.vue b/src/views/qms/inspectionRequest/index.vue
index 4e6ea8443..b863a1a02 100644
--- a/src/views/qms/inspectionRequest/index.vue
+++ b/src/views/qms/inspectionRequest/index.vue
@@ -5,9 +5,7 @@
@@ -510,7 +508,7 @@ const ListTableSubmit = async (formType, data) => {
/** 初始化 **/
onMounted(async () => {
tableObject.params = {
- available: true
+ available: 'TRUE'
}
getList()
importTemplateData.templateUrl = await InspectionMainApi.importTemplate()
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
index ed8ffd727..d9fb3656a 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
@@ -305,12 +305,19 @@
:key="'库存事务Operator'+cur.value"
/>
-
+ /> -->
+
+
+
+
+
+
+
@@ -639,6 +646,11 @@ import * as LocationApi from '@/api/wms/location'
import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
import { isString } from '@/utils/is'
import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+import * as TransactiontypeApi from '@/api/wms/transactiontype'
+import { Transactiontype } from '@/views/wms/basicDataManage/documentSetting/transactiontype/transactiontype.data'
+
+
+
const { t } = useI18n() // 国际化
const message = useMessage() // 消息弹窗
@@ -904,8 +916,22 @@ const filterMethodWarehouseList = (query: string) => {
const searchTableRef = ref()
-const searchWarehouse = ()=>{
+//事务类型
+const searchTransactionType = ()=>{
+ searchTableRef.value.open(
+ '请选择事务类型',
+ Transactiontype.allSchemas,
+ TransactiontypeApi.getTransactiontypePage,
+ 'TransactionType',
+ 'code',
+ true,
+ undefined,
+ undefined,
+ undefined
+ )
+}
+const searchWarehouse = ()=>{
if(warehouseType.value == 'WarehouseCode'){
// 仓库
@@ -964,6 +990,13 @@ const searchWarehouse = ()=>{
}
const searchTableSuccess = (formField, searchField, val, type, row) => {
+ if(formField=='TransactionType'){
+ let transactionType = formData.value.condition.find(item=>item['ParamCode']=='TransactionType')
+ if(transactionType){
+ transactionType.Value = val.map(item=>(item['code'])).join(',')
+ }
+ return
+ }
// let searchTableTitle = warehouseType.value == 'WarehouseCode'?'请选择仓库':warehouseType.value == 'AreaCode'?'请选择库区':warehouseType.value == 'LocationGroupCode'?'请选择库位组':warehouseType.value == 'LocationCode'?'请选择库位':''
console.log('searchTableSuccess',formField, searchField, val, type, row)
console.log(val.map(item=>(item['code'])).join(','))
diff --git a/src/views/wms/inventoryManage/package/index.vue b/src/views/wms/inventoryManage/package/index.vue
index aee66956f..6746eb1e1 100644
--- a/src/views/wms/inventoryManage/package/index.vue
+++ b/src/views/wms/inventoryManage/package/index.vue
@@ -193,7 +193,7 @@ const handleSelectionPoint = async ()=>{
text: 'loading...',
background: 'rgba(0, 0, 0, 0.7)'
})
- PackageApi.batchPrintingLable(rows).then(res => {
+ PackageApi.batchPrintingLables(rows).then(res => {
console.log('批量打印res',res);
getLoading?.close()
if(res.zzLabel){
@@ -359,7 +359,7 @@ const formsSuccess = async (formType,data) => {
const labelType = ref('') // 标签类别 采购还是制造等
const handlePoint = async (row) => {
console.log(row.packingNumber,445555555555555);
- PackageApi.batchPrintingLable([row.number]).then(res => {
+ PackageApi.batchPrintingLables([row.number]).then(res => {
console.log('批量打印res',res);
if(res.zzLabel){
//制造标签
diff --git a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts
index 16a0a352d..551eca89d 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts
+++ b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts
@@ -116,6 +116,18 @@ export const ProductscrapRecordMain = useCrudSchemas(
width: 150
}
},
+ {
+ label: '报废原因',
+ field: 'scrappingReason',
+ dictType: DICT_TYPE.SCRAPPING_REASON,
+ dictClass: 'string',
+ isForm: true,
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ },
{
label: '任务单号',
field: 'jobNumber',
diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
index 881153b74..d88934572 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
@@ -310,6 +310,18 @@ export const ProductscrapRequestMain = useCrudSchemas(
}
}
},
+ {
+ label: '报废原因',
+ field: 'scrappingReason',
+ dictType: DICT_TYPE.SCRAPPING_REASON,
+ dictClass: 'string',
+ isForm: true,
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ },
{
label: '从仓库代码',
field: 'fromWarehouseCode',
@@ -644,6 +656,9 @@ export const ProductscrapRequestMainRules = reactive({
remark: [
{ max: 50, message: '不得超过50个字符', trigger: 'blur' }
],
+ scrappingReason: [
+ { required: true, message: '请输入报废原因', trigger: 'blur' }
+ ],
})
/**