Browse Source

人工叫料字段及接口整理

dev_web_online
陈薪名 2 years ago
parent
commit
4a81f92163
  1. 3
      fe/PC/src/api/wms-api.js
  2. 3
      fe/PC/src/api/wms-job.js
  3. 133
      fe/PC/src/utils/detailsTableColumns/index.js
  4. 30
      fe/PC/src/utils/tableColumns/index.js
  5. 18
      fe/PC/src/utils/tabsDesTions/index.js
  6. 4
      fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueJob.vue
  7. 2
      fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueNote.vue

3
fe/PC/src/api/wms-api.js

@ -456,8 +456,9 @@ export function createAndHandle(data) {
// 人工叫料申请 | 人工发料任务 | 人工发料记录 | 自动叫料申请 | 自动发料任务 | 自动发料记录 | 直接发料记录
// 完工收货缴库申请 | 线边仓缴库申请 | 线边仓缴库记录 | 线边仓报废申请 | 线边仓报废记录 | 原料报废记录
export function materialRequestByType(data, url, params) {
let _type = params.type?params.type:params.requestType
return request({
url: baseURL + url + '/' + params.type,
url: baseURL + url + '/' + _type,
method: 'post',
params: params,
data

3
fe/PC/src/api/wms-job.js

@ -168,8 +168,9 @@ export function InspectJobHandle(data, params, url) {
//人工发料任务 | 自动发料任务
export function materialRequestByType(data, url, params) {
let _type = params.type?params.type:params.requestType
return request({
url: baseURL + url + '/' + params.type,
url: baseURL + url + '/' + _type,
method: 'post',
params: params,
data

133
fe/PC/src/utils/detailsTableColumns/index.js

@ -460,45 +460,55 @@ export const PutawayNote = [
// { label: "供应商描述", prop: "supplierSimpleName" },
// -----------------------------------------------------------------------
]
// 人工叫料申请 待确认
// 人工叫料申请 20230411
export const IssueRequest = [
{ label: "物品代码", prop: "itemCode" },
{ label: "物品名称", prop: "itemName" },
{ label: "物品描述", prop: "itemDesc1" },
{ label: "物品描述1", prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" },
{ label: "状态", prop: "status", type: "filter", filters: "openToClose" },
{ label: "叫料数量", prop: "qty" },
{ label: "单位", prop: "uom" },
// 批次占位
// 箱码占位
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
// 来源库位占位
// 来源ERP库位
{ label: "创建者ID", prop: 'creatorId' },
{ label: "目标库位", prop: "toLocationCode" },
{ label: "目标ERP库位", prop: "toLocationErpCode" },
{ label: "生成任务数量", prop: 'issuedQty' },
{ label: "已收数量", prop: 'receivedQty' },
{ label: "在途库位", prop: 'onTheWayLocationCode' },
{ label: "单据号", prop: 'number' },
// -----------------------------------------------------------------------
{ label: "标包计量单位", prop: 'stdPackUom' },
{ label: "标包数量", prop: 'stdPackQty' },
{ label: "生产线", prop: 'prodLine' },
{ label: "来源库区", prop: 'fromLocationArea' },
{ label: "目标库区", prop: 'toLocationArea' },
{ label: "工作中心", prop: 'workStation' },
{ label: "过期时间", prop: 'expiredTime' },
{ label: "仓库", prop: 'warehouseCode' },
{ label: "目标库位组", prop: 'toLocationGroup' },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "上次修改者ID", prop: 'lastModifierId' },
{ label: "备注", prop: "remark" },
{ label: "事务ID", prop: "tenantId" },
{ label: "主表ID", prop: "masterID" },
{ label: "ID", prop: 'id' },
{ label: "请求未发", prop: 'toBeIssuedQty' },
{ label: "已发未收", prop: 'toBeReceivedQty' },
{ label: "请求未收", prop: 'notFinishQty' },
// { label: "目标库区", prop: 'toLocationArea' },
// { label: "仓库", prop: 'warehouseCode' },
// { label: "目标库位组", prop: 'toLocationGroup' },
// { label: "在途库位", prop: 'onTheWayLocationCode' },
// { label: "标包计量单位", prop: 'stdPackUom' },
// 批次占位
// 箱码占位
// 来源库位占位
// 来源ERP库位
// -----------------------------------------------------------------------
]
// 人工发料任务 已调整
// 人工发料任务 20230411
export const IssueJob = [
{ label: "物品代码", prop: "itemCode", fixed: "left" },
{ label: "物品名称", prop: "itemName" },
{ label: "物品描述", prop: "itemDesc1" },
{ label: "物品描述1", prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" },
{ label: "状态", prop: "status", type: "filter", filters: "inventoryStage" },
{ label: "单位", prop: "recommendUom" },
{ label: "推荐批次", prop: "recommendLot" },
{ label: "实际批次", prop: "handledLot" },
{ label: "推荐数量", prop: 'recommendQty' },
@ -506,19 +516,29 @@ export const IssueJob = [
{ label: "推荐箱码", prop: "recommendPackingCode" },
{ label: "实际箱码", prop: "handledPackingCode" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "推荐库位", prop: "recommendLocationCode" },
{ label: "实际库位", prop: "handledLocationCode" },
{ label: "推荐ERP库位", prop: 'recommendLocationErpCode' },
{ label: "实际ERP库位", prop: 'handledLocationErpCode' },
{ label: "创建者ID", prop: 'creatorId' },
{ label: "在途库位", prop: 'onTheWayLocationCode' },
// -----------------------------------------------------------------------
{ label: "标包数量", prop: "stdPackQty" },
{ label: "标包单位", prop: "stdPackUom" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "上次修改者ID", prop: 'lastModifierId' },
{ label: "任务编号", prop: 'number',width: orderWidth },
{ label: "备注", prop: 'remark' },
{ label: "仓库", prop: 'warehouseCode' },
{ label: "状态", prop: 'status' },
{ label: "推荐库位", prop: 'recommendFromLocationCode' },
{ label: "推荐区域", prop: 'recommendFromLocationArea' },
{ label: "推荐分组", prop: 'recommendFromLocationGroup' },
{ label: "推荐ERP库位", prop: 'recommendFromLocationErpCode' },
{ label: "推荐仓库", prop: 'recommendFromWarehouseCode' },
{ label: "计量单位", prop: 'uom' },
{ label: "实际库位", prop: 'handledFromLocationCode' },
{ label: "实际区域", prop: 'handledFromLocationArea' },
{ label: "实际分组", prop: 'handledFromLocationGroup' },
{ label: "实际ERP库位", prop: 'handledFromLocationErpCode' },
{ label: "实际仓库", prop: 'handledFromWarehouseCode' },
{ label: "到库区", prop: 'toLocationArea' },
{ label: "到库位组", prop: 'toLocationGroup' },
{ label: "到ERP库位", prop: 'toLocationErpCode' },
{ label: "到仓库", prop: 'toWarehouseCode' },
{ label: "推荐供应商批次", prop: 'recommendSupplierBatch' },
{ label: "实际供应商批次", prop: 'handledSupplierBatch' },
{ label: "推荐到货时间", prop: 'recommendArriveDate', type: "dateTime" },
@ -527,12 +547,6 @@ export const IssueJob = [
{ label: "实际生产时间", prop: 'handledProduceDate', type: "dateTime" },
{ label: "推荐过期时间", prop: 'recommendExpireDate', type: "dateTime" },
{ label: "实际过期时间", prop: 'handledExpireDate', type: "dateTime" },
{ label: "推荐库位组", prop: 'recommendLocationGroup' },
{ label: "实际库位组", prop: 'handledLocationGroup' },
{ label: "推荐库区", prop: 'recommendLocationArea' },
{ label: "实际库区", prop: 'handledLocationArea' },
{ label: "推荐计量单位", prop: 'recommendUom' },
{ label: "实际计量单位", prop: 'handledUom' },
{ label: "请求库位", prop: 'requestLocationCode' },
{ label: "到库位", prop: 'toLocationCode' },
{ label: "生产线", prop: 'prodLine' },
@ -545,22 +559,39 @@ export const IssueJob = [
{ label: "plannedSplitRule", prop: 'plannedSplitRule' },
{ label: "计划开始时间", prop: 'planBeginTime' },
{ label: "每次配送数量", prop: 'deliveryQty' },
{ label: "库位组", prop: 'locationGroup' },
{ label: "库区", prop: 'locationArea' },
{ label: "ERP库位", prop: 'locationErpCode' },
{ label: "ID", prop: 'id' },
{ label: "主表ID", prop: "masterID" },
{ label: "事务ID", prop: "tenantId" },
// { label: "单位", prop: "recommendUom" },
// { label: "标包单位", prop: "stdPackUom" },
// { label: "仓库", prop: 'warehouseCode' },
// { label: "状态", prop: 'status' },
// { label: "库位组", prop: 'locationGroup' },
// { label: "库区", prop: 'locationArea' },
// { label: "ERP库位", prop: 'locationErpCode' },
// { label: "推荐库位", prop: "recommendLocationCode" },
// { label: "实际库位", prop: "handledLocationCode" },
// { label: "推荐ERP库位", prop: 'recommendLocationErpCode' },
// { label: "实际ERP库位", prop: 'handledLocationErpCode' },
// { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
// { label: "推荐库位组", prop: 'recommendLocationGroup' },
// { label: "实际库位组", prop: 'handledLocationGroup' },
// { label: "推荐库区", prop: 'recommendLocationArea' },
// { label: "实际库区", prop: 'handledLocationArea' },
// { label: "推荐计量单位", prop: 'recommendUom' },
// { label: "实际计量单位", prop: 'handledUom' },
// -----------------------------------------------------------------------
]
// 人工发料记录 已调整
// 人工发料记录 20230411
export const IssueNote = [
{ label: "物品代码", prop: "itemCode",fixed: "left" },
{ label: "物品名称", prop: "itemName" },
{ label: "物品描述", prop: "itemDesc1" },
{ label: "物品描述1", prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" },
{ label: "发料数量", prop: "qty" },
{ label: "单位", prop: "uom" },
{ label: "批次", prop: "fromLot" },
{ label: "箱码", prop: "fromPackingCode" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "创建者ID", prop: 'creatorId' },
{ label: "来源库位", prop: "fromLocationCode" },
{ label: "来源ERP库位", prop: 'fromLocationErpCode' },
{ label: "目标库位", prop: "toLocationCode" },
@ -569,12 +600,11 @@ export const IssueNote = [
// -----------------------------------------------------------------------
{ label: "生效日期", prop: "arriveDate", type: "dateTime" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "上次修改者ID", prop: 'lastModifierId' },
{ label: "任务编号", prop: 'number',width: orderWidth },
{ label: "备注", prop: 'remark' },
{ label: "仓库", prop: 'warehouseCode' },
{ label: "来源仓库", prop: 'fromWarehouseCode' },
{ label: "目标仓库", prop: 'toWarehouseCode' },
{ label: "标包计量单位", prop: 'stdPackUom' },
{ label: "标包数量", prop: 'stdPackQty' },
{ label: "来源箱码", prop: 'fromPackingCode' },
{ label: "目标箱码", prop: 'toPackingCode' },
@ -587,12 +617,41 @@ export const IssueNote = [
{ label: "目标库位组", prop: 'toLocationGroup' },
{ label: "来源库区", prop: 'fromLocationArea' },
{ label: "目标库区", prop: 'toLocationArea' },
{ label: "推荐箱码", prop: "recommendPackingCode" },
{ label: "fromStatus", prop: 'fromStatus' },
{ label: "toStatus", prop: 'toStatus' },
{ label: "发料时间", prop: 'issueTime', type: "dateTime" },
{ label: "过期时间", prop: 'expiredTime', type: "dateTime" },
{ label: "生产线", prop: 'prodLine' },
{ label: "工作中心", prop: 'workStation' },
{ label: "ID", prop: 'id' },
{ label: "主表ID", prop: "masterID" },
{ label: "事务ID", prop: "tenantId" },
{ label: "推荐数量", prop: 'recommendQty' },
{ label: "实际批次", prop: "handledLot" },
{ label: "实际库位", prop: 'handledFromLocationCode' },
{ label: "实际区域", prop: 'handledFromLocationArea' },
{ label: "实际分组", prop: 'handledFromLocationGroup' },
{ label: "实际ERP库位", prop: 'handledFromLocationErpCode' },
{ label: "实际仓库", prop: 'handledFromWarehouseCode' },
{ label: "推荐库位", prop: 'recommendFromLocationCode' },
{ label: "推荐区域", prop: 'recommendFromLocationArea' },
{ label: "推荐分组", prop: 'recommendFromLocationGroup' },
{ label: "推荐ERP库位", prop: 'recommendFromLocationErpCode' },
{ label: "推荐仓库", prop: 'recommendFromWarehouseCode' },
{ label: "实际数量", prop: 'handledQty' },
{ label: "实际箱码", prop: "handledPackingCode" },
{ label: "推荐批次", prop: "recommendLot" },
{ label: "推荐供应商批次", prop: 'recommendSupplierBatch' },
{ label: "实际供应商批次", prop: 'handledSupplierBatch' },
{ label: "推荐到货时间", prop: 'recommendArriveDate', type: "dateTime" },
{ label: "实际到货时间", prop: 'handledArriveDate', type: "dateTime" },
{ label: "推荐生产时间", prop: 'recommendProduceDate', type: "dateTime" },
{ label: "实际生产时间", prop: 'handledProduceDate', type: "dateTime" },
{ label: "推荐过期时间", prop: 'recommendExpireDate', type: "dateTime" },
{ label: "实际过期时间", prop: 'handledExpireDate', type: "dateTime" },
// { label: "仓库", prop: 'warehouseCode' },
// { label: "标包计量单位", prop: 'stdPackUom' },
// { label: "过期时间", prop: 'expiredTime', type: "dateTime" },
// { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
// -----------------------------------------------------------------------
]

30
fe/PC/src/utils/tableColumns/index.js

@ -1614,7 +1614,7 @@ export const PutawayNote = [
// { label: "仓库", prop: 'warehouseCode' },
// -----------------------------------------------------------------------
]
// 人工叫料申请 已调整
// 人工叫料申请 20230411
export const IssueRequest = [
{
label: "叫料申请编号",
@ -1625,12 +1625,13 @@ export const IssueRequest = [
},
{ label: "状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" },
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "创建者ID", prop: 'creatorId' },
{ label: "操作员", prop: "worker" },
{ label: "备注", prop: 'remark' },
// -----------------------------------------------------------------------
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "公司", prop: 'company' },
{ label: "上次修改者ID", prop: "lastModifierId" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "仓库", prop: 'warehouseCode' },
{ label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" },
{ label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot" },
{ label: "自动执行", prop: 'autoHandle', type: "filter", filters: "whetherOrNot" },
@ -1641,9 +1642,12 @@ export const IssueRequest = [
{ label: "生产线", prop: 'prodLine' },
{ label: "车间", prop: 'workshop' },
{ label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
{ label: "事务ID", prop: "tenantId" },
// { label: "公司", prop: 'company' },
// { label: "仓库", prop: 'warehouseCode' },
// -----------------------------------------------------------------------
]
// 人工发料任务 已调整
// 人工发料任务 20230411
export const IssueJob = [
{
label: "发料任务编号",
@ -1655,12 +1659,14 @@ export const IssueJob = [
{ label: "申请单号", prop: "materialRequestNumber",width: orderWidth },
{ label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" },
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "创建者ID", prop: 'creatorId' },
{ label: "完成时间", prop: "completeTime", type: "dateTime" },
{ label: "操作员", prop: 'worker' },
// -----------------------------------------------------------------------
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "上次修改者ID", prop: "lastModifierId" },
{ label: "事务ID", prop: "tenantId" },
{ label: "备注", prop: 'remark' },
{ label: "公司", prop: 'company' },
{ label: "仓库", prop: 'warehouseCode' },
{ label: "上游任务编号", prop: 'upStreamJobNumber' },
{ label: "任务类型", prop: 'jobType' },
@ -1673,15 +1679,16 @@ export const IssueJob = [
{ label: "承接时间", prop: 'acceptTime', type: "dateTime" },
{ label: "完成者", prop: 'completeUserId' },
{ label: "完成者用户名", prop: 'completeUserName' },
{ label: "完成时间", prop: 'completeTime', type: "dateTime" },
{ label: "任务描述", prop: 'jobDescription' },
{ label: "叫料请求类型", prop: 'requestType' },
{ label: "生产线", prop: 'prodLine' },
{ label: "车间", prop: 'workshop' },
{ label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
// { label: "公司", prop: 'company' },
// { label: "完成时间", prop: 'completeTime', type: "dateTime" },
// -----------------------------------------------------------------------
]
// 人工发料记录 已调整
// 人工发料记录 20230411
export const IssueNote = [
{
label: "发料记录单号",
@ -1693,19 +1700,22 @@ export const IssueNote = [
{ label: "申请单号", prop: 'requestNumber',width: orderWidth },
{ label: "任务单号", prop: 'jobNumber',width: orderWidth },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
{ label: "创建者ID", prop: 'creatorId' },
{ label: "操作员", prop: 'worker' },
// -----------------------------------------------------------------------
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "完成时间", prop: "completeTime",type: "dateTime" },
{ label: "上次修改者ID", prop: "lastModifierId" },
{ label: "备注", prop: 'remark' },
{ label: "公司", prop: 'company' },
{ label: "仓库", prop: 'warehouseCode' },
{ label: "生效日期", prop: 'activeDate',type: "dateTime" },
{ label: "车间", prop: 'workshop' },
{ label: "叫料请求类型", prop: 'requestType' },
{ label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
{ label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" },
{ label: "确认时间", prop: 'confirmTime' },
{ label: "事务ID", prop: "tenantId" },
// { label: "公司", prop: 'company' },
// { label: "仓库", prop: 'warehouseCode' },
// { label: "完成时间", prop: "completeTime",type: "dateTime" },
// -----------------------------------------------------------------------
]
// 自动叫料申请 已调整

18
fe/PC/src/utils/tabsDesTions/index.js

@ -1101,13 +1101,14 @@ export const PutawayNote = [
// { label: "仓库", prop: 'warehouseCode' },
// -----------------------------------------------------------------------
]
// 人工叫料申请 已调整 20221220
// 人工叫料申请 20230411
export const IssueRequest = [
{ label: "申请编号", prop: "number" },
{ label: "状态", prop: "requestStatus",type: "filter", filters: "requestStatus" },
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "操作员", prop: "worker" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "上次修改者ID", prop: "lastModifierId" },
{ label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" },
{ label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot" },
{ label: "自动执行", prop: 'autoHandle', type: "filter", filters: "whetherOrNot" },
@ -1118,18 +1119,17 @@ export const IssueRequest = [
// -----------------------------------------------------------------------
{ label: "备注", prop: 'remark' },
{ label: "创建者ID", prop: "creatorId" },
{ label: "上次修改者ID", prop: "lastModifierId" },
{ label: "事务ID", prop: "tenantId" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "仓库", prop: 'warehouseCode' },
{ label: "备料计划单号", prop: 'preparationPlanNumber' },
{ label: "生产线", prop: 'prodLine' },
{ label: "车间", prop: 'workshop' },
{ label: "ID", prop: 'id' },
{ label: "公司", prop: 'company' },
// { label: "仓库", prop: 'warehouseCode' },
// { label: "公司", prop: 'company' },
// -----------------------------------------------------------------------
]
// 人工发料任务 已调整 20221220
// 人工发料任务 20230411
export const IssueJob = [
{ label: "发料任务编号", prop: "number" },
{ label: "申请单号", prop: "materialRequestNumber" },
@ -1161,10 +1161,10 @@ export const IssueJob = [
{ label: "车间", prop: 'workshop' },
{ label: "仓库", prop: 'warehouseCode' },
{ label: "ID", prop: "id" },
{ label: "公司", prop: 'company' },
// { label: "公司", prop: 'company' },
// -----------------------------------------------------------------------
]
// 人工发料记录 已调整 20221220
// 人工发料记录 20230411
export const IssueNote = [
{ label: "发料记录单号", prop: "number" },
{ label: "申请单号", prop: 'requestNumber' },
@ -1183,9 +1183,9 @@ export const IssueNote = [
{ label: "生效日期", prop: 'activeDate' },
{ label: "车间", prop: 'workshop' },
{ label: "确认时间", prop: 'confirmTime' },
{ label: "仓库", prop: 'warehouseCode' },
{ label: "ID", prop: 'id' },
{ label: "公司", prop: 'company' },
// { label: "公司", prop: 'company' },
// { label: "仓库", prop: 'warehouseCode' },
// -----------------------------------------------------------------------
]
// 自动叫料申请 已调整 1apifox

4
fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueJob.vue

@ -98,7 +98,7 @@ export default {
},
data () {
return {
URL: 'wms/job/issue-job',
URL: 'wms/store/issue-job',
tableLoading: false,
handleMultipleSelection: [],
//
@ -248,7 +248,7 @@ export default {
this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount
// : :Issue_Manual; 线:Issue_WIP; :Direct_Issue
let params = {
type: 'Issue_Manual'
requestType: 'Issue_Manual'
}
materialRequestByType(this.PageListParams, this.URL + '/by-type', params)
.then(res => {

2
fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueNote.vue

@ -93,7 +93,7 @@ export default {
this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount
// : :Issue_Manual; 线:Issue_WIP; :Direct_Issue
let params = {
type: 'Issue_Manual'
requestType: 'Issue_Manual'
}
materialRequestByType(this.PageListParams, this.URL + '/by-type', params).then(res => {
this.tableData = res.items

Loading…
Cancel
Save