diff --git a/fe/PC/src/filters/status.js b/fe/PC/src/filters/status.js
index 6230e4a0e..f4e9c0e70 100644
--- a/fe/PC/src/filters/status.js
+++ b/fe/PC/src/filters/status.js
@@ -2453,3 +2453,48 @@ export function oprTypeStatus(index, prop) {
return Enum(type, index, prop)
}
+// 叫料请求来源
+export function issueRequestType(index, prop) {
+ let type = {
+ 0: {
+ value: 0,
+ label: "其它"
+ },
+ 1: {
+ value: 1,
+ label: "视觉发起"
+ },
+ 2: {
+ value: 2,
+ label: "Mes发起"
+ },
+ 3: {
+ value: 3,
+ label: "立体库发起"
+ },
+ 4: {
+ value: 4,
+ label: "位置码"
+ },
+ }
+ return Enum(type, index, prop)
+}
+
+// 叫料发货类型
+export function enumIssueSendType(index, prop) {
+ let type = {
+ 0: {
+ value: 0,
+ label: "其它"
+ },
+ 1: {
+ value: 1,
+ label: "按数量"
+ },
+ 2: {
+ value: 2,
+ label: "按箱数"
+ },
+ }
+ return Enum(type, index, prop)
+}
diff --git a/fe/PC/src/router/index.js b/fe/PC/src/router/index.js
index f3186cd0c..95e138e8a 100644
--- a/fe/PC/src/router/index.js
+++ b/fe/PC/src/router/index.js
@@ -142,6 +142,12 @@ export const constantRoutes = [
}
}]
},
+ // 【平板】菜单页
+ // {
+ // path: '/padMenuPage',
+ // component: () => import('@/views/padManage/InventoryBookDetail_innerPage'),
+ // hidden: true
+ // },
// {
// path: '/',
// component: Layout,
diff --git a/fe/PC/src/utils/detailsTableColumns/index.js b/fe/PC/src/utils/detailsTableColumns/index.js
index 6d5ea01f5..e3127a4eb 100644
--- a/fe/PC/src/utils/detailsTableColumns/index.js
+++ b/fe/PC/src/utils/detailsTableColumns/index.js
@@ -3809,8 +3809,8 @@ export const IssueNoteZS = [
{ label: "实际目标数量", prop: 'handledToQty' },
{ label: "实际来源供应商批次", prop: 'handledFromSupplierBatch' },
{ label: "实际目标供应商批次", prop: 'handledToSupplierBatch' },
- { label: "实际来源批次过期时间", prop: 'handledFromExpireDate', type: "dateTime" },
- { label: "实际目标批次过期时间", prop: 'handledToExpireDate', type: "dateTime" },
+ { label: "实际来源过期时间", prop: 'handledFromExpireDate', type: "dateTime" },
+ { label: "实际目标过期时间", prop: 'handledToExpireDate', type: "dateTime" },
{ label: "库移来源数量", prop: 'transferLibFromQty' },
{ label: "库移目标数量", prop: 'transferLibToQty' },
{ label: "库移来源箱标签", prop: 'transferLibFromPackingCode' },
@@ -4250,10 +4250,10 @@ export const automaticJobZS = [
{ label: "库移目标库区", prop: 'transferLibToLocationArea' },
{ label: "库移来源库位组", prop: 'transferLibFromLocationGroup' },
{ label: "库移目标库位组", prop: 'transferLibToLocationGroup' },
- { label: "库移来源批次供应商批次", prop: 'transferLibFromSupplierBatch' },
- { label: "库移目标批次供应商批次", prop: 'transferLibToSupplierBatch' },
- { label: "库移来源批次过期时间", prop: 'transferLibFromExpireDate', type: "dateTime" },
- { label: "库移目标批次过期时间", prop: 'transferLibToExpireDate', type: "dateTime" },
+ { label: "库移来源供应商批次", prop: 'transferLibFromSupplierBatch' },
+ { label: "库移目标供应商批次", prop: 'transferLibToSupplierBatch' },
+ { label: "库移来源过期时间", prop: 'transferLibFromExpireDate', type: "dateTime" },
+ { label: "库移目标过期时间", prop: 'transferLibToExpireDate', type: "dateTime" },
{ label: "在途库库位", prop: 'onTheWayLocationCode' },
{ label: "生产线", prop: 'prodLine' },
{ label: "位置码", prop: 'positionCode' },
@@ -4554,10 +4554,10 @@ export const automaticJobZP = [
{ label: "库移目标库区", prop: 'transferLibToLocationArea' },
{ label: "库移来源库位组", prop: 'transferLibFromLocationGroup' },
{ label: "库移目标库位组", prop: 'transferLibToLocationGroup' },
- { label: "库移来源批次供应商批次", prop: 'transferLibFromSupplierBatch' },
- { label: "库移目标批次供应商批次", prop: 'transferLibToSupplierBatch' },
- { label: "库移来源批次过期时间", prop: 'transferLibFromExpireDate', type: "dateTime" },
- { label: "库移目标批次过期时间", prop: 'transferLibToExpireDate', type: "dateTime" },
+ { label: "库移来源供应商批次", prop: 'transferLibFromSupplierBatch' },
+ { label: "库移目标供应商批次", prop: 'transferLibToSupplierBatch' },
+ { label: "库移来源过期时间", prop: 'transferLibFromExpireDate', type: "dateTime" },
+ { label: "库移目标过期时间", prop: 'transferLibToExpireDate', type: "dateTime" },
{ label: "在途库库位", prop: 'onTheWayLocationCode' },
{ label: "生产线", prop: 'prodLine' },
{ label: "位置码", prop: 'positionCode' },
@@ -4705,12 +4705,12 @@ export const transferLibJob = [
{ label: "实际目标数量", prop: 'handledToQty' },
{ label: "实际来源供应商批次", prop: 'handledFromSupplierBatch' },
{ label: "实际目标供应商批次", prop: 'handledToSupplierBatch' },
- { label: "实际来源批次生产时间", prop: 'handledFromProduceDate', type: "dateTime" },
- { label: "实际目标批次生产时间", prop: 'handledToProduceDate', type: "dateTime" },
- { label: "实际来源批次到货时间", prop: 'handledFromArriveDate', type: "dateTime" },
- { label: "实际目标批次到货时间", prop: 'handledToArriveDate', type: "dateTime" },
- { label: "实际来源批次过期时间", prop: 'handledFromExpireDate', type: "dateTime" },
- { label: "实际目标批次过期时间", prop: 'handledToExpireDate', type: "dateTime" },
+ { label: "实际来源生产时间", prop: 'handledFromProduceDate', type: "dateTime" },
+ { label: "实际目标生产时间", prop: 'handledToProduceDate', type: "dateTime" },
+ { label: "实际来源到货时间", prop: 'handledFromArriveDate', type: "dateTime" },
+ { label: "实际目标到货时间", prop: 'handledToArriveDate', type: "dateTime" },
+ { label: "实际来源过期时间", prop: 'handledFromExpireDate', type: "dateTime" },
+ { label: "实际目标过期时间", prop: 'handledToExpireDate', type: "dateTime" },
{ label: "在途库库位", prop: 'onTheWayLocationCode' },
{ label: "生产线", prop: 'prodLine' },
{ label: "位置码", prop: 'positionCode' },
@@ -4761,8 +4761,8 @@ export const transferLibNote = [
{ label: "实际目标库区", prop: 'handledToLocationArea' },
{ label: "实际来源供应商批次", prop: 'handledFromSupplierBatch' },
{ label: "实际目标供应商批次", prop: 'handledToSupplierBatch' },
- { label: "实际来源批次过期时间", prop: 'handledFromExpireDate', type: "dateTime" },
- { label: "实际目标批次过期时间", prop: 'handledToExpireDate', type: "dateTime" },
+ { label: "实际来源过期时间", prop: 'handledFromExpireDate', type: "dateTime" },
+ { label: "实际目标过期时间", prop: 'handledToExpireDate', type: "dateTime" },
{ label: "在途库库位", prop: 'onTheWayLocationCode' },
{ label: "生产线", prop: 'prodLine' },
{ label: "位置码", prop: 'positionCode' },
@@ -4967,4 +4967,221 @@ export const KittingPackagingNote = [
{ label: "备注", prop: "remark" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
+]
+
+// kitting请求
+export const KittingIssueRequest = [
+ { label: "物品代码", prop: "itemCode", fixed: "left" },
+ { label: "物品名称", prop: "itemName" },
+ { label: "物品描述1", prop: "itemDesc1" },
+ { label: "物品描述2", prop: "itemDesc2" },
+ { label: "状态", prop: "status", type: "filter", filters: "inventoryStage" },
+ { label: "单位", prop: "uom" },
+ { label: "数量", prop: "qty" },
+ { label: "申请数量", prop: 'issuedQty' },
+ { label: "已收数量", prop: 'receivedQty' },
+ { label: "已发未收", prop: "toBeReceivedQty" },
+ { label: "请求未收", prop: "notFinishQty" },
+ { label: "请求未发", prop: "toBeIssuedQty" },
+ { label: "请求箱数量", prop: "boxQty" },
+ { label: "标包数量", prop: 'stdPackQty' },
+ { label: "目标库位", prop: 'toLocationCode' },
+ { label: "目标库区", prop: 'toLocationArea' },
+ { label: "目标库位组", prop: 'toLocationGroup' },
+ { label: "目标ERP库位", prop: "toLocationErpCode" },
+ { label: "位置码", prop: 'positionCode' },
+ { label: "推荐类型", prop: 'recommendType' },
+ { label: "到仓库", prop: 'toWarehouseCode' },
+ { label: "生产线", prop: 'prodLine' },
+ { label: "备注", prop: "remark" },
+ { label: "创建时间", prop: 'creationTime', type: "dateTime" },
+ { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
+]
+
+// kitting任务
+export const KittingIssueJob = [
+ { label: "物品代码", prop: "itemCode", fixed: "left" },
+ { label: "物品名称", prop: "itemName" },
+ { label: "物品描述1", prop: "itemDesc1" },
+ { label: "物品描述2", prop: "itemDesc2" },
+ { label: "状态", prop: "status", type: "filter", filters: "inventoryStage" },
+ { label: "单位", prop: "uom" },
+ { label: "请求库位代码", prop: 'requestLocationCode' },
+ { label: "请求库位区域", prop: 'requestLocationArea' },
+ { label: "请求库位组", prop: 'requestLocationGroup' },
+ { label: "请求ERP库位", prop: 'requestLocationErpCode' },
+ { label: "请求仓库代码", prop: 'requestWarehouseCode' },
+ { label: "在途库位", prop: 'onTheWayLocationCode' },
+ { label: "请求数量", prop: 'requestQty' },
+ { label: "推荐来源数量", prop: 'recommendFromQty' },
+ { label: "推荐目标数量", prop: 'recommendToQty' },
+ { label: "推荐来源箱标签", prop: "recommendFromPackingCode" },
+ { label: "推荐目标箱标签", prop: 'recommendToPackingCode' },
+ { label: "推荐来源供应商批次", prop: 'recommendFromSupplierBatch' },
+ { label: "推荐目标供应商批次", prop: 'recommendToSupplierBatch' },
+ { label: "推荐来源批次到货时间", prop: 'recommendFromArriveDate', type: "dateTime" },
+ { label: "推荐目标批次到货时间", prop: 'recommendToArriveDate', type: "dateTime" },
+ { label: "推荐来源批次生产时间", prop: 'recommendFromProduceDate', type: "dateTime" },
+ { label: "推荐目标批次生产时间", prop: 'recommendToProduceDate', type: "dateTime" },
+ { label: "推荐来源批次过期时间", prop: 'recommendFromExpireDate', type: "dateTime" },
+ { label: "推荐目标批次过期时间", prop: 'recommendToExpireDate', type: "dateTime" },
+ { label: "推荐来源批次", prop: 'recommendFromLot' },
+ { label: "推荐目标批次", prop: 'recommendToLot' },
+ { label: "推荐来源库位", prop: 'recommendFromLocationCode' },
+ { label: "推荐目标库位", prop: 'recommendToLocationCode' },
+ { label: "推荐来源库区", prop: 'recommendFromLocationArea' },
+ { label: "推荐目标库区", prop: 'recommendToLocationArea' },
+ { label: "推荐来源分组", prop: 'recommendFromLocationGroup' },
+ { label: "推荐目标分组", prop: 'recommendToLocationGroup' },
+ { label: "推荐来源ERP库位", prop: 'recommendFromLocationErpCode' },
+ { label: "推荐目标ERP库位", prop: 'recommendToLocationErpCode' },
+ { label: "推荐来源仓库", prop: 'recommendFromWarehouseCode' },
+ { label: "推荐目标仓库", prop: "recommendToWarehouseCode" },
+ { label: "库移来源数量", prop: 'transferLibFromQty' },
+ { label: "库移目标数量", prop: 'transferLibToQty' },
+ { label: "库移来源箱标签", prop: 'transferLibFromPackingCode' },
+ { label: "库移目标箱标签", prop: 'transferLibToPackingCode' },
+ { label: "库移来源批次", prop: 'transferLibFromLot' },
+ { label: "库移目标批次", prop: 'transferLibToLot' },
+ { label: "库移来源供应商批次", prop: 'transferLibFromSupplierBatch' },
+ { label: "库移目标批应商批次", prop: 'transferLibToSupplierBatch' },
+ { label: "库移来源到货时间", prop: 'transferLibFromArriveDate', type: "dateTime" },
+ { label: "库移目标到货时间", prop: 'transferLibToArriveDate', type: "dateTime" },
+ { label: "库移来源生产时间", prop: 'transferLibFromProduceDate', type: "dateTime" },
+ { label: "库移目标生产时间", prop: 'transferLibToProduceDate', type: "dateTime" },
+ { label: "库移来源过期时间", prop: 'transferLibFromExpireDate', type: "dateTime" },
+ { label: "库移目标过期时间", prop: 'transferLibToExpireDate', type: "dateTime" },
+ { label: "库移来源库位", prop: 'transferLibFromLocationCode' },
+ { label: "库移目标库位", prop: 'transferLibToLocationCode' },
+ { label: "库移来源库区", prop: 'transferLibFromLocationArea' },
+ { label: "库移目标库区", prop: 'transferLibToLocationArea' },
+ { label: "库移来源库位组", prop: 'transferLibFromLocationGroup' },
+ { label: "库移目标库位组", prop: 'transferLibToLocationGroup' },
+ { label: "库移来源ERP库位", prop: 'transferLibFromLocationErpCode' },
+ { label: "库移目标ERP库位", prop: 'transferLibToLocationErpCode' },
+ { label: "实际来源数量", prop: 'handledFromQty' },
+ { label: "实际目标数量", prop: 'handledToQty' },
+ { label: "实际来源箱标签", prop: 'handledFromPackingCode' },
+ { label: "实际目标箱标签", prop: 'handledToPackingCode' },
+ { label: "实际来源批次", prop: 'handledFromLot' },
+ { label: "实际目标批次", prop: 'handledToLot' },
+ { label: "实际来源库位", prop: 'handledFromLocationCode' },
+ { label: "实际目标库位", prop: 'handledToLocationCode' },
+ { label: "实际来源库区", prop: 'handledFromLocationArea' },
+ { label: "实际目标库区", prop: 'handledToLocationArea' },
+ { label: "实际来源分组", prop: 'handledFromLocationGroup' },
+ { label: "实际目标分组", prop: 'handledToLocationGroup' },
+ { label: "实际来源ERP库位", prop: 'handledFromLocationErpCode' },
+ { label: "实际目标ERP库位", prop: 'handledToLocationErpCode' },
+ { label: "实际来源供应商批次", prop: 'handledFromSupplierBatch' },
+ { label: "实际目标供应商批次", prop: 'handledToSupplierBatch' },
+ { label: "实际来源到货时间", prop: 'handledFromArriveDate', type: "dateTime" },
+ { label: "实际目标到货时间", prop: 'handledToArriveDate', type: "dateTime" },
+ { label: "实际来源生产时间", prop: 'handledFromProduceDate', type: "dateTime" },
+ { label: "实际目标生产时间", prop: 'handledToProduceDate', type: "dateTime" },
+ { label: "实际来源过期时间", prop: 'handledFromExpireDate', type: "dateTime" },
+ { label: "实际目标过期时间", prop: 'handledToExpireDate', type: "dateTime" },
+ { label: "实际来源仓库", prop: 'handledFromWarehouseCode' },
+ { label: "实际目标仓库", prop: "handledToWarehouseCode" },
+ { label: "标包数量", prop: 'stdPackQty' },
+ { label: "位置码", prop: 'positionCode' },
+ { label: "推荐类型", prop: 'recommendType' },
+ { label: "生产线", prop: 'prodLine' },
+ { label: "备注", prop: "remark" },
+ { label: "创建时间", prop: 'creationTime', type: "dateTime" },
+ { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
+]
+
+// kitting记录
+export const KittingIssueNote = [
+ { label: "物品代码", prop: "itemCode", fixed: "left" },
+ { label: "物品名称", prop: "itemName" },
+ { label: "物品描述1", prop: "itemDesc1" },
+ { label: "物品描述2", prop: "itemDesc2" },
+ { label: "状态", prop: "status", type: "filter", filters: "inventoryStage" },
+ { label: "单位", prop: "uom" },
+ { label: "请求库位代码", prop: 'requestLocationCode' },
+ { label: "请求库位区域", prop: 'requestLocationArea' },
+ { label: "请求库位组", prop: 'requestLocationGroup' },
+ { label: "请求ERP库位", prop: 'requestLocationErpCode' },
+ { label: "请求仓库代码", prop: 'requestWarehouseCode' },
+ { label: "在途库位", prop: 'onTheWayLocationCode' },
+ { label: "请求数量", prop: 'requestQty' },
+ { label: "推荐来源数量", prop: 'recommendFromQty' },
+ { label: "推荐目标数量", prop: 'recommendToQty' },
+ { label: "推荐来源箱标签", prop: "recommendFromPackingCode" },
+ { label: "推荐目标箱标签", prop: 'recommendToPackingCode' },
+ { label: "推荐来源供应商批次", prop: 'recommendFromSupplierBatch' },
+ { label: "推荐目标供应商批次", prop: 'recommendToSupplierBatch' },
+ { label: "推荐来源批次到货时间", prop: 'recommendFromArriveDate', type: "dateTime" },
+ { label: "推荐目标批次到货时间", prop: 'recommendToArriveDate', type: "dateTime" },
+ { label: "推荐来源批次生产时间", prop: 'recommendFromProduceDate', type: "dateTime" },
+ { label: "推荐目标批次生产时间", prop: 'recommendToProduceDate', type: "dateTime" },
+ { label: "推荐来源批次过期时间", prop: 'recommendFromExpireDate', type: "dateTime" },
+ { label: "推荐目标批次过期时间", prop: 'recommendToExpireDate', type: "dateTime" },
+ { label: "推荐来源批次", prop: 'recommendFromLot' },
+ { label: "推荐目标批次", prop: 'recommendToLot' },
+ { label: "推荐来源库位", prop: 'recommendFromLocationCode' },
+ { label: "推荐目标库位", prop: 'recommendToLocationCode' },
+ { label: "推荐来源库区", prop: 'recommendFromLocationArea' },
+ { label: "推荐目标库区", prop: 'recommendToLocationArea' },
+ { label: "推荐来源分组", prop: 'recommendFromLocationGroup' },
+ { label: "推荐目标分组", prop: 'recommendToLocationGroup' },
+ { label: "推荐来源ERP库位", prop: 'recommendFromLocationErpCode' },
+ { label: "推荐目标ERP库位", prop: 'recommendToLocationErpCode' },
+ { label: "推荐来源仓库", prop: 'recommendFromWarehouseCode' },
+ { label: "推荐目标仓库", prop: "recommendToWarehouseCode" },
+ { label: "库移来源数量", prop: 'transferLibFromQty' },
+ { label: "库移目标数量", prop: 'transferLibToQty' },
+ { label: "库移来源箱标签", prop: 'transferLibFromPackingCode' },
+ { label: "库移目标箱标签", prop: 'transferLibToPackingCode' },
+ { label: "库移来源批次", prop: 'transferLibFromLot' },
+ { label: "库移目标批次", prop: 'transferLibToLot' },
+ { label: "库移来源供应商批次", prop: 'transferLibFromSupplierBatch' },
+ { label: "库移目标批应商批次", prop: 'transferLibToSupplierBatch' },
+ { label: "库移来源到货时间", prop: 'transferLibFromArriveDate', type: "dateTime" },
+ { label: "库移目标到货时间", prop: 'transferLibToArriveDate', type: "dateTime" },
+ { label: "库移来源生产时间", prop: 'transferLibFromProduceDate', type: "dateTime" },
+ { label: "库移目标生产时间", prop: 'transferLibToProduceDate', type: "dateTime" },
+ { label: "库移来源过期时间", prop: 'transferLibFromExpireDate', type: "dateTime" },
+ { label: "库移目标过期时间", prop: 'transferLibToExpireDate', type: "dateTime" },
+ { label: "库移来源库位", prop: 'transferLibFromLocationCode' },
+ { label: "库移目标库位", prop: 'transferLibToLocationCode' },
+ { label: "库移来源库区", prop: 'transferLibFromLocationArea' },
+ { label: "库移目标库区", prop: 'transferLibToLocationArea' },
+ { label: "库移来源库位组", prop: 'transferLibFromLocationGroup' },
+ { label: "库移目标库位组", prop: 'transferLibToLocationGroup' },
+ { label: "库移来源ERP库位", prop: 'transferLibFromLocationErpCode' },
+ { label: "库移目标ERP库位", prop: 'transferLibToLocationErpCode' },
+ { label: "实际来源数量", prop: 'handledFromQty' },
+ { label: "实际目标数量", prop: 'handledToQty' },
+ { label: "实际来源箱标签", prop: 'handledFromPackingCode' },
+ { label: "实际目标箱标签", prop: 'handledToPackingCode' },
+ { label: "实际来源批次", prop: 'handledFromLot' },
+ { label: "实际目标批次", prop: 'handledToLot' },
+ { label: "实际来源库位", prop: 'handledFromLocationCode' },
+ { label: "实际目标库位", prop: 'handledToLocationCode' },
+ { label: "实际来源库区", prop: 'handledFromLocationArea' },
+ { label: "实际目标库区", prop: 'handledToLocationArea' },
+ { label: "实际来源分组", prop: 'handledFromLocationGroup' },
+ { label: "实际目标分组", prop: 'handledToLocationGroup' },
+ { label: "实际来源ERP库位", prop: 'handledFromLocationErpCode' },
+ { label: "实际目标ERP库位", prop: 'handledToLocationErpCode' },
+ { label: "实际来源供应商批次", prop: 'handledFromSupplierBatch' },
+ { label: "实际目标供应商批次", prop: 'handledToSupplierBatch' },
+ { label: "实际来源到货时间", prop: 'handledFromArriveDate', type: "dateTime" },
+ { label: "实际目标到货时间", prop: 'handledToArriveDate', type: "dateTime" },
+ { label: "实际来源生产时间", prop: 'handledFromProduceDate', type: "dateTime" },
+ { label: "实际目标生产时间", prop: 'handledToProduceDate', type: "dateTime" },
+ { label: "实际来源过期时间", prop: 'handledFromExpireDate', type: "dateTime" },
+ { label: "实际目标过期时间", prop: 'handledToExpireDate', type: "dateTime" },
+ { label: "实际来源仓库", prop: 'handledFromWarehouseCode' },
+ { label: "实际目标仓库", prop: "handledToWarehouseCode" },
+ { label: "标包数量", prop: 'stdPackQty' },
+ { label: "位置码", prop: 'positionCode' },
+ { label: "推荐类型", prop: 'recommendType' },
+ { label: "生产线", prop: 'prodLine' },
+ { label: "备注", prop: "remark" },
+ { label: "创建时间", prop: 'creationTime', type: "dateTime" },
+ { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
]
\ No newline at end of file
diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js
index e407f6572..5a93176d8 100644
--- a/fe/PC/src/utils/tableColumns/index.js
+++ b/fe/PC/src/utils/tableColumns/index.js
@@ -4925,6 +4925,56 @@ export const KittingPackagingDepDetails = [
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
]
+// kitting请求
+export const KittingIssueRequest = [
+ { label: "请求单号", prop: "number", fixed: "left", type: "name" },
+ { label: "状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" },
+ { label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" },
+ { label: "来源库位列表", prop: 'fromLocationCodeJsonList',type:"showDetail",isJson:true,showProp:true },
+ { label: "目标库位代码", prop: "toLocationCode" },
+ { label: "目标ERP库位", prop: "toLocationErpCode" },
+ { label: "备注", prop: "remark" },
+ { label: "操作员", prop: "worker" },
+ { label: "创建时间", prop: 'creationTime', type: "dateTime" },
+ { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
+]
+
+// kitting任务
+export const KittingIssueJob = [
+ { label: "任务单号", prop: "number", fixed: "left", type: "name" },
+ { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
+ { label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" },
+ { label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" },
+ { label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" },
+ { label: "要货单号", prop: 'kittingRequestNumber'},
+ { label: "承接者用户名", prop: 'acceptUserName' },
+ { label: "承接时间", prop: 'acceptTime', type: "dateTime" },
+ { label: "完成者用户名", prop: 'completeUserName' },
+ { label: "完成时间", prop: 'completeTime',type: "dateTime" },
+ { label: "任务描述", prop: 'jobDescription' },
+ { label: "生产线", prop: 'prodLine' },
+ { label: "备注", prop: "remark" },
+ { label: "操作员", prop: "worker" },
+ { label: "创建时间", prop: 'creationTime', type: "dateTime" },
+ { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
+]
+
+// kitting记录
+export const KittingIssueNote = [
+ { label: "记录单号", prop: "number", fixed: "left", type: "name" },
+ { label: "申请单号", prop: 'requestNumber',width: orderWidth },
+ { label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" },
+ { label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" },
+ { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
+ { label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" },
+ { label: "确认时间", prop: 'confirmTime',type: "dateTime" },
+ { label: "任务代码", prop: 'jobNumber' },
+ { label: "备注", prop: "remark" },
+ { label: "操作员", prop: "worker" },
+ { label: "创建时间", prop: 'creationTime', type: "dateTime" },
+ { label: "生效日期", prop: 'activeDate', type: "dateTime" },
+ { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
+]
diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js
index 95182bf7b..73e391b96 100644
--- a/fe/PC/src/utils/tabsDesTions/index.js
+++ b/fe/PC/src/utils/tabsDesTions/index.js
@@ -3692,4 +3692,55 @@ export const KittingPackagingNote = [
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
+]
+
+// kitting请求
+export const KittingIssueRequest = [
+ { label: "请求单号", prop: "number", fixed: "left", type: "name" },
+ { label: "状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" },
+ { label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" },
+ { label: "来源库位列表", prop: 'fromLocationCodeJsonList',type:"showDetail",isJson:true,showProp:true },
+ { label: "目标库位代码", prop: "toLocationCode" },
+ { label: "目标ERP库位", prop: "toLocationErpCode" },
+ { label: "备注", prop: "remark" },
+ { label: "操作员", prop: "worker" },
+ { label: "创建时间", prop: 'creationTime', type: "dateTime" },
+ { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
+]
+
+// kitting任务
+export const KittingIssueJob = [
+ { label: "任务单号", prop: "number", fixed: "left", type: "name" },
+ { label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" },
+ { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
+ { label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" },
+ { label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" },
+ { label: "要货单号", prop: 'kittingRequestNumber'},
+ { label: "承接者用户名", prop: 'acceptUserName' },
+ { label: "承接时间", prop: 'acceptTime', type: "dateTime" },
+ { label: "完成者用户名", prop: 'completeUserName' },
+ { label: "完成时间", prop: 'completeTime',type: "dateTime" },
+ { label: "任务描述", prop: 'jobDescription' },
+ { label: "生产线", prop: 'prodLine' },
+ { label: "备注", prop: "remark" },
+ { label: "操作员", prop: "worker" },
+ { label: "创建时间", prop: 'creationTime', type: "dateTime" },
+ { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
+]
+
+// kitting记录
+export const KittingIssueNote = [
+ { label: "记录单号", prop: "number", fixed: "left", type: "name" },
+ { label: "申请单号", prop: 'requestNumber' },
+ { label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" },
+ { label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" },
+ { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
+ { label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" },
+ { label: "确认时间", prop: 'confirmTime',type: "dateTime" },
+ { label: "任务代码", prop: 'jobNumber' },
+ { label: "备注", prop: "remark" },
+ { label: "操作员", prop: "worker" },
+ { label: "创建时间", prop: 'creationTime', type: "dateTime" },
+ { label: "生效日期", prop: 'activeDate', type: "dateTime" },
+ { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
]
\ No newline at end of file
diff --git a/fe/PC/src/views/kittingManage/KittingIssueJob.vue b/fe/PC/src/views/kittingManage/KittingIssueJob.vue
new file mode 100644
index 000000000..41c1c603f
--- /dev/null
+++ b/fe/PC/src/views/kittingManage/KittingIssueJob.vue
@@ -0,0 +1,92 @@
+
+
+
+
+
+
+
+
+
(displayDialog.detailsDialog = val)"
+ @handleCommand="drawerHandle"
+ @close-value="closeValue"
+ :tableColumns="detailsTableColumns"
+ :totalCount="totalCountDetails"
+ :MaxResultCount="MaxResultCountDetails"
+ @alterResultCountDetails="alterResultCountDetails"
+ @alertoldSkipCountDetails="alertoldSkipCountDetails"
+ >
+
+
+
+
\ No newline at end of file
diff --git a/fe/PC/src/views/kittingManage/KittingIssueNote.vue b/fe/PC/src/views/kittingManage/KittingIssueNote.vue
new file mode 100644
index 000000000..a4bd64108
--- /dev/null
+++ b/fe/PC/src/views/kittingManage/KittingIssueNote.vue
@@ -0,0 +1,92 @@
+
+
+
+
+
+
+
+
+
(displayDialog.detailsDialog = val)"
+ @handleCommand="drawerHandle"
+ @close-value="closeValue"
+ :tableColumns="detailsTableColumns"
+ :totalCount="totalCountDetails"
+ :MaxResultCount="MaxResultCountDetails"
+ @alterResultCountDetails="alterResultCountDetails"
+ @alertoldSkipCountDetails="alertoldSkipCountDetails"
+ >
+
+
+
+
\ No newline at end of file
diff --git a/fe/PC/src/views/kittingManage/KittingIssueRequest.vue b/fe/PC/src/views/kittingManage/KittingIssueRequest.vue
new file mode 100644
index 000000000..733764922
--- /dev/null
+++ b/fe/PC/src/views/kittingManage/KittingIssueRequest.vue
@@ -0,0 +1,92 @@
+
+
+
+
+
+
+
+
+
(displayDialog.detailsDialog = val)"
+ @handleCommand="drawerHandle"
+ @close-value="closeValue"
+ :tableColumns="detailsTableColumns"
+ :totalCount="totalCountDetails"
+ :MaxResultCount="MaxResultCountDetails"
+ @alterResultCountDetails="alterResultCountDetails"
+ @alertoldSkipCountDetails="alertoldSkipCountDetails"
+ >
+
+
+
+
\ No newline at end of file
diff --git a/fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue b/fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue
index 7ab6a1db1..63a234856 100644
--- a/fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue
+++ b/fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue
@@ -1241,7 +1241,6 @@ export default {
}
postSplitPackingInspect(_params,_data)
.then(res=>{
- // todo:拆分成功后,重新获取列表数据验证
this.devanCancelHandel()
let _url = this.detailURL ? this.detailURL : this.URL
getDetailed(this.propsData.id, _url).then(res => {