diff --git a/yxt-as-ui/src/api/statement/purchasereport.js b/yxt-as-ui/src/api/statement/purchasereport.js index 52abec7a0a..c128eac5a9 100644 --- a/yxt-as-ui/src/api/statement/purchasereport.js +++ b/yxt-as-ui/src/api/statement/purchasereport.js @@ -4,7 +4,7 @@ export default { // 查询分页列表 -- 采购明细报表 purDetailReForm: function(params) { return request({ - url: '/pms/apiadmin/pms/pmspurchasebill/purDetailReForm', + url: '/pms/apiadmin/pms/pmspurchasebilldetail/purDetailReForm', method: 'post', data: params, headers: { 'Content-Type': 'application/json' } @@ -13,7 +13,7 @@ export default { // 查询分页列表 -- 采购汇总报表 purSumReForm: function(params) { return request({ - url: '/pms/apiadmin/pms/pmspurchasebill/purSumReForm', + url: '/pms/apiadmin/pms/pmspurchasebilldetail/purSumReForm', method: 'post', data: params, headers: { 'Content-Type': 'application/json' } diff --git a/yxt-as-ui/src/api/storage/adjustment.js b/yxt-as-ui/src/api/storage/adjustment.js index f7837ff9f5..e7cdeeefc5 100644 --- a/yxt-as-ui/src/api/storage/adjustment.js +++ b/yxt-as-ui/src/api/storage/adjustment.js @@ -51,4 +51,66 @@ export default { }) }, + // 流程审批（同意） + complete: function(params) { + return request({ + url: '/as/v1/smspricestrategybill/complete', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 流程审批（加签） + delegate: function(params) { + return request({ + url: '/as/v1/smspricestrategybill/delegate', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 流程审批（驳回） + reject: function(params) { + return request({ + url: '/as/v1/smspricestrategybill/reject', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 流程审批（终止） + breakProcess: function(params) { + return request({ + url: '/as/v1/smspricestrategybill/breakProcess', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 流程审批（撤回） + revokeProcess: function(params) { + return request({ + url: '/as/v1/smspricestrategybill/revokeProcess', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 审批流程（同意）获取下一环节 + getNextNodesForSubmit: function(data) { + return request({ + url: '/as/v1/smspricestrategybill/getNextNodesForSubmit', + method: 'get', + params: data + }) + }, + // 审批流程（驳回）获取上一环节 + getPreviousNodesForReject: function(data) { + return request({ + url: '/as/v1/smspricestrategybill/getPreviousNodesForReject', + method: 'get', + params: data + }) + } + } diff --git a/yxt-as-ui/src/api/storage/manufacturerconfirm.js b/yxt-as-ui/src/api/storage/manufacturerconfirm.js new file mode 100644 index 0000000000..49e0a895b6 --- /dev/null +++ b/yxt-as-ui/src/api/storage/manufacturerconfirm.js @@ -0,0 +1,109 @@ +import request from '@/utils/request' + +export default { + + // 查询分页列表 + listPage: function(params) { + return request({ + url: '/as/v1/asoldpartreturnapply/confirmListPage', + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + + // 获取确认结果详情 + saveConfirmResult: function(data) { + return request({ + url: '/as/v1/asoldpartreturnconfirm/save', + method: 'post', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }); + }, + + + // 获取确认结果详情 + fetchDetailsByMainSid: function(data) { + return request({ + url: '/as/v1/asoldpartreturnconfirm/fetchDetailsByMainSid/' + data, + method: 'get' + }); + }, + + + + // 初始化 + init: function(data) { + return request({ + url: '/as/v1/asoldpartreturnapply/fetchDetailsBySid/' + data, + method: 'get' + }); + }, + + + // 新增、保存 + save: function(data) { + return request({ + url: '/as/v1/asoldpartreturnapply/save', + method: 'post', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }); + }, + + // 提交 + submit: function(data) { + return request({ + url: '/as/v1/asoldpartreturnapply/submit', + method: 'post', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }); + }, + + + deleteBySids: function(data) { + return request({ + url: '/as/v1/asoldpartreturnapply/delBySids', + method: 'DELETE', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + + // 查询分页列表 + getGoodsListPage: function(params) { + return request({ + url: '/wms/apiadmin/WmsOutBill/getInventoryList', + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + + // 下载模板 + downloadExcel: function() { + return request({ + url: '/as/v1/asoldpartreturnapply/downloadModPriceExcel', + method: 'post', + responseType: 'blob', // 表明返回服务器返回的数据类型 + headers: { + 'Content-Type': 'application/json' + } + }) + }, + +} diff --git a/yxt-as-ui/src/api/storage/oldPartsFactory.js b/yxt-as-ui/src/api/storage/oldPartsFactory.js index 8e1ba038e0..56ece37555 100644 --- a/yxt-as-ui/src/api/storage/oldPartsFactory.js +++ b/yxt-as-ui/src/api/storage/oldPartsFactory.js @@ -92,4 +92,79 @@ export default { }) }, + + + + // 流程审批（同意） + complete: function(params) { + return request({ + url: '/as/v1/asoldpartreturnapply/complete', + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + // 流程审批（加签） + delegate: function(params) { + return request({ + url: '/as/v1/asoldpartreturnapply/delegate', + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + // 流程审批（驳回） + reject: function(params) { + return request({ + url: '/as/v1/asoldpartreturnapply/reject', + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + // 流程审批（终止） + breakProcess: function(params) { + return request({ + url: '/as/v1/asoldpartreturnapply/breakProcess', + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + // 流程审批（撤回） + revokeProcess: function(params) { + return request({ + url: '/as/v1/asoldpartreturnapply/revokeProcess', + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + // 审批流程（同意）获取下一环节 + getNextNodesForSubmit: function(data) { + return request({ + url: '/as/v1/asoldpartreturnapply/getNextNodesForSubmit', + method: 'get', + params: data + }) + }, + // 审批流程（驳回）获取上一环节 + getPreviousNodesForReject: function(data) { + return request({ + url: '/as/v1/asoldpartreturnapply/getPreviousNodesForReject', + method: 'get', + params: data + }) + }, + } diff --git a/yxt-as-ui/src/router/index.js b/yxt-as-ui/src/router/index.js index d158918c27..0f1a6028bc 100644 --- a/yxt-as-ui/src/router/index.js +++ b/yxt-as-ui/src/router/index.js @@ -767,6 +767,27 @@ export const constantRoutes = [{ import('@/views/workFlow/shangpintuihuoFlow/merchandisereturnYiBan.vue'), name: 'MerchandiseReturnYiBan' }, + // 厂家回收--编辑 + { + path: '/oldPartsFactoryFlow/oldPartsFactoryEdit', + component: () => + import('@/views/workFlow/oldPartsFactoryFlow/oldPartsFactoryEdit.vue'), + name: 'OldPartsFactoryEdit' + }, + // 厂家回收--待办 + { + path: '/oldPartsFactoryFlow/oldPartsFactoryDaiBan', + component: () => + import('@/views/workFlow/oldPartsFactoryFlow/oldPartsFactoryDaiBan.vue'), + name: 'OldPartsFactoryDaiBan' + }, + // 厂家回收--已办 + { + path: '/oldPartsFactoryFlow/oldPartsFactoryYiBan', + component: () => + import('@/views/workFlow/oldPartsFactoryFlow/oldPartsFactoryYiBan.vue'), + name: 'OldPartsFactoryYiBan' + }, // 404 page must be placed at the end !!! // { path: '*', redirect: '/404', hidden: true } ] diff --git a/yxt-as-ui/src/views/operation/merchandisereturn/merchandisereturnInfo.vue b/yxt-as-ui/src/views/operation/merchandisereturn/merchandisereturnInfo.vue index 76ec0c0e1d..7690994369 100644 --- a/yxt-as-ui/src/views/operation/merchandisereturn/merchandisereturnInfo.vue +++ b/yxt-as-ui/src/views/operation/merchandisereturn/merchandisereturnInfo.vue @@ -78,53 +78,6 @@ {{ formobj.customerOrg }} - - -
合计金额：
- = 工时费： + 材料费： + 附加费： + 税额： - - - - -
应收金额：
- = 合计优惠： + 已收金额： + 欠款： + 退款抵欠款： - - -
-
服务项目
- - - - - - - - - - - - - - - - -
-
商品列表
- - - - - - - - - - - - - - -
退货商品列表
diff --git a/yxt-as-ui/src/views/storage/manufacturerconfirm/index.vue b/yxt-as-ui/src/views/storage/manufacturerconfirm/index.vue index 02409e35d2..b35e6a2a05 100644 --- a/yxt-as-ui/src/views/storage/manufacturerconfirm/index.vue +++ b/yxt-as-ui/src/views/storage/manufacturerconfirm/index.vue @@ -1,8 +1,535 @@ + import req from '@/api/storage/manufacturerconfirm.js' + import ButtonBar from '@/components/ButtonBar' + import Pagination from '@/components/pagination' + import pageye from '@/components/pagination/pageye' + // import divAdd from './manufacturerconfirmAdd.vue' + import divInfo from './manufacturerconfirmInfo.vue' + import uploadImg from '@/components/uploadFile/uploadImg' + export default { + + components: { + ButtonBar, + Pagination, + pageye, + // divAdd, + divInfo, + uploadImg + }, + data() { + return { + dialogVisible: false, + dialogVisible2: false, + dialogVisible3: false, + fileList: [], + orderInfo: { + filePaths: [] + }, + btndisabled: false, + viewState: 1, // 1、列表 2、添加 3、修改 4、查看 + isSearchShow: false, + searchxianshitit: '显示查询条件', + tableLoading: false, + dataList: [], + btnList: [{ + type: 'primary', + size: 'small', + icon: 'plus', + btnKey: 'toAdd', + btnLabel: '厂家确认' + }, + + { + type: 'info', + size: 'small', + icon: 'cross', + btnKey: 'doClose', + btnLabel: '关闭' + } + ], + queryParams: { + current: 1, + size: 10, + total: 0, + params: { + name: '' + } + }, + sids: [], + selectionList: [], + confirmResultsList: [{ + name: "一致", + sid: "1" + }, + { + name: "不一致", + sid: "2" + } + ], + pathList: [], + imgList: [] + } + }, + mounted() { + this.$refs['btnbar'].setButtonList(this.btnList) + }, + created() { + this.loadList() + }, + methods: { + handleClose() { + this.dialogVisible = false + }, + handleClose2() { + this.dialogVisible2 = false + }, + handleClose3() { + this.dialogVisible3 = false + }, + showAdjunct(paths) { + this.fileList = paths + this.dialogVisible = true + }, + saveResult() { + console.log("saveResult", this.orderInfo); + + req.saveConfirmResult(this.orderInfo).then((resp) => { + + + this.dialogVisible3 = false + this.orderInfo = { + filePaths: [] + } + this.loadList() + }).catch(() => { + + }) + + }, + showResult(row) { + + if (row.confirmResult == '未确认') { + this.$message({ + type: 'warning', + showClose: true, + message: '厂家暂未确认' + }) + } else { + + req.fetchDetailsByMainSid(row.sid).then((resp) => { - \ No newline at end of file + console.log("fetchDetailsByMainSid", resp); + + this.orderInfo = resp.data + + this.dialogVisible2 = true + + }).catch(() => { + + }) + } + + + }, + selectionLineChangeHandle(val) { + console.log("val", val); + + this.selectionList = val + const aa = [] + val.forEach(element => { + aa.push(element.sid) + }) + this.sids = aa + + }, + // 搜索条件效果 + clicksearchShow() { + this.isSearchShow = !this.isSearchShow + if (this.isSearchShow) { + this.searchxianshitit = '隐藏查询条件' + } else { + this.searchxianshitit = '显示查询条件' + } + }, + btnHandle(btnKey) { + switch (btnKey) { + case 'doDel': + this.doDel() + break + case 'toAdd': + this.toAdd() + break + case 'doClose': + this.doClose() + break + default: + break + } + }, + loadList() { + this.tableLoading = true + this.queryParams.params.userSid = window.sessionStorage.getItem('userSid') + this.queryParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath') + this.queryParams.params.menuUrl = this.$route.path + req.listPage(this.queryParams).then((resp) => { + this.tableLoading = false + if (resp.success) { + const data = resp.data + this.queryParams.total = data.total + this.dataList = data.records + } else { + // 根据resp.code进行异常情况处理 + this.dataList = [] + this.queryParams.total = 0 + } + }).catch(() => { + this.tableLoading = false + }) + }, + + // 序号 + indexMethod(index) { + var pagestart = (this.queryParams.current - 1) * this.queryParams.size + var pageindex = index + 1 + pagestart + return pageindex + }, + dosearch() { + this.queryParams.current = 1 + this.loadList() + }, + resetQuery() { + this.queryParams = { + current: 1, + size: 10, + total: 0, + params: { + name: '' + } + } + this.loadList() + }, + doDel() { + + if (this.sids.length > 0) { + const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?' + this.$confirm(tip, '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + const loading = this.$loading({ + lock: true, + text: 'Loading', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }) + req.deleteBySids(this.sids).then((resp) => { + loading.close() + if (resp.success) { + this.$message({ + type: 'success', + message: resp.msg, + showClose: true + }) + this.loadList() + } else { + // 根据resp.code进行异常情况处理 + } + }).catch(e => { + loading.close() + }) + }).catch(() => {}) + } else { + this.$message({ + type: 'warning', + showClose: true, + message: '请至少选择一条记录进行删除操作' + }) + } + }, + + toAdd() { + + // this.viewState = 2 + // this.$refs['divadd'].showAdd() + + + if (this.sids.length == 1) { + this.dialogVisible3 = true + + this.orderInfo.mainSid = this.sids[0] + + } else { + this.$message({ + type: 'warning', + showClose: true, + message: '请选择一条记录' + }) + } + + }, + + toEdit(row) { + + this.viewState = 3 + this.$refs['divadd'].showEdit(row) + + }, + + doClose() { + this.$store.dispatch('tagsView/delView', this.$route) + this.$router.go(-1) + }, + toRelevancy(row) { + this.viewState = 4 + this.$refs['divinfo'].showEdit(row) + }, + + resetState() { + this.viewState = 1 + }, + backData(value) { + console.log('backData》》》》', value) + console.log('imgList', this.imgList) + + for (var i = 0; i < this.imgList.length; i++) { + this.orderInfo.filePaths.push(this.imgList[i].url) + } + + + } + + } + } + + diff --git a/yxt-as-ui/src/views/storage/manufacturerconfirm/manufacturerconfirmAdd.vue b/yxt-as-ui/src/views/storage/manufacturerconfirm/manufacturerconfirmAdd.vue new file mode 100644 index 0000000000..603a064d66 --- /dev/null +++ b/yxt-as-ui/src/views/storage/manufacturerconfirm/manufacturerconfirmAdd.vue @@ -0,0 +1,575 @@ + + + + diff --git a/yxt-as-ui/src/views/storage/manufacturerconfirm/manufacturerconfirmInfo.vue b/yxt-as-ui/src/views/storage/manufacturerconfirm/manufacturerconfirmInfo.vue new file mode 100644 index 0000000000..d43e92ec49 --- /dev/null +++ b/yxt-as-ui/src/views/storage/manufacturerconfirm/manufacturerconfirmInfo.vue @@ -0,0 +1,172 @@ + + + + diff --git a/yxt-as-ui/src/views/storage/oldPartsCope/oldPartsCopeAdd.vue b/yxt-as-ui/src/views/storage/oldPartsCope/oldPartsCopeAdd.vue index 5a0d91780f..efba065770 100644 --- a/yxt-as-ui/src/views/storage/oldPartsCope/oldPartsCopeAdd.vue +++ b/yxt-as-ui/src/views/storage/oldPartsCope/oldPartsCopeAdd.vue @@ -237,10 +237,10 @@ "remarks": "", "createBySid": window.sessionStorage.getItem('userSid'), "createByName": window.sessionStorage.getItem('name'), - "deptSid": window.sessionStorage.getItem('defaultOrgPathName').substring(window - .sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1), - "deptName": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage - .getItem('defaultOrgPath').lastIndexOf('/') + 1), + "deptSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage + .getItem('defaultOrgPath').lastIndexOf('/') + 1), + "deptName": window.sessionStorage.getItem('defaultOrgPathName').substring(window + .sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1), "createTime": "", "billNo": "", "filePaths": [], @@ -517,10 +517,10 @@ "remarks": "", "createBySid": window.sessionStorage.getItem('userSid'), "createByName": window.sessionStorage.getItem('name'), - "deptSid": window.sessionStorage.getItem('defaultOrgPathName').substring(window - .sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1), - "deptName": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage - .getItem('defaultOrgPath').lastIndexOf('/') + 1), + "deptSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage + .getItem('defaultOrgPath').lastIndexOf('/') + 1), + "deptName": window.sessionStorage.getItem('defaultOrgPathName').substring(window + .sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1), "createTime": "", "billNo": "", "filePaths": [], diff --git a/yxt-as-ui/src/views/storage/oldPartsFactory/index.vue b/yxt-as-ui/src/views/storage/oldPartsFactory/index.vue index dd33af2822..68e66cba67 100644 --- a/yxt-as-ui/src/views/storage/oldPartsFactory/index.vue +++ b/yxt-as-ui/src/views/storage/oldPartsFactory/index.vue @@ -68,11 +68,11 @@ - - + + - + - + @@ -161,8 +161,8 @@ - + @@ -262,19 +262,29 @@ this.fileList = paths this.dialogVisible = true }, - showResult(sid) { + showResult(row) { - req.fetchDetailsByMainSid(sid).then((resp) => { - console.log("fetchDetailsByMainSid", resp); + if (row.confirmResult == '未确认') { + this.$message({ + type: 'warning', + showClose: true, + message: '厂家暂未确认' + }) + } else { + req.fetchDetailsByMainSid(row.sid).then((resp) => { - this.orderInfo = resp.data + console.log("fetchDetailsByMainSid", resp); - this.dialogVisible2 = true + this.orderInfo = resp.data - }).catch(() => { + this.dialogVisible2 = true + + }).catch(() => { + + }) + } - }) }, diff --git a/yxt-as-ui/src/views/storage/oldPartsFactory/oldPartsFactoryAdd.vue b/yxt-as-ui/src/views/storage/oldPartsFactory/oldPartsFactoryAdd.vue index 1b89836444..c4b7e33965 100644 --- a/yxt-as-ui/src/views/storage/oldPartsFactory/oldPartsFactoryAdd.vue +++ b/yxt-as-ui/src/views/storage/oldPartsFactory/oldPartsFactoryAdd.vue @@ -79,7 +79,7 @@
* 附件
+ :upload-data="{ type: '0001' }" @change="backData"/> @@ -204,10 +204,10 @@ "remarks": "", "createBySid": window.sessionStorage.getItem('userSid'), "createByName": window.sessionStorage.getItem('name'), - "deptSid": window.sessionStorage.getItem('defaultOrgPathName').substring(window - .sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1), - "deptName": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage + "deptSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage .getItem('defaultOrgPath').lastIndexOf('/') + 1), + "deptName": window.sessionStorage.getItem('defaultOrgPathName').substring(window + .sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1), "createTime": "", "billNo": "", "filePaths": [], @@ -413,10 +413,10 @@ "remarks": "", "createBySid": window.sessionStorage.getItem('userSid'), "createByName": window.sessionStorage.getItem('name'), - "deptSid": window.sessionStorage.getItem('defaultOrgPathName').substring(window - .sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1), - "deptName": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage - .getItem('defaultOrgPath').lastIndexOf('/') + 1), + "deptSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage + .getItem('defaultOrgPath').lastIndexOf('/') + 1), + "deptName": window.sessionStorage.getItem('defaultOrgPathName').substring(window + .sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1), "createTime": "", "billNo": "", "filePaths": [], diff --git a/yxt-as-ui/src/views/storage/oldPartsFactory/oldPartsFactoryInfo.vue b/yxt-as-ui/src/views/storage/oldPartsFactory/oldPartsFactoryInfo.vue index a1a2404ccc..4146338927 100644 --- a/yxt-as-ui/src/views/storage/oldPartsFactory/oldPartsFactoryInfo.vue +++ b/yxt-as-ui/src/views/storage/oldPartsFactory/oldPartsFactoryInfo.vue @@ -15,9 +15,9 @@
-
+ + + + + + *加签人员: + + + + + + + + + + + + + 当前环节: + + + {{ current.taskName }}->{{ nextNode.name }} + + + + + 意见: + + + + + +
+ 确 定 + 取 消 +
+ + +
+ + + + + diff --git a/yxt-as-ui/src/views/workFlow/oldPartsFactoryFlow/oldPartsFactoryEdit.vue b/yxt-as-ui/src/views/workFlow/oldPartsFactoryFlow/oldPartsFactoryEdit.vue new file mode 100644 index 0000000000..a6b3e4190a --- /dev/null +++ b/yxt-as-ui/src/views/workFlow/oldPartsFactoryFlow/oldPartsFactoryEdit.vue @@ -0,0 +1,211 @@ + + + + + diff --git a/yxt-as-ui/src/views/workFlow/oldPartsFactoryFlow/oldPartsFactoryYiBan.vue b/yxt-as-ui/src/views/workFlow/oldPartsFactoryFlow/oldPartsFactoryYiBan.vue new file mode 100644 index 0000000000..189743f1b6 --- /dev/null +++ b/yxt-as-ui/src/views/workFlow/oldPartsFactoryFlow/oldPartsFactoryYiBan.vue @@ -0,0 +1,215 @@ + + + + + diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnconfirm/AsOldpartreturnConfirmDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnconfirm/AsOldpartreturnConfirmDto.java index c5f71d1847..91bde34dd4 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnconfirm/AsOldpartreturnConfirmDto.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnconfirm/AsOldpartreturnConfirmDto.java @@ -54,6 +54,8 @@ public class AsOldpartreturnConfirmDto implements Dto { private String sid; // sid + @ApiModelProperty("备注") + private String remarks; @ApiModelProperty("主表sid") private String mainSid; // 主表sid @ApiModelProperty("返件数量确认(0一致,1不一致)") diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyMapper.java index b6824f0f4c..e50e7a5b34 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyMapper.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyMapper.java @@ -55,11 +55,6 @@ import java.util.Map; public interface AsOldpartreturnApplyMapper extends BaseMapper { IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - - @Select("select * from as_oldpartreturn_apply") - List selectListVo(); int updateFlowFiled(Map map); diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyMapper.xml index 9004d5a44c..b52b7286d2 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyMapper.xml +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyMapper.xml @@ -25,10 +25,6 @@ LEFT JOIN anrui_portal.sys_organization AS s ON aoa.deptSid = s.sid ${ew.sqlSegment} - - UPDATE as_oldpartreturn_apply diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyService.java index dbc4bacc0a..8ab3b090fc 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyService.java @@ -199,6 +199,17 @@ public class AsOldpartreturnApplyService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); + for (AsOldpartreturnApplyVo record : pagging.getRecords()) { + List urlPahts = new ArrayList<>(); + AsOldpartreturnApply asOldpartreturnApply = fetchBySid(record.getSid()); + String filePath = asOldpartreturnApply.getFilePath(); + String[] filePaths = filePath.split(","); + for (String path : filePaths) { + String url = fileUploadComponent.getUrlPrefix() + path; + urlPahts.add(url); + } + record.setFilePaths(urlPahts); + } PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } @@ -612,16 +623,16 @@ public class AsOldpartreturnApplyService extends MybatisBaseService= date_format('" + createStartTime + "','%Y-%m-%d')"). apply(StringUtils.isNotEmpty(createEndTime), "date_format (aoa.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" ); + qw.groupBy("aoa.sid"); IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); + for (AsOldpartreturnApplyVo record : pagging.getRecords()) { + List urlPahts = new ArrayList<>(); + AsOldpartreturnApply asOldpartreturnApply = fetchBySid(record.getSid()); + String filePath = asOldpartreturnApply.getFilePath(); + String[] filePaths = filePath.split(","); + for (String path : filePaths) { + String url = fileUploadComponent.getUrlPrefix() + path; + urlPahts.add(url); + } + record.setFilePaths(urlPahts); + } PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmMapper.java index c811aeab5e..a2bc25d3b2 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmMapper.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmMapper.java @@ -54,13 +54,6 @@ import java.util.List; @Mapper public interface AsOldpartreturnConfirmMapper extends BaseMapper { - //@Update("update as_oldpartreturn_confirm set name=#{msg} where id=#{id}") - //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - @Select("select * from as_oldpartreturn_confirm") List selectListVo(); diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmMapper.xml index 6a7732ed52..c86faccd98 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmMapper.xml +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmMapper.xml @@ -3,11 +3,4 @@ - - - \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmRest.java index 00ce2f24e8..186f7004a9 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmRest.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmRest.java @@ -59,14 +59,6 @@ public class AsOldpartreturnConfirmRest { @Autowired private AsOldpartreturnConfirmService asOldpartreturnConfirmService; - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = asOldpartreturnConfirmService.listPageVo(pq); - return rb.success().setData(pv); - } - @ApiOperation("新增或修改") @PostMapping("/save") public ResultBean save(@RequestBody AsOldpartreturnConfirmDto dto){ diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmService.java index bd22353505..fb59b8bb6a 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmService.java @@ -73,22 +73,6 @@ public class AsOldpartreturnConfirmService extends MybatisBaseService createQueryWrapper(AsOldpartreturnConfirmQuery query) { - // todo: 这里根据具体业务调整查询条件 - // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); - QueryWrapper qw = new QueryWrapper<>(); - return qw; - } - - public PagerVo listPageVo(PagerQuery pq) { - AsOldpartreturnConfirmQuery query = pq.getParams(); - QueryWrapper qw = createQueryWrapper(query); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } public void saveOrUpdateDto(AsOldpartreturnConfirmDto dto){ String dtoSid = dto.getSid(); diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailMapper.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailMapper.java index 7e854d8bc5..f22b61ef82 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailMapper.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailMapper.java @@ -69,7 +69,7 @@ public interface PmsPurchaseBillDetailMapper extends BaseMapper selByMainSid(String billSid); - IPage purDetailReForm(IPage page, QueryWrapper qw); + IPage purDetailReForm(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - IPage purSumReForm(IPage page, QueryWrapper qw); + IPage purSumReForm(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); } \ No newline at end of file diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailService.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailService.java index 1b94961a16..e7ca2e4224 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailService.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailService.java @@ -124,6 +124,7 @@ public class PmsPurchaseBillDetailService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.purSumReForm(page, qw);