From e88629b779b1cfdd91ab42079d9daea5ae8bb2cb Mon Sep 17 00:00:00 2001 From: vayne Date: Sun, 3 Mar 2024 18:00:51 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=BE=91=E9=A1=B5=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/scm/BusinessOrderMapper.xml | 27 ++++++++ .../java/jnpf/mapper/BusinessOrderMapper.java | 3 + .../jnpf/service/BusinessOrderService.java | 2 + .../impl/BusinessOrderServiceImpl.java | 5 ++ .../controller/BusinessOrderController.java | 4 ++ .../java/jnpf/entity/BusinessOrderEntity.java | 3 + .../model/businessorder/ContractModel.java | 3 + .../purchaseCenter/purchaseOrder/index.vue | 68 +++++++++---------- .../views/scm/saleCenter/saleOrder/form.vue | 7 +- .../src/views/workFlow/components/FlowBox.vue | 1 + .../views/workFlow/components/SaleFlowBox.vue | 16 +++-- 11 files changed, 96 insertions(+), 43 deletions(-) diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderMapper.xml index 9a7e0214..0e50072f 100644 --- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderMapper.xml +++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderMapper.xml @@ -133,6 +133,20 @@ + + + + + + + + + + + + + + + + diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/BusinessOrderMapper.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/BusinessOrderMapper.java index 1b6e8ed0..d6c2cdf1 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/BusinessOrderMapper.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/BusinessOrderMapper.java @@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import jnpf.entity.ContractLEntity; import jnpf.model.bom.BomPagination; import jnpf.model.businessorder.BusinessOrderPagination; +import jnpf.model.businessorder.ContractModel; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -34,4 +35,6 @@ public interface BusinessOrderMapper extends BaseMapper { IPage querySaleOrder(@Param("page") Page page, @Param("businessOrderPagination") BusinessOrderPagination businessOrderPagination, @Param("ew") QueryWrapper businessOrderQueryWrapper); + List queryContractInfo(String id); + } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/BusinessOrderService.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/BusinessOrderService.java index f641433f..f9fbb9d1 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/BusinessOrderService.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/BusinessOrderService.java @@ -51,5 +51,7 @@ public interface BusinessOrderService extends IService { List getPurchaseList(BusinessOrderPagination businessOrderPagination); List getPurchaseTypeList(BusinessOrderPagination businessOrderPagination,String dataType); +// 查询采购/销售的合同详情 + List queryContractInfo(String id); } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/BusinessOrderServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/BusinessOrderServiceImpl.java index be13617b..2ff1c55c 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/BusinessOrderServiceImpl.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/BusinessOrderServiceImpl.java @@ -798,6 +798,11 @@ public class BusinessOrderServiceImpl extends ServiceImpl queryContractInfo(String id) { + return businessOrderMapper.queryContractInfo(id); + } + @Override public BusinessOrderEntity getInfo(String id){ QueryWrapper queryWrapper=new QueryWrapper<>(); diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessOrderController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessOrderController.java index a3337862..6568eb0e 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessOrderController.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessOrderController.java @@ -609,6 +609,10 @@ public class BusinessOrderController { if(entity==null){ return ActionResult.fail("表单数据不存在！"); } + if (StringUtil.isNotEmpty(entity.getContractId())) { + List contractInfo = businessOrderService.queryContractInfo(entity.getContractId()); + entity.setContractInfoList(contractInfo); + } Map businessOrderMap=JsonUtil.entityToMap(entity); businessOrderMap.put("id", businessOrderMap.get("id")); //副表数据 diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessOrderEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessOrderEntity.java index 77722c96..387b2485 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessOrderEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessOrderEntity.java @@ -1,6 +1,7 @@ package jnpf.entity; import com.baomidou.mybatisplus.annotation.*; +import jnpf.model.businessorder.ContractModel; import lombok.Data; import java.util.Date; import java.util.List; @@ -149,6 +150,8 @@ public class BusinessOrderEntity { @TableField(exist = false) private String storageNum; @TableField(exist = false) + private List contractInfoList; + @TableField(exist = false) private List settlementInfoList; @TableField(exist = false) private List businessOrderProductRelationalList; diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/businessorder/ContractModel.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/businessorder/ContractModel.java index cd607b0d..059f82b4 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/businessorder/ContractModel.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/businessorder/ContractModel.java @@ -40,6 +40,9 @@ public class ContractModel { /** 关联客户(二级) **/ @JSONField(name = "subject2") private String subject2; + /** 关联客户名称(二级) **/ + @JSONField(name = "secondCustomName") + private String secondCustomName; /** 交货时间开始 **/ @JSONField(name = "deliveryTime") private Long deliveryTime; diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOrder/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOrder/index.vue index 6ada126e..98330829 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOrder/index.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOrder/index.vue @@ -387,6 +387,38 @@ export default { }) }, methods: { + addSaleHandle() { + if (!this.multipleSelectionItem.length) { + this.$message({ + type: 'error', + message: '请选择一条数据', + duration: 1500, + }) + return + } + const selectData = this.multipleSelectionItem + if (!this.saleFlowList.length) { + this.$message({ type: 'error', message: '流程不存在' }); + } else if (this.saleFlowList.length === 1) { + this.selectSaleFlow(this.saleFlowList[0], selectData) + } else { + this.flowListVisible = true + } + }, + selectSaleFlow(item, selectData) { + let data = { + id: '', + formType: 1, + flowId: item.id, + opType: '-1', + selectData: selectData + } + this.flowListVisible = false + this.saleFlowVisible = true + this.$nextTick(() => { + this.$refs.SaleFlowBox.init(data) + }) + }, toDetail(defaultValue, modelId) { if (!defaultValue) return getConfigData(modelId).then(res => { @@ -672,7 +704,7 @@ export default { this.jnpf.downloadFile(res.data.url) this.$refs.ExportBox.visible = false this.exportBoxVisible = false - }) + }) }, search() { this.listQuery.currentPage = 1 @@ -686,7 +718,7 @@ export default { let data = { id: row.id, flowId: row.flowId || this.flowList[0].id, - opType: flowState ? 0 : '-1', + opType: flowState ? 0 : '-1', status: flowState } this.flowVisible = true @@ -729,38 +761,6 @@ export default { this.$refs.FlowBox.init(data) }) }, - addSaleHandle() { - if (!this.multipleSelectionItem.length) { - this.$message({ - type: 'error', - message: '请选择一条数据', - duration: 1500, - }) - return - } - const selectData = this.multipleSelectionItem - if (!this.saleFlowList.length) { - this.$message({ type: 'error', message: '流程不存在' }); - } else if (this.saleFlowList.length === 1) { - this.selectSaleFlow(this.saleFlowList[0], selectData) - } else { - this.flowListVisible = true - } - }, - selectSaleFlow(item, selectData) { - let data = { - id: '', - formType: 1, - flowId: item.id, - opType: '-1', - selectData: selectData - } - this.flowListVisible = false - this.saleFlowVisible = true - this.$nextTick(() => { - this.$refs.SaleFlowBox.init(data) - }) - }, refresh(isrRefresh) { this.formVisible = false if (isrRefresh) this.reset() diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/form.vue index e193f6f3..2c2a7c3f 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/form.vue @@ -111,7 +111,7 @@ - + @@ -1548,7 +1548,7 @@ export default { const _data = this.dataList() return _data }, - initPurchaseData(){ + initPurchaseData() { console.log("55555555", this.setting) }, selfInit() { @@ -1809,6 +1809,9 @@ export default { for (let i = 0; i < _dataAll.businessOrderProductRelationalList.length; i++) { this.childIndex = i } + for (let i = 0; i < _dataAll.contractInfoList.length; i++) { + this.childIndex = i + } this.childIndex = -1 }, }, diff --git a/jnpf-java-boot/jnpf-web/src/views/workFlow/components/FlowBox.vue b/jnpf-java-boot/jnpf-web/src/views/workFlow/components/FlowBox.vue index 4ae35850..23a6c65d 100644 --- a/jnpf-java-boot/jnpf-web/src/views/workFlow/components/FlowBox.vue +++ b/jnpf-java-boot/jnpf-web/src/views/workFlow/components/FlowBox.vue @@ -503,6 +503,7 @@ export default { }, getBeforeInfo(data) { + debugger FlowBeforeInfo(data.id || 0, { taskNodeId: data.taskNodeId, taskOperatorId: data.taskId, flowId: data.flowId }).then(res => { if (res.data.flowFormInfo.urlAddress == 'extend/customer/subjectfollowmanagement/form.vue') { res.data.flowFormInfo.urlAddress = 'extend/customer/subjectfollowmanagement/report.vue' diff --git a/jnpf-java-boot/jnpf-web/src/views/workFlow/components/SaleFlowBox.vue b/jnpf-java-boot/jnpf-web/src/views/workFlow/components/SaleFlowBox.vue index 4ae35850..b3f668de 100644 --- a/jnpf-java-boot/jnpf-web/src/views/workFlow/components/SaleFlowBox.vue +++ b/jnpf-java-boot/jnpf-web/src/views/workFlow/components/SaleFlowBox.vue @@ -483,6 +483,7 @@ export default { this.$emit('close', isRefresh) }, init(data) { + debugger this.loading = true this.activeTab = '0' this.setting = data @@ -504,13 +505,14 @@ export default { }, getBeforeInfo(data) { FlowBeforeInfo(data.id || 0, { taskNodeId: data.taskNodeId, taskOperatorId: data.taskId, flowId: data.flowId }).then(res => { - if (res.data.flowFormInfo.urlAddress == 'extend/customer/subjectfollowmanagement/form.vue') { - res.data.flowFormInfo.urlAddress = 'extend/customer/subjectfollowmanagement/report.vue' - } else if (res.data.flowFormInfo.urlAddress == 'extend/supplier/subjectfollowmanagement/form.vue') { - res.data.flowFormInfo.urlAddress = 'extend/supplier/subjectfollowmanagement/report.vue' - } else if (res.data.flowFormInfo.urlAddress == 'extend/service/subjectfollowmanagement/form.vue') { - res.data.flowFormInfo.urlAddress = 'extend/service/subjectfollowmanagement/report.vue' - } + debugger + // if (res.data.flowFormInfo.urlAddress == 'extend/customer/subjectfollowmanagement/form.vue') { + // res.data.flowFormInfo.urlAddress = 'extend/customer/subjectfollowmanagement/report.vue' + // } else if (res.data.flowFormInfo.urlAddress == 'extend/supplier/subjectfollowmanagement/form.vue') { + // res.data.flowFormInfo.urlAddress = 'extend/supplier/subjectfollowmanagement/report.vue' + // } else if (res.data.flowFormInfo.urlAddress == 'extend/service/subjectfollowmanagement/form.vue') { + // res.data.flowFormInfo.urlAddress = 'extend/service/subjectfollowmanagement/report.vue' + // } this.flowFormInfo = res.data.flowFormInfo this.flowTaskInfo = res.data.flowTaskInfo || {} this.flowTemplateInfo = res.data.flowTemplateInfo