From b71571f7b6657296ae68efd155a2669fd12f2f57 Mon Sep 17 00:00:00 2001 From: "LAPTOP-UV1MNL38\\18023" <1802330370@qq.com> Date: Sat, 13 Jul 2024 16:01:25 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E6=96=B0=E5=A2=9E=E9=A2=86=E6=96=99?= =?UTF-8?q?=E5=8D=95=E3=80=81=E8=A1=A5=E6=96=99=E5=8D=95=E3=80=81=E9=A2=86?= =?UTF-8?q?=E6=96=99=E5=87=BA=E5=BA=93=E5=8D=95=E3=80=81=E8=A1=A5=E6=96=99?= =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=8D=95=E3=80=81=E9=80=80=E6=96=99=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E5=8D=95=E3=80=81=E9=A2=86=E6=96=99=E5=8D=95=E8=BD=AC?= =?UTF-8?q?=E9=A2=86=E6=96=99=E5=87=BA=E5=BA=93=E3=80=81=E8=A1=A5=E6=96=99?= =?UTF-8?q?=E5=8D=95=E8=BD=AC=E8=A1=A5=E6=96=99=E5=87=BA=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../template/js/erpPick/erpPatchPickList.js | 71 ++++++--- .../js/erpPick/erpRequisitionPickList.js | 70 ++++++--- .../template/js/erpPick/erpReturnPickList.js | 3 +- .../template/js/erpPick/materialOutList.js | 142 ++++++++++++++++++ .../js/erpPick/returnMaterialPutList.js | 142 ++++++++++++++++++ .../template/js/erpPick/supplementOutList.js | 141 +++++++++++++++++ .../js/erpPick/turnPatchMaterialToTurnOut.js | 59 ++++++++ .../erpPick/turnRequisitionMaterialToOut.js | 59 ++++++++ .../tpl/erpPick/erpPatchPickList.html | 7 + .../tpl/erpPick/erpRequisitionPickList.html | 7 + .../template/tpl/erpPick/materialOutList.html | 43 ++++++ .../tpl/erpPick/returnMaterialPutList.html | 43 ++++++ .../tpl/erpPick/supplementOutList.html | 43 ++++++ .../erpPick/turnPatchMaterialToTurnOut.html | 29 ++++ .../erpPick/turnRequisitionMaterialToOut.html | 29 ++++ .../qualityInspectionToPut.js | 1 - .../js/purchaseRequest/requestToContract.js | 1 - .../template/json/skyeyeClassEnum.json | 3 +- .../template/json/sysServiceMation.json | 3 + 19 files changed, 849 insertions(+), 47 deletions(-) create mode 100644 erp-produce/src/main/resources/template/js/erpPick/materialOutList.js create mode 100644 erp-produce/src/main/resources/template/js/erpPick/returnMaterialPutList.js create mode 100644 erp-produce/src/main/resources/template/js/erpPick/supplementOutList.js create mode 100644 erp-produce/src/main/resources/template/js/erpPick/turnPatchMaterialToTurnOut.js create mode 100644 erp-produce/src/main/resources/template/js/erpPick/turnRequisitionMaterialToOut.js create mode 100644 erp-produce/src/main/resources/template/tpl/erpPick/materialOutList.html create mode 100644 erp-produce/src/main/resources/template/tpl/erpPick/returnMaterialPutList.html create mode 100644 erp-produce/src/main/resources/template/tpl/erpPick/supplementOutList.html create mode 100644 erp-produce/src/main/resources/template/tpl/erpPick/turnPatchMaterialToTurnOut.html create mode 100644 erp-produce/src/main/resources/template/tpl/erpPick/turnRequisitionMaterialToOut.html diff --git a/erp-produce/src/main/resources/template/js/erpPick/erpPatchPickList.js b/erp-produce/src/main/resources/template/js/erpPick/erpPatchPickList.js index 593245643..eb71ddb99 100644 --- a/erp-produce/src/main/resources/template/js/erpPick/erpPatchPickList.js +++ b/erp-produce/src/main/resources/template/js/erpPick/erpPatchPickList.js @@ -12,6 +12,7 @@ layui.config({ authBtn('1593876735471');//新增 + //补料单 table.render({ id: 'messageTable', elem: '#messageTable', @@ -23,24 +24,37 @@ layui.config({ limits: getLimits(), limit: getLimit(), cols: [[ - { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' }, - { field: 'oddNumber', title: '单据编号', align: 'center', width: 180, templet: function (d) { - return '' + d.oddNumber + ''; - }}, - { field: 'machinMation', rowspan: '2', title: '加工单', align: 'center', width: 200, templet: function (d) {return isNull(d.machinMation) ? '' : d.machinMation.oddNumber}}, - { field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) { - return '' + getNotUndefinedVal(d.processInstanceId) + ''; - }}, - { field: 'state', title: '状态', width: 90, templet: function (d) { - return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name'); - }}, - { field: 'totalPrice', title: '物料合计', align: 'left', width: 100 }, - { field: 'operTime', title: '单据日期', align: 'center', width: 150 }, - { field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], width: 120 }, - { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 150 }, - { field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], align: 'left', width: 120 }, - { field: 'lastUpdateTime', title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], align: 'center', width: 150 }, - { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 200, toolbar: '#tableBar' } + { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers', rowspan: '2' }, + { field: 'oddNumber', title: '单号', rowspan: '2', width: 200, align: 'center', templet: function (d) { + var str = '' + d.oddNumber + ''; + if (!isNull(d.fromId)) { + str += '[转]'; + } + return str; + }}, + { field: 'operTime', title: '单据日期', rowspan: '2', align: 'center', width: 140 }, + { colspan: '2', title: '来源单据信息', align: 'center' }, + { field: 'processInstanceId', title: '流程ID', rowspan: '2', width: 100, templet: function (d) { + return '' + getNotUndefinedVal(d.processInstanceId) + ''; + }}, + { field: 'state', title: '状态', rowspan: '2', width: 90, templet: function (d) { + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("erpOrderStateEnum", 'id', d.state, 'name'); + }}, + { field: 'otherState', title: '出库状态', rowspan: '2', width: 90, templet: function (d) { + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("outLetState", 'id', d.otherState, 'name'); + }}, + { field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], rowspan: '2', width: 120 }, + { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], rowspan: '2', align: 'center', width: 150 }, + { field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], rowspan: '2', align: 'left', width: 120 }, + { field: 'lastUpdateTime', title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], rowspan: '2', align: 'center', width: 150 }, + { title: systemLanguage["com.skyeye.operation"][languageType], rowspan: '2', fixed: 'right', align: 'center', width: 200, toolbar: '#tableBar'} + ], [ + { field: 'fromTypeId', title: '来源类型', width: 150, templet: function (d) { + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("pickFromType", 'id', d.fromTypeId, 'name'); + }}, + { field: 'fromId', title: '单据编号', width: 200, templet: function (d) { + return getNotUndefinedVal(d.fromMation?.oddNumber); + }} ]], done: function(json) { matchingLanguage(); @@ -63,17 +77,32 @@ layui.config({ subApproval(data); } else if (layEvent === 'processDetails') { // 工作流流程详情查看 activitiUtil.activitiDetails(data); + }else if (layEvent === 'turnPatchMaterialToTurnOut') { //转补料出库 + turnPatchMaterialToTurnOut(data); } else if (layEvent === 'revoke') { //撤销 revoke(data); } }); + // 转领料出库 + function turnPatchMaterialToTurnOut(data) { + _openNewWindows({ + url: "../../tpl/erpPick/turnPatchMaterialToTurnOut.html?id=" + data.id, + title: "转领料出库", + pageId: "turnPatchMaterialToTurnOut", + area: ['90vw', '90vh'], + callBack: function (refreshCode) { + winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); + loadTable(); + }}); + } + // 添加 $("body").on("click", "#addBean", function() { _openNewWindows({ url: systemCommonUtil.getUrl('FP2023100600001', null), title: systemLanguage["com.skyeye.addPageTitle"][languageType], - pageId: "erpPatchAdd", + pageId: "erpPatchPickAdd", area: ['90vw', '90vh'], callBack: function (refreshCode) { winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); @@ -86,7 +115,7 @@ layui.config({ _openNewWindows({ url: systemCommonUtil.getUrl('FP2023100600002&id=' + data.id, null), title: systemLanguage["com.skyeye.editPageTitle"][languageType], - pageId: "erpPatchEdit", + pageId: "erpPatchPickEdit", area: ['90vw', '90vh'], callBack: function (refreshCode) { winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); @@ -99,7 +128,7 @@ layui.config({ _openNewWindows({ url: systemCommonUtil.getUrl('FP2023100600003&id=' + data.id, null), title: systemLanguage["com.skyeye.detailsPageTitle"][languageType], - pageId: "erpPatchDetails", + pageId: "erpPatchPickDetails", area: ['90vw', '90vh'], callBack: function (refreshCode) { }}); diff --git a/erp-produce/src/main/resources/template/js/erpPick/erpRequisitionPickList.js b/erp-produce/src/main/resources/template/js/erpPick/erpRequisitionPickList.js index 814db8727..9463b995a 100644 --- a/erp-produce/src/main/resources/template/js/erpPick/erpRequisitionPickList.js +++ b/erp-produce/src/main/resources/template/js/erpPick/erpRequisitionPickList.js @@ -11,7 +11,7 @@ layui.config({ table = layui.table; authBtn('1593864516103');//新增 - + //领料单 table.render({ id: 'messageTable', elem: '#messageTable', @@ -23,24 +23,37 @@ layui.config({ limits: getLimits(), limit: getLimit(), cols: [[ - { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' }, - { field: 'oddNumber', title: '单据编号', align: 'center', width: 180, templet: function (d) { - return '' + d.oddNumber + ''; - }}, - { field: 'machinMation', rowspan: '2', title: '加工单', align: 'center', width: 200, templet: function (d) {return isNull(d.machinMation) ? '' : d.machinMation.oddNumber}}, - { field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) { - return '' + getNotUndefinedVal(d.processInstanceId) + ''; - }}, - { field: 'state', title: '状态', width: 90, templet: function (d) { - return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name'); - }}, - { field: 'totalPrice', title: '物料合计', align: 'left', width: 100 }, - { field: 'operTime', title: '单据日期', align: 'center', width: 150 }, - { field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], width: 120 }, - { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 150 }, - { field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], align: 'left', width: 120 }, - { field: 'lastUpdateTime', title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], align: 'center', width: 150 }, - { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 200, toolbar: '#tableBar' } + { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers', rowspan: '2' }, + { field: 'oddNumber', title: '单号', rowspan: '2', width: 200, align: 'center', templet: function (d) { + var str = '' + d.oddNumber + ''; + if (!isNull(d.fromId)) { + str += '[转]'; + } + return str; + }}, + { field: 'operTime', title: '单据日期', rowspan: '2', align: 'center', width: 140 }, + { colspan: '2', title: '来源单据信息', align: 'center' }, + { field: 'processInstanceId', title: '流程ID', rowspan: '2', width: 100, templet: function (d) { + return '' + getNotUndefinedVal(d.processInstanceId) + ''; + }}, + { field: 'state', title: '状态', rowspan: '2', width: 90, templet: function (d) { + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("erpOrderStateEnum", 'id', d.state, 'name'); + }}, + { field: 'otherState', title: '出库状态', rowspan: '2', width: 90, templet: function (d) { + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("outLetState", 'id', d.otherState, 'name'); + }}, + { field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], rowspan: '2', width: 120 }, + { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], rowspan: '2', align: 'center', width: 150 }, + { field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], rowspan: '2', align: 'left', width: 120 }, + { field: 'lastUpdateTime', title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], rowspan: '2', align: 'center', width: 150 }, + { title: systemLanguage["com.skyeye.operation"][languageType], rowspan: '2', fixed: 'right', align: 'center', width: 200, toolbar: '#tableBar'} + ], [ + { field: 'fromTypeId', title: '来源类型', width: 150, templet: function (d) { + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("pickFromType", 'id', d.fromTypeId, 'name'); + }}, + { field: 'fromId', title: '单据编号', width: 200, templet: function (d) { + return getNotUndefinedVal(d.fromMation?.oddNumber); + }} ]], done: function(json) { matchingLanguage(); @@ -63,11 +76,26 @@ layui.config({ subApproval(data); } else if (layEvent === 'processDetails') { // 工作流流程详情查看 activitiUtil.activitiDetails(data); - } else if (layEvent === 'revoke') { //撤销 + } else if (layEvent === 'turnRequisitionMaterialToOut') { //转领料出库 + turnRequisitionMaterialToOut(data); + }else if (layEvent === 'revoke') { //撤销 revoke(data); } }); + // 转领料出库 + function turnRequisitionMaterialToOut(data) { + _openNewWindows({ + url: "../../tpl/erpPick/turnRequisitionMaterialToOut.html?id=" + data.id, + title: "转领料出库", + pageId: "turnRequisitionMaterialToOut", + area: ['90vw', '90vh'], + callBack: function (refreshCode) { + winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); + loadTable(); + }}); + } + // 添加 $("body").on("click", "#addBean", function() { _openNewWindows({ @@ -108,7 +136,7 @@ layui.config({ // 删除 function del(data) { layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function (index) { - AjaxPostUtil.request({url: sysMainMation.erpBasePath + "erppick008", params: {id: data.id}, type: 'json', method: 'DELETE', callback: function (json) { + AjaxPostUtil.request({url: sysMainMation.erpBasePath + "deleteRequisitionMaterialById", params: {id: data.id}, type: 'json', method: 'DELETE', callback: function (json) { winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000}); loadTable(); }}); diff --git a/erp-produce/src/main/resources/template/js/erpPick/erpReturnPickList.js b/erp-produce/src/main/resources/template/js/erpPick/erpReturnPickList.js index cdffd5c71..3d3ffe3db 100644 --- a/erp-produce/src/main/resources/template/js/erpPick/erpReturnPickList.js +++ b/erp-produce/src/main/resources/template/js/erpPick/erpReturnPickList.js @@ -11,7 +11,8 @@ layui.config({ table = layui.table; authBtn('1593877820765');//新增 - + + //退料单 table.render({ id: 'messageTable', elem: '#messageTable', diff --git a/erp-produce/src/main/resources/template/js/erpPick/materialOutList.js b/erp-produce/src/main/resources/template/js/erpPick/materialOutList.js new file mode 100644 index 000000000..41067aa26 --- /dev/null +++ b/erp-produce/src/main/resources/template/js/erpPick/materialOutList.js @@ -0,0 +1,142 @@ + +layui.config({ + base: basePath, + version: skyeyeVersion +}).extend({ + window: 'js/winui.window' +}).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) { + winui.renderColor(); + var $ = layui.$, + form = layui.form, + table = layui.table; + var serviceClassName = sysServiceMation["materialOutList"]["key"]; + authBtn('1720705501263');//新增 + + //领料出库单 + table.render({ + id: 'messageTable', + elem: '#messageTable', + method: 'post', + url: sysMainMation.erpBasePath + 'queryRequisitionOutLetList', + where: getTableParams(), + even: true, + page: true, + limits: getLimits(), + limit: getLimit(), + cols: [[ + { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers', rowspan: '2' }, + { field: 'oddNumber', title: '单号', rowspan: '2', width: 200, align: 'center', templet: function (d) { + var str = '' + d.oddNumber + ''; + if (!isNull(d.fromId)) { + str += '[转]'; + } + return str; + }}, + { field: 'totalPrice', title: '合计金额', rowspan: '2', align: 'left', width: 120 }, + { field: 'operTime', title: '单据日期', rowspan: '2', align: 'center', width: 140 }, + { colspan: '2', title: '来源单据信息', align: 'center' }, + { field: 'processInstanceId', title: '流程ID', rowspan: '2', width: 100, templet: function (d) { + return '' + getNotUndefinedVal(d.processInstanceId) + ''; + }}, + { field: 'state', title: '状态', rowspan: '2', width: 90, templet: function (d) { + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("erpOrderStateEnum", 'id', d.state, 'name'); + }}, + { field: 'otherState', title: '出库状态', rowspan: '2', width: 90, templet: function (d) { + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("depotOutState", 'id', d.otherState, 'name'); + }}, + { field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], rowspan: '2', width: 120 }, + { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], rowspan: '2', align: 'center', width: 150 }, + { field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], rowspan: '2', align: 'left', width: 120 }, + { field: 'lastUpdateTime', title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], rowspan: '2', align: 'center', width: 150 }, + { title: systemLanguage["com.skyeye.operation"][languageType], rowspan: '2', fixed: 'right', align: 'center', width: 200, toolbar: '#tableBar'} + ], [ + { field: 'fromTypeId', title: '来源类型', width: 150, templet: function (d) { + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("requisitionOutLetFromType", 'id', d.fromTypeId, 'name'); + }}, + { field: 'fromId', title: '单据编号', width: 200, templet: function (d) { + return getNotUndefinedVal(d.fromMation?.oddNumber); + }} + ]], + done: function(json) { + matchingLanguage(); + initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入单号", function () { + table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()}); + }); + } + }); + + table.on('tool(messageTable)', function (obj) { + var data = obj.data; + var layEvent = obj.event; + if (layEvent === 'delete') { //删除 + erpOrderUtil.deleteOrderMation(data.id, serviceClassName, function() { + loadTable(); + }); + } else if (layEvent === 'details') { //详情 + details(data); + } else if (layEvent === 'edit') { //编辑 + edit(data); + } else if (layEvent === 'subApproval') { //提交审核 + erpOrderUtil.submitOrderMation(data.id, serviceClassName, function() { + loadTable(); + }); + } else if (layEvent === 'processDetails') { // 工作流流程详情查看 + activitiUtil.activitiDetails(data); + } else if (layEvent === 'revoke') { //撤销 + erpOrderUtil.revokeOrderMation(data.processInstanceId, serviceClassName, function() { + loadTable(); + }); + } + }); + + // 添加 + $("body").on("click", "#addBean", function() { + _openNewWindows({ + url: systemCommonUtil.getUrl('FP2024071200004', null), + title: systemLanguage["com.skyeye.addPageTitle"][languageType], + pageId: "materialOutListAdd", + area: ['90vw', '90vh'], + callBack: function (refreshCode) { + winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); + loadTable(); + }}); + }); + + // 编辑 + function edit(data) { + _openNewWindows({ + url: systemCommonUtil.getUrl('FP2024071200005&id=' + data.id, null), + title: systemLanguage["com.skyeye.editPageTitle"][languageType], + pageId: "materialOutListEdit", + area: ['90vw', '90vh'], + callBack: function (refreshCode) { + winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); + loadTable(); + }}); + } + + // 详情 + function details(data) { + _openNewWindows({ + url: systemCommonUtil.getUrl('FP2024070100001&id=' + data.id, null), + title: systemLanguage["com.skyeye.detailsPageTitle"][languageType], + pageId: "materialOutListDetails", + area: ['90vw', '90vh'], + callBack: function (refreshCode) { + }}); + } + + form.render(); + $("body").on("click", "#reloadTable", function() { + loadTable(); + }); + function loadTable() { + table.reloadData("messageTable", {where: getTableParams()}); + } + + function getTableParams() { + return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable")); + } + + exports('materialOutList', {}); +}); diff --git a/erp-produce/src/main/resources/template/js/erpPick/returnMaterialPutList.js b/erp-produce/src/main/resources/template/js/erpPick/returnMaterialPutList.js new file mode 100644 index 000000000..7db561dd8 --- /dev/null +++ b/erp-produce/src/main/resources/template/js/erpPick/returnMaterialPutList.js @@ -0,0 +1,142 @@ + +layui.config({ + base: basePath, + version: skyeyeVersion +}).extend({ + window: 'js/winui.window' +}).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) { + winui.renderColor(); + var $ = layui.$, + form = layui.form, + table = layui.table; + var serviceClassName = sysServiceMation["returnMaterialPutList"]["key"]; + authBtn('1720705921518');//新增 + + //退料入库单 + table.render({ + id: 'messageTable', + elem: '#messageTable', + method: 'post', + url: sysMainMation.erpBasePath + 'queryReturnPutList', + where: getTableParams(), + even: true, + page: true, + limits: getLimits(), + limit: getLimit(), + cols: [[ + { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers', rowspan: '2' }, + { field: 'oddNumber', title: '单号', rowspan: '2', width: 200, align: 'center', templet: function (d) { + var str = '' + d.oddNumber + ''; + if (!isNull(d.fromId)) { + str += '[转]'; + } + return str; + }}, + { field: 'totalPrice', title: '合计金额', rowspan: '2', align: 'left', width: 120 }, + { field: 'operTime', title: '单据日期', rowspan: '2', align: 'center', width: 140 }, + { colspan: '2', title: '来源单据信息', align: 'center' }, + { field: 'processInstanceId', title: '流程ID', rowspan: '2', width: 100, templet: function (d) { + return '' + getNotUndefinedVal(d.processInstanceId) + ''; + }}, + { field: 'state', title: '状态', rowspan: '2', width: 90, templet: function (d) { + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("erpOrderStateEnum", 'id', d.state, 'name'); + }}, + { field: 'otherState', title: '入库状态', rowspan: '2', width: 90, templet: function (d) { + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("depotPutState", 'id', d.otherState, 'name'); + }}, + { field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], rowspan: '2', width: 120 }, + { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], rowspan: '2', align: 'center', width: 150 }, + { field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], rowspan: '2', align: 'left', width: 120 }, + { field: 'lastUpdateTime', title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], rowspan: '2', align: 'center', width: 150 }, + { title: systemLanguage["com.skyeye.operation"][languageType], rowspan: '2', fixed: 'right', align: 'center', width: 200, toolbar: '#tableBar'} + ], [ + { field: 'fromTypeId', title: '来源类型', width: 150, templet: function (d) { + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("returnPutFromType", 'id', d.fromTypeId, 'name'); + }}, + { field: 'fromId', title: '单据编号', width: 200, templet: function (d) { + return getNotUndefinedVal(d.fromMation?.oddNumber); + }} + ]], + done: function(json) { + matchingLanguage(); + initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入单号", function () { + table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()}); + }); + } + }); + + table.on('tool(messageTable)', function (obj) { + var data = obj.data; + var layEvent = obj.event; + if (layEvent === 'delete') { //删除 + erpOrderUtil.deleteOrderMation(data.id, serviceClassName, function() { + loadTable(); + }); + } else if (layEvent === 'details') { //详情 + details(data); + } else if (layEvent === 'edit') { //编辑 + edit(data); + } else if (layEvent === 'subApproval') { //提交审核 + erpOrderUtil.submitOrderMation(data.id, serviceClassName, function() { + loadTable(); + }); + } else if (layEvent === 'processDetails') { // 工作流流程详情查看 + activitiUtil.activitiDetails(data); + } else if (layEvent === 'revoke') { //撤销 + erpOrderUtil.revokeOrderMation(data.processInstanceId, serviceClassName, function() { + loadTable(); + }); + } + }); + + // 添加 + $("body").on("click", "#addBean", function() { + _openNewWindows({ + url: systemCommonUtil.getUrl('FP2024071200011', null), + title: systemLanguage["com.skyeye.addPageTitle"][languageType], + pageId: "returnMaterialPutListAdd", + area: ['90vw', '90vh'], + callBack: function (refreshCode) { + winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); + loadTable(); + }}); + }); + + // 编辑 + function edit(data) { + _openNewWindows({ + url: systemCommonUtil.getUrl('FP2024071200012&id=' + data.id, null), + title: systemLanguage["com.skyeye.editPageTitle"][languageType], + pageId: "returnMaterialPutListEdit", + area: ['90vw', '90vh'], + callBack: function (refreshCode) { + winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); + loadTable(); + }}); + } + + // 详情 + function details(data) { + _openNewWindows({ + url: systemCommonUtil.getUrl('FP2024070100003&id=' + data.id, null), + title: systemLanguage["com.skyeye.detailsPageTitle"][languageType], + pageId: "returnMaterialPutListDetails", + area: ['90vw', '90vh'], + callBack: function (refreshCode) { + }}); + } + + form.render(); + $("body").on("click", "#reloadTable", function() { + loadTable(); + }); + function loadTable() { + table.reloadData("messageTable", {where: getTableParams()}); + } + + function getTableParams() { + return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable")); + } + + exports('returnMaterialPutList', {}); +}); diff --git a/erp-produce/src/main/resources/template/js/erpPick/supplementOutList.js b/erp-produce/src/main/resources/template/js/erpPick/supplementOutList.js new file mode 100644 index 000000000..05069d828 --- /dev/null +++ b/erp-produce/src/main/resources/template/js/erpPick/supplementOutList.js @@ -0,0 +1,141 @@ + +layui.config({ + base: basePath, + version: skyeyeVersion +}).extend({ + window: 'js/winui.window' +}).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) { + winui.renderColor(); + var $ = layui.$, + form = layui.form, + table = layui.table; + var serviceClassName = sysServiceMation["supplementOutList"]["key"]; + authBtn('1720705670125');//新增 + //补料出库单 + table.render({ + id: 'messageTable', + elem: '#messageTable', + method: 'post', + url: sysMainMation.erpBasePath + 'queryPatchOutLetList', + where: getTableParams(), + even: true, + page: true, + limits: getLimits(), + limit: getLimit(), + cols: [[ + { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers', rowspan: '2' }, + { field: 'oddNumber', title: '单号', rowspan: '2', width: 200, align: 'center', templet: function (d) { + var str = '' + d.oddNumber + ''; + if (!isNull(d.fromId)) { + str += '[转]'; + } + return str; + }}, + { field: 'totalPrice', title: '合计金额', rowspan: '2', align: 'left', width: 120 }, + { field: 'operTime', title: '单据日期', rowspan: '2', align: 'center', width: 140 }, + { colspan: '2', title: '来源单据信息', align: 'center' }, + { field: 'processInstanceId', title: '流程ID', rowspan: '2', width: 100, templet: function (d) { + return '' + getNotUndefinedVal(d.processInstanceId) + ''; + }}, + { field: 'state', title: '状态', rowspan: '2', width: 90, templet: function (d) { + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("erpOrderStateEnum", 'id', d.state, 'name'); + }}, + { field: 'otherState', title: '出库状态', rowspan: '2', width: 90, templet: function (d) { + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("depotOutState", 'id', d.otherState, 'name'); + }}, + { field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], rowspan: '2', width: 120 }, + { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], rowspan: '2', align: 'center', width: 150 }, + { field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], rowspan: '2', align: 'left', width: 120 }, + { field: 'lastUpdateTime', title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], rowspan: '2', align: 'center', width: 150 }, + { title: systemLanguage["com.skyeye.operation"][languageType], rowspan: '2', fixed: 'right', align: 'center', width: 200, toolbar: '#tableBar'} + ], [ + { field: 'fromTypeId', title: '来源类型', width: 150, templet: function (d) { + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("patchOutLetFromType", 'id', d.fromTypeId, 'name'); + }}, + { field: 'fromId', title: '单据编号', width: 200, templet: function (d) { + return getNotUndefinedVal(d.fromMation?.oddNumber); + }} + ]], + done: function(json) { + matchingLanguage(); + initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入单号", function () { + table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()}); + }); + } + }); + + table.on('tool(messageTable)', function (obj) { + var data = obj.data; + var layEvent = obj.event; + if (layEvent === 'delete') { //删除 + erpOrderUtil.deleteOrderMation(data.id, serviceClassName, function() { + loadTable(); + }); + } else if (layEvent === 'details') { //详情 + details(data); + } else if (layEvent === 'edit') { //编辑 + edit(data); + } else if (layEvent === 'subApproval') { //提交审核 + erpOrderUtil.submitOrderMation(data.id, serviceClassName, function() { + loadTable(); + }); + } else if (layEvent === 'processDetails') { // 工作流流程详情查看 + activitiUtil.activitiDetails(data); + } else if (layEvent === 'revoke') { //撤销 + erpOrderUtil.revokeOrderMation(data.processInstanceId, serviceClassName, function() { + loadTable(); + }); + } + }); + + // 添加 + $("body").on("click", "#addBean", function() { + _openNewWindows({ + url: systemCommonUtil.getUrl('FP2024071200001', null), + title: systemLanguage["com.skyeye.addPageTitle"][languageType], + pageId: "supplementOutListAdd", + area: ['90vw', '90vh'], + callBack: function (refreshCode) { + winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); + loadTable(); + }}); + }); + + // 编辑 + function edit(data) { + _openNewWindows({ + url: systemCommonUtil.getUrl('FP2024071200002&id=' + data.id, null), + title: systemLanguage["com.skyeye.editPageTitle"][languageType], + pageId: "supplementOutListEdit", + area: ['90vw', '90vh'], + callBack: function (refreshCode) { + winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); + loadTable(); + }}); + } + + // 详情 + function details(data) { + _openNewWindows({ + url: systemCommonUtil.getUrl('FP2024070100002&id=' + data.id, null), + title: systemLanguage["com.skyeye.detailsPageTitle"][languageType], + pageId: "supplementOutListDetails", + area: ['90vw', '90vh'], + callBack: function (refreshCode) { + }}); + } + + form.render(); + $("body").on("click", "#reloadTable", function() { + loadTable(); + }); + function loadTable() { + table.reloadData("messageTable", {where: getTableParams()}); + } + + function getTableParams() { + return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable")); + } + + exports('materialOutList', {}); +}); diff --git a/erp-produce/src/main/resources/template/js/erpPick/turnPatchMaterialToTurnOut.js b/erp-produce/src/main/resources/template/js/erpPick/turnPatchMaterialToTurnOut.js new file mode 100644 index 000000000..47c0aeaee --- /dev/null +++ b/erp-produce/src/main/resources/template/js/erpPick/turnPatchMaterialToTurnOut.js @@ -0,0 +1,59 @@ + +// 以下两个参数开启团队权限时有值 +var objectId = '', objectKey = ''; +// 根据以下两个参数判断：工作流的判断是否要根据serviceClassName的判断 +var serviceClassName; + +layui.config({ + base: basePath, + version: skyeyeVersion +}).extend({ + window: 'js/winui.window' +}).define(['window', 'table', 'jquery'], function (exports) { + winui.renderColor(); + var index = parent.layer.getFrameIndex(window.name); + var $ = layui.$; + var id = GetUrlParam("id"); + + // 补料单转补料出库单 + AjaxPostUtil.request({url: sysMainMation.erpBasePath + "queryPatchMaterialTransById", params: {id: id}, type: 'json', method: 'GET', callback: function (json) { + let data = json.bean; + data.erpOrderItemList=data.pickChildList + $.each(data.erpOrderItemList, function(index, item){ + item.operNumber=item.needNum + item.unitPrice=item.normsMation.estimatePurchasePrice + item.taxRate=0 + }); + console.log(data.erpOrderItemList) + // 补料出库的【编辑布局】 + dsFormUtil.initEditPageForStatic('content', 'FP2024071200002', data, { + savePreParams: function (params) { + }, + saveData: function (params) { + // 保存数据 + AjaxPostUtil.request({url: sysMainMation.erpBasePath + "insertPatchMaterialToTurnOut", params: params, type: 'json', method: "POST", callback: function(json) { + parent.layer.close(index); + parent.refreshCode = '0'; + }}); + }, + loadComponentCallback: function () { + $("select[attrkey='departmentId']").prop('disabled', true); + $("select[attrkey='farmId']").prop('disabled', true); + $("div[controlType='patchOutLetFromType']").remove(); + }, + tableAddRowCallback: function (tableId) { + $("#addRow" + tableId).remove(); + $("div[controlType='simpleTable']").find(".unitPrice").prop('disabled', true); + $("div[controlType='simpleTable']").find(".amountOfMoney").prop('disabled', true); + $("div[controlType='simpleTable']").find(".taxRate").prop('disabled', true); + $("div[controlType='simpleTable']").find(".taxMoney").prop('disabled', true); + $("div[controlType='simpleTable']").find(".taxUnitPrice").prop('disabled', true); + $("div[controlType='simpleTable']").find(".taxLastMoney").prop('disabled', true); + $("div[controlType='simpleTable']").find(".chooseProductBtn").prop('disabled', true); + $("div[controlType='simpleTable']").find(".normsId").prop('disabled', true); + $("div[controlType='simpleTable']").find(".warehouse").prop('disabled', true); + } + }); + }}); + +}); \ No newline at end of file diff --git a/erp-produce/src/main/resources/template/js/erpPick/turnRequisitionMaterialToOut.js b/erp-produce/src/main/resources/template/js/erpPick/turnRequisitionMaterialToOut.js new file mode 100644 index 000000000..28f2b363d --- /dev/null +++ b/erp-produce/src/main/resources/template/js/erpPick/turnRequisitionMaterialToOut.js @@ -0,0 +1,59 @@ + +// 以下两个参数开启团队权限时有值 +var objectId = '', objectKey = ''; +// 根据以下两个参数判断：工作流的判断是否要根据serviceClassName的判断 +var serviceClassName; + +layui.config({ + base: basePath, + version: skyeyeVersion +}).extend({ + window: 'js/winui.window' +}).define(['window', 'table', 'jquery'], function (exports) { + winui.renderColor(); + var index = parent.layer.getFrameIndex(window.name); + var $ = layui.$; + var id = GetUrlParam("id"); + + // 领料单转领料出库单 + AjaxPostUtil.request({url: sysMainMation.erpBasePath + "queryRequisitionMaterialTransById", params: {id: id}, type: 'json', method: 'GET', callback: function (json) { + let data = json.bean; + data.erpOrderItemList=data.pickChildList + $.each(data.erpOrderItemList, function(index, item){ + item.operNumber=item.needNum + item.unitPrice=item.normsMation.estimatePurchasePrice + item.taxRate=0 + }); + console.log(data.erpOrderItemList) + // 领料出库的【编辑布局】 + dsFormUtil.initEditPageForStatic('content', 'FP2024071200005', data, { + savePreParams: function (params) { + }, + saveData: function (params) { + // 保存数据 + AjaxPostUtil.request({url: sysMainMation.erpBasePath + "insertRequisitionMaterialToTurnOut", params: params, type: 'json', method: "POST", callback: function(json) { + parent.layer.close(index); + parent.refreshCode = '0'; + }}); + }, + loadComponentCallback: function () { + $("select[attrkey='departmentId']").prop('disabled', true); + $("select[attrkey='farmId']").prop('disabled', true); + $("div[controlType='requisitionOutLetFromType']").remove(); + }, + tableAddRowCallback: function (tableId) { + $("#addRow" + tableId).remove(); + $("div[controlType='simpleTable']").find(".unitPrice").prop('disabled', true); + $("div[controlType='simpleTable']").find(".amountOfMoney").prop('disabled', true); + $("div[controlType='simpleTable']").find(".taxRate").prop('disabled', true); + $("div[controlType='simpleTable']").find(".taxMoney").prop('disabled', true); + $("div[controlType='simpleTable']").find(".taxUnitPrice").prop('disabled', true); + $("div[controlType='simpleTable']").find(".taxLastMoney").prop('disabled', true); + $("div[controlType='simpleTable']").find(".chooseProductBtn").prop('disabled', true); + $("div[controlType='simpleTable']").find(".normsId").prop('disabled', true); + $("div[controlType='simpleTable']").find(".warehouse").prop('disabled', true); + } + }); + }}); + +}); \ No newline at end of file diff --git a/erp-produce/src/main/resources/template/tpl/erpPick/erpPatchPickList.html b/erp-produce/src/main/resources/template/tpl/erpPick/erpPatchPickList.html index f5f71e831..34a6f045b 100644 --- a/erp-produce/src/main/resources/template/tpl/erpPick/erpPatchPickList.html +++ b/erp-produce/src/main/resources/template/tpl/erpPick/erpPatchPickList.html @@ -34,6 +34,13 @@ 撤销 {{# } }} {{# } }} + {{# if (d.state == 'pass') { }} + {{# if (d.otherState == 1 ||d.otherState == 2) { }} + {{# if (auth('1720843520948')) { }} + 转补料出库 + {{# } }} + {{# } }} + {{# } }} diff --git a/erp-produce/src/main/resources/template/tpl/erpPick/erpRequisitionPickList.html b/erp-produce/src/main/resources/template/tpl/erpPick/erpRequisitionPickList.html index 9d34d535c..13a3ab3d8 100644 --- a/erp-produce/src/main/resources/template/tpl/erpPick/erpRequisitionPickList.html +++ b/erp-produce/src/main/resources/template/tpl/erpPick/erpRequisitionPickList.html @@ -34,6 +34,13 @@ 撤销 {{# } }} {{# } }} + {{# if (d.state == 'pass') { }} + {{# if (d.otherState == 1 ||d.otherState == 2) { }} + {{# if (auth('1720789496468')) { }} + 转领料出库 + {{# } }} + {{# } }} + {{# } }} diff --git a/erp-produce/src/main/resources/template/tpl/erpPick/materialOutList.html b/erp-produce/src/main/resources/template/tpl/erpPick/materialOutList.html new file mode 100644 index 000000000..235c0cfce --- /dev/null +++ b/erp-produce/src/main/resources/template/tpl/erpPick/materialOutList.html @@ -0,0 +1,43 @@ + + + + + + + + + +
+
+ + +
+
+
+
+ +
+ + + + + \ No newline at end of file diff --git a/erp-produce/src/main/resources/template/tpl/erpPick/returnMaterialPutList.html b/erp-produce/src/main/resources/template/tpl/erpPick/returnMaterialPutList.html new file mode 100644 index 000000000..16b6a15fa --- /dev/null +++ b/erp-produce/src/main/resources/template/tpl/erpPick/returnMaterialPutList.html @@ -0,0 +1,43 @@ + + + + + + + + + +
+
+ + +
+
+
+
+ +
+ + + + + \ No newline at end of file diff --git a/erp-produce/src/main/resources/template/tpl/erpPick/supplementOutList.html b/erp-produce/src/main/resources/template/tpl/erpPick/supplementOutList.html new file mode 100644 index 000000000..9d145f83d --- /dev/null +++ b/erp-produce/src/main/resources/template/tpl/erpPick/supplementOutList.html @@ -0,0 +1,43 @@ + + + + + + + + + +
+
+ + +
+
+
+
+ +
+ + + + + \ No newline at end of file diff --git a/erp-produce/src/main/resources/template/tpl/erpPick/turnPatchMaterialToTurnOut.html b/erp-produce/src/main/resources/template/tpl/erpPick/turnPatchMaterialToTurnOut.html new file mode 100644 index 000000000..9e9a93dad --- /dev/null +++ b/erp-produce/src/main/resources/template/tpl/erpPick/turnPatchMaterialToTurnOut.html @@ -0,0 +1,29 @@ + + + + + + + + + +
+
+
+
+
+ + ` + +
+
+
+
+ + + + + + \ No newline at end of file diff --git a/erp-produce/src/main/resources/template/tpl/erpPick/turnRequisitionMaterialToOut.html b/erp-produce/src/main/resources/template/tpl/erpPick/turnRequisitionMaterialToOut.html new file mode 100644 index 000000000..4ba001c0d --- /dev/null +++ b/erp-produce/src/main/resources/template/tpl/erpPick/turnRequisitionMaterialToOut.html @@ -0,0 +1,29 @@ + + + + + + + + + +
+
+
+
+
+ + ` + +
+
+
+
+ + + + + + \ No newline at end of file diff --git a/erp/src/main/resources/template/js/purchaseQualityInspection/qualityInspectionToPut.js b/erp/src/main/resources/template/js/purchaseQualityInspection/qualityInspectionToPut.js index bab241a78..22b33f65e 100644 --- a/erp/src/main/resources/template/js/purchaseQualityInspection/qualityInspectionToPut.js +++ b/erp/src/main/resources/template/js/purchaseQualityInspection/qualityInspectionToPut.js @@ -19,7 +19,6 @@ layui.config({ AjaxPostUtil.request({url: sysMainMation.erpBasePath + "queryQualityInspectionTransById", params: {id: id}, type: 'json', method: 'GET', callback: function (json) { let data = json.bean; data.erpOrderItemList=data.qualityInspectionItemList - console.log(data) // 采购入库的【编辑布局】 dsFormUtil.initEditPageForStatic('content', 'FP2023042300002', data, { savePreParams: function (params) { diff --git a/erp/src/main/resources/template/js/purchaseRequest/requestToContract.js b/erp/src/main/resources/template/js/purchaseRequest/requestToContract.js index 3b53da26e..d44b3dd11 100644 --- a/erp/src/main/resources/template/js/purchaseRequest/requestToContract.js +++ b/erp/src/main/resources/template/js/purchaseRequest/requestToContract.js @@ -250,7 +250,6 @@ layui.config({ // 获取所选供应商的联系人 AjaxPostUtil.request({url: sysMainMation.reqBasePath + "queryContactsListByObject", params: {objectId:supplierMation.id}, type: 'json', method: "GET", callback: function(json) { let contactsList = json.rows; - console.log(contactsId); $("#" + contactsId).html(getDataUseHandlebars(selOption, {rows: contactsList})); form.render(); }}); diff --git a/web/src/main/resources/template/json/skyeyeClassEnum.json b/web/src/main/resources/template/json/skyeyeClassEnum.json index cdf7a465a..4dd8ff8b8 100644 --- a/web/src/main/resources/template/json/skyeyeClassEnum.json +++ b/web/src/main/resources/template/json/skyeyeClassEnum.json @@ -51,6 +51,7 @@ "supplierContractAuthEnum": {"name": "供应商合同权限", "className": "skyeye-erp#com.skyeye.contract.classenum.SupplierContractAuthEnum", "pageUrl": "../../tpl/supplierContract/supplierContractList.html"}, "machinStateEnum": {"name": "加工单状态", "className": "skyeye-erp#com.skyeye.machin.classenum.MachinStateEnum"}, "machinPickStateEnum": {"name": "加工单领料状态", "className": "skyeye-erp#com.skyeye.machin.classenum.MachinPickStateEnum"}, + "outLetState": {"name": "领料/补料单出库状态", "className": "skyeye-erp#com.skyeye.pick.classenum.OutLetState"}, "machinChildStateEnum": {"name": "工序验收单状态", "className": "skyeye-erp#com.skyeye.machin.classenum.MachinChildStateEnum"}, "materialNormsCodeInDepot": {"name": "商品规格一物一码库存状态", "className": "skyeye-erp#com.skyeye.material.classenum.MaterialNormsCodeInDepot"}, "orderItemQualityInspectionType": {"name": "ERP采购子单据质检类型", "className": "skyeye-erp#com.skyeye.business.classenum.OrderItemQualityInspectionType"}, @@ -58,8 +59,6 @@ "orderArrivalState": {"name": "采购订单到货状态", "className": "skyeye-erp#com.skyeye.purchase.classenum.OrderArrivalState"}, "holderNormsChildState": {"name": "关联的客户/供应商/会员购买或者出售的商品子信息状态", "className": "skyeye-erp#com.skyeye.holder.classenum.HolderNormsChildState"}, - "depotOutState": {"name": "仓库出库单状态", "className": "skyeye-erp#com.skyeye.depot.classenum.DepotOutState"}, - "purchaseOrderFromType": {"name": "采购订单来源单据类型", "className": "skyeye-erp#com.skyeye.purchase.classenum.PurchaseOrderFromType"}, "purchaseDeliveryFromType": {"name": "到货单来源单据类型", "className": "skyeye-erp#com.skyeye.purchase.classenum.PurchaseDeliveryFromType"}, "purchasePutFromType": {"name": "采购入库单来源单据类型", "className": "skyeye-erp#com.skyeye.purchase.classenum.PurchasePutFromType"}, diff --git a/web/src/main/resources/template/json/sysServiceMation.json b/web/src/main/resources/template/json/sysServiceMation.json index 515fdd383..4e340860d 100644 --- a/web/src/main/resources/template/json/sysServiceMation.json +++ b/web/src/main/resources/template/json/sysServiceMation.json @@ -23,8 +23,11 @@ "machinChild": {"name": "工序验收单", "key": "com.skyeye.machin.service.impl.ErpProcessAcceptanceSheetServiceImpl"}, "productionHead": {"name": "生产计划单", "key": "com.skyeye.production.service.impl.ErpProductionServiceImpl"}, "pickPicking": {"name": "领料单", "key": "com.skyeye.pick.service.impl.RequisitionMaterialServiceImpl"}, + "materialOutList": {"name": "领料出库单", "key": "com.skyeye.pick.service.impl.RequisitionOutLetServiceImpl"}, "pickReplenishment": {"name": "补料单", "key": "com.skyeye.pick.service.impl.PatchMaterialServiceImpl"}, + "supplementOutList": {"name": "补料出库单", "key": "com.skyeye.pick.service.impl.PatchOutLetServiceImpl"}, "pickReturn": {"name": "退料单", "key": "com.skyeye.pick.service.impl.ReturnMaterialServiceImpl"}, + "returnMaterialPutList": {"name": "退料入库单", "key": "com.skyeye.pick.service.impl.ReturnPutServiceImpl"}, "proworkLoad": {"name": "项目工作量审核", "key": "com.skyeye.service.impl.ProWorkloadServiceImpl"}, "proTask": {"name": "项目任务审核", "key": "com.skyeye.service.impl.ProTaskServiceImpl"}, -- GitLab