diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 51fb196..4b1c69b 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,8 +2,16 @@ - - + + + + + + + + + + @@ -15,15 +23,26 @@ - - + + + + + + + + + + + + + + - - + + - + + + + - - - - + + - - @@ -137,6 +156,8 @@ + + @@ -159,20 +180,20 @@ - + - + - - + + - + @@ -184,65 +205,65 @@ - - + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - + - - + + - + - - + + - + - - + + - + @@ -264,16 +285,16 @@ - - - - - - + - - + + + + + + + @@ -283,15 +304,19 @@ - + - + + + + + @@ -301,6 +326,11 @@ 54 diff --git a/ABAP_AS_WITH_POOL.jcoDestination b/ABAP_AS_WITH_POOL.jcoDestination index 861af8c..ce3270a 100644 --- a/ABAP_AS_WITH_POOL.jcoDestination +++ b/ABAP_AS_WITH_POOL.jcoDestination @@ -1,7 +1,7 @@ #for tests only ! -#Thu Aug 15 08:36:29 CST 2024 +#Fri Aug 16 15:07:54 CST 2024 jco.client.lang=ZH -jco.client.passwd=eS(El@-%R^,S+Ln%+BaDj^~il|H,NH,oC-b~T^.mO%Dy#Eek +jco.client.passwd=g|B/exL/3f*]+(L@deYR].5NencX7!7brm9yDf3(LK4ChG/[ jco.client.sysnr=00 jco.destination.pool_capacity=10 jco.client.client=800 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/SapRfcController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/SapRfcController.java index cef9ae7..bff314e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/SapRfcController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/SapRfcController.java @@ -21,12 +21,14 @@ import com.ruoyi.customer.domain.BankCode; import com.ruoyi.customer.domain.Customer; import com.ruoyi.customer.domain.qcc.FuzzySearch; import com.ruoyi.customer.domain.qcc.QccFuzzySearchJsonResult; +import com.ruoyi.expenses.domain.lk.Payment; import com.ruoyi.framework.config.ServerConfig; import com.ruoyi.materialType.domain.CMaterialType; import com.ruoyi.web.utils.SapFunction.RfcResult; import com.ruoyi.web.utils.SapFunction.SapRfcUtils; import com.ruoyi.web.utils.qcc.HttpHelper; import com.ruoyi.web.utils.qcc.QiChaChaUtil; +import jodd.util.StringUtil; import org.apache.commons.collections.CollectionUtils; import org.apache.http.client.methods.HttpHead; import org.slf4j.Logger; @@ -322,7 +324,6 @@ public class SapRfcController * 查询银行代码列表 */ @PreAuthorize("@ss.hasPermi('customer:customer:bankCodeList')") - @Log(title = "银行代码信息查询", businessType = BusinessType.OTHER) @GetMapping("/bankCodeList") public TableDataInfo bankCodeList(BankCode bank) { @@ -340,4 +341,39 @@ public class SapRfcController rspData.setTotal(new PageInfo(resCache).getTotal()); return rspData; } + + /*=======================================查询SAP业务员来款信息=================================================*/ + + /** + * 查询SAP业务员来款信息 + * @param payment + * @return + */ + @PreAuthorize("@ss.hasPermi('expenses:expenses:lkList')") + @GetMapping("/lkList") + public TableDataInfo lkList(Payment payment) + { + List resCache = new ArrayList(); + TableDataInfo rspData = new TableDataInfo(); + String salesmanBm = payment.getSalesmanBm(); + if(StringUtils.isEmpty(salesmanBm)){ + rspData.setCode(HttpStatus.SUCCESS); + rspData.setMsg("查询失败,该业务员未绑定SAP编码"); + rspData.setRows(resCache); + rspData.setTotal(new PageInfo(resCache).getTotal()); + return rspData; + } + + try { + resCache = SapRfcUtils.getLkList(payment); + } catch (Exception e1) { + e1.printStackTrace(); + } + + rspData.setCode(HttpStatus.SUCCESS); + rspData.setMsg("查询成功"); + rspData.setRows(resCache); + rspData.setTotal(new PageInfo(resCache).getTotal()); + return rspData; + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/expenses/ExpensesController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/expenses/ExpensesController.java index 42eb4ee..13d15cb 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/expenses/ExpensesController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/expenses/ExpensesController.java @@ -3,11 +3,9 @@ package com.ruoyi.web.controller.expenses; import java.util.List; import javax.servlet.http.HttpServletResponse; -import com.ruoyi.common.annotation.DataSource; import com.ruoyi.common.constant.CacheConstants; import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.core.redis.RedisCache; -import com.ruoyi.common.enums.DataSourceType; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; @@ -19,9 +17,6 @@ import com.ruoyi.expenses.domain.OaOfficeStaff; import com.ruoyi.expenses.domain.SysOaExpenses; import com.ruoyi.expenses.service.IExpensesFileService; import com.ruoyi.framework.changeRecord.ChangeRecordLog; -import com.ruoyi.quot.domain.QuotFile; -import com.ruoyi.redBook.domain.OAQuot; -import com.ruoyi.redBook.domain.RbVersionDateResult; import com.ruoyi.system.service.ISysConfigService; import com.ruoyi.system.service.ISysDeptService; import com.ruoyi.system.service.ISysUserService; @@ -174,7 +169,7 @@ public class ExpensesController extends BaseController @PreAuthorize("@ss.hasPermi('expenses:expenses:edit')") @ChangeRecordLog(serviceImplclass = "com.ruoyi.expenses.service.impl.ExpensesServiceImpl", serviceImplMethod="selectExpensesByExpId", - tableId = "expId",codeName = "expCode",title = "费用支出新增") + tableId = "expId",codeName = "expCode",title = "费用支出修改") @PutMapping public AjaxResult edit(@RequestBody Expenses expenses) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/utils/SapFunction/SapRfcUtils.java b/ruoyi-admin/src/main/java/com/ruoyi/web/utils/SapFunction/SapRfcUtils.java index 4251544..99cfa5c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/utils/SapFunction/SapRfcUtils.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/utils/SapFunction/SapRfcUtils.java @@ -5,6 +5,7 @@ import com.ruoyi.contract.damain.Contract; import com.ruoyi.customer.domain.Bank; import com.ruoyi.customer.domain.BankCode; import com.ruoyi.customer.domain.Customer; +import com.ruoyi.expenses.domain.lk.Payment; import com.sap.conn.jco.*; import java.util.ArrayList; @@ -563,6 +564,49 @@ public class SapRfcUtils { return res; } + /*=======================================查询SAP业务员来款信息=================================================*/ + /** + * 查询SAP业务员来款信息 + * @param payment + * @return + */ + public static List getLkList(Payment payment) { + JCoFunction function = null; + Payment rfcResult = null; + List payments = new ArrayList<>(); + + JCoDestination destination = ConnectToSAP.connect(); + try { + function = destination.getRepository().getFunctionTemplate("ZTB_LKCX").getFunction(); + if (function == null) + throw new RuntimeException("RFC_SYSTEM_INFO not found in SAP."); + JCoParameterList input = function.getImportParameterList(); + input.setValue("I_YWYBM", payment.getSalesmanBm());//业务员编码 + input.setValue("KH", payment.getCustomerName());//客户 + input.setValue("I_DTEBEGIN", payment.getPzDateBegin());//凭证日期（开始） + input.setValue("I_DTEEND", payment.getPzDateEnd());//凭证日期（结束） + function.execute(destination); + JCoTable table = function.getTableParameterList().getTable("LT_OUT"); + for(int i = 0; i expensesLkDetailList; + public void setExpId(String expId) { this.expId = expId; @@ -274,15 +287,15 @@ public class Expenses extends BaseEntity { return expExpenditureType; } - public void setExpExpenditureAmount(Long expExpenditureAmount) - { - this.expExpenditureAmount = expExpenditureAmount; - } + public void setExpExpenditureAmount(BigDecimal expExpenditureAmount) { this.expExpenditureAmount = expExpenditureAmount; } - public Long getExpExpenditureAmount() + public BigDecimal getExpExpenditureAmount() { return expExpenditureAmount; } + public BigDecimal getExpLkAmount() { return expLkAmount; } + + public void setExpLkAmount(BigDecimal expLkAmount) { this.expLkAmount = expLkAmount; } public void setExpBidArea(String expBidArea) { this.expBidArea = expBidArea; @@ -301,10 +314,7 @@ public class Expenses extends BaseEntity { return expExpenditureDate; } - public void setExpExpenditureAmountUppercase(String expExpenditureAmountUppercase) - { - this.expExpenditureAmountUppercase = expExpenditureAmountUppercase; - } + public void setExpExpenditureAmountUppercase(String expExpenditureAmountUppercase) { this.expExpenditureAmountUppercase = expExpenditureAmountUppercase; } public String getExpExpenditureAmountUppercase() { @@ -472,4 +482,8 @@ public class Expenses extends BaseEntity public String getExpReceiveUserNickName() { return expReceiveUserNickName; } public void setExpReceiveUserNickName(String expReceiveUserNickName) { this.expReceiveUserNickName = expReceiveUserNickName; } + + public List getExpensesLkDetailList() { return expensesLkDetailList; } + + public void setExpensesLkDetailList(List expensesLkDetailList) { this.expensesLkDetailList = expensesLkDetailList; } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/expenses/domain/ExpensesLkDetail.java b/ruoyi-system/src/main/java/com/ruoyi/expenses/domain/ExpensesLkDetail.java new file mode 100644 index 0000000..4b0afb1 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/expenses/domain/ExpensesLkDetail.java @@ -0,0 +1,100 @@ +package com.ruoyi.expenses.domain; + +import java.math.BigDecimal; + +public class ExpensesLkDetail { + private String expLkId;//费用支出-来款信息id + private String pz;//sap凭证 + private String pzDate;//凭证日期 + private String year;//年度 + private String customerBm;//客户编码 + private String customerName;//客户名称 + private String salesmanBm;//业务员编码 + private String salesmanName;//业务员名称 + private BigDecimal amount;//金额 + private BigDecimal checkAmount;//确认金额 + private String remark;//备注 + + private String expId;//费用支出id + + + public String getExpLkId() { return expLkId; } + + public void setExpLkId(String expLkId) { this.expLkId = expLkId; } + + public String getPz() { + return pz; + } + + public void setPz(String pz) { + this.pz = pz; + } + + public String getPzDate() { + return pzDate; + } + + public void setPzDate(String pzDate) { + this.pzDate = pzDate; + } + + public String getYear() { + return year; + } + + public void setYear(String year) { + this.year = year; + } + + public String getCustomerBm() { + return customerBm; + } + + public void setCustomerBm(String customerBm) { + this.customerBm = customerBm; + } + + public String getCustomerName() { return customerName; } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getSalesmanBm() { + return salesmanBm; + } + + public void setSalesmanBm(String salesmanBm) { + this.salesmanBm = salesmanBm; + } + + public String getSalesmanName() { return salesmanName; } + + public void setSalesmanName(String salesmanName) { + this.salesmanName = salesmanName; + } + + public BigDecimal getAmount() { + return amount; + } + + public void setAmount(BigDecimal amount) { + this.amount = amount; + } + + public BigDecimal getCheckAmount() { return checkAmount; } + + public void setCheckAmount(BigDecimal checkAmount) { this.checkAmount = checkAmount; } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getExpId() { return expId; } + + public void setExpId(String expId) { this.expId = expId; } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/expenses/domain/lk/Payment.java b/ruoyi-system/src/main/java/com/ruoyi/expenses/domain/lk/Payment.java new file mode 100644 index 0000000..307112a --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/expenses/domain/lk/Payment.java @@ -0,0 +1,103 @@ +package com.ruoyi.expenses.domain.lk; + +public class Payment { + private String pz;//sap凭证 + private String pzDate;//凭证日期 + private String pzDateBegin;//凭证日期(开始) + private String pzDateEnd;//凭证日期(结束) + private String year;//年度 + private String customerBm;//客户编码 + private String customerName;//客户名称 + private String salesmanBm;//业务员编码 + private String salesmanName;//业务员名称 + private String amount;//金额 + private String remark;//备注 + + public String getPz() { + return pz; + } + + public void setPz(String pz) { + this.pz = pz; + } + + public String getPzDate() { + return pzDate; + } + + public void setPzDate(String pzDate) { + this.pzDate = pzDate; + } + + public String getPzDateBegin() { + return pzDateBegin; + } + + public void setPzDateBegin(String pzDateBegin) { + this.pzDateBegin = pzDateBegin; + } + + public String getPzDateEnd() { + return pzDateEnd; + } + + public void setPzDateEnd(String pzDateEnd) { + this.pzDateEnd = pzDateEnd; + } + + public String getYear() { + return year; + } + + public void setYear(String year) { + this.year = year; + } + + public String getCustomerBm() { + return customerBm; + } + + public void setCustomerBm(String customerBm) { + this.customerBm = customerBm; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getSalesmanBm() { + return salesmanBm; + } + + public void setSalesmanBm(String salesmanBm) { + this.salesmanBm = salesmanBm; + } + + public String getSalesmanName() { + return salesmanName; + } + + public void setSalesmanName(String salesmanName) { + this.salesmanName = salesmanName; + } + + public String getAmount() { + return amount; + } + + public void setAmount(String amount) { + this.amount = amount; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/expenses/mapper/ExpensesMapper.java b/ruoyi-system/src/main/java/com/ruoyi/expenses/mapper/ExpensesMapper.java index 908a6f2..c129c0c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/expenses/mapper/ExpensesMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/expenses/mapper/ExpensesMapper.java @@ -2,6 +2,7 @@ package com.ruoyi.expenses.mapper; import java.util.List; import com.ruoyi.expenses.domain.Expenses; +import com.ruoyi.expenses.domain.ExpensesLkDetail; import com.ruoyi.expenses.domain.OaOfficeStaff; import com.ruoyi.expenses.domain.SysOaExpenses; @@ -37,6 +38,12 @@ public interface ExpensesMapper */ public int insertExpenses(Expenses expenses); + /** + * 批量插入费用支出-来款明细表 + * @param expensesLkDetailList + */ + void batchExpensesLkDetail(List expensesLkDetailList); + /** * 费用支出插入OA中间表 * @@ -53,6 +60,12 @@ public interface ExpensesMapper */ public int updateExpenses(Expenses expenses); + /** + * 通过费用支出主键删除来款明细表 + * @param expId + */ + void deleteExpensesLkDetailByExpId(String expId); + /** * 删除费用支出 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/expenses/service/impl/ExpensesServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/expenses/service/impl/ExpensesServiceImpl.java index 9e1a316..8771f1e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/expenses/service/impl/ExpensesServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/expenses/service/impl/ExpensesServiceImpl.java @@ -1,12 +1,18 @@ package com.ruoyi.expenses.service.impl; +import java.util.ArrayList; import java.util.List; import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.annotation.DataSource; import com.ruoyi.common.enums.DataSourceType; import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.utils.uuid.UUID; +import com.ruoyi.expenses.domain.ExpensesLkDetail; import com.ruoyi.expenses.domain.OaOfficeStaff; import com.ruoyi.expenses.domain.SysOaExpenses; +import com.ruoyi.quot.domain.Quot; +import com.ruoyi.quot.domain.QuotMaterial; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.expenses.mapper.ExpensesMapper; @@ -62,7 +68,10 @@ public class ExpensesServiceImpl implements IExpensesService public int insertExpenses(Expenses expenses) { expenses.setCreateTime(DateUtils.getNowDate()); - return expensesMapper.insertExpenses(expenses); + expenses.setUpdateTime(DateUtils.getNowDate()); + int rows = expensesMapper.insertExpenses(expenses); + insertExpensesLkDetail(expenses); + return rows; } /** @@ -77,6 +86,36 @@ public class ExpensesServiceImpl implements IExpensesService expensesMapper.insertSysOAExpenses(sysOaExpenses); } + /** + * 新增费用支出-来款信息 + * + * @param expenses 来款对象 + */ + public void insertExpensesLkDetail(Expenses expenses) + { + List expensesLkDetailList = expenses.getExpensesLkDetailList(); + String expId = expenses.getExpId(); + if (StringUtils.isNotNull(expensesLkDetailList)) + { + List list = new ArrayList(); + for (ExpensesLkDetail expensesLkDetail : expensesLkDetailList) + { + expensesLkDetail.setExpLkId(UUID.fastUUID().toString()); + expensesLkDetail.setExpId(expId); + list.add(expensesLkDetail); + } + if (list.size() > 0) + { + int batchSize = 100; // 每批次插入的数据量 + for (int i = 0; i < list.size(); i += batchSize) { + int toIndex = Math.min(i + batchSize, list.size()); + List subList = list.subList(i, toIndex); + expensesMapper.batchExpensesLkDetail(subList); + } + } + } + } + /** * 修改费用支出 * @@ -88,6 +127,8 @@ public class ExpensesServiceImpl implements IExpensesService public int updateExpenses(Expenses expenses) { expenses.setUpdateTime(DateUtils.getNowDate()); + expensesMapper.deleteExpensesLkDetailByExpId(expenses.getExpId()); + insertExpensesLkDetail(expenses); return expensesMapper.updateExpenses(expenses); } diff --git a/ruoyi-system/src/main/resources/mapper/expenses/ExpensesMapper.xml b/ruoyi-system/src/main/resources/mapper/expenses/ExpensesMapper.xml index 6b71268..d7817ba 100644 --- a/ruoyi-system/src/main/resources/mapper/expenses/ExpensesMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/expenses/ExpensesMapper.xml @@ -18,6 +18,7 @@ + @@ -51,6 +52,25 @@ + + + + + + + + + + + + + + + + + + + left join sys_user u on u.user_id=a.create_by left join sys_user u2 on u2.user_id=a.exp_receive_user_id @@ -60,7 +80,7 @@ select a.exp_id, a.exp_code, a.exp_pq_number, a.exp_number, a.exp_bid_number, a.exp_expenditure_mode, a.exp_customer_bm, a.exp_customer_name, a.exp_expenditure_people, a.exp_project, a.exp_return_date, - a.exp_expenditure_type, a.exp_expenditure_amount, a.exp_bid_area, a.exp_expenditure_date, + a.exp_expenditure_type, a.exp_expenditure_amount, a.exp_lk_amount, a.exp_bid_area, a.exp_expenditure_date, a.exp_expenditure_amount_uppercase, a.exp_staff_tureorfales, a.exp_back_office,a.exp_back_office_id, a.exp_salesman_code, a.exp_salesman_bm, a.exp_salesman_name, a.exp_salesman_dept_id, a.exp_salesman_dept_name, a.exp_dispatch_status, a.exp_account_name, a.exp_account_number, @@ -94,9 +114,27 @@ - + select a.exp_id, a.exp_code, a.exp_pq_number, a.exp_number, a.exp_bid_number, a.exp_expenditure_mode, a.exp_customer_bm, + a.exp_customer_name, a.exp_expenditure_people, a.exp_project, a.exp_return_date, + a.exp_expenditure_type, a.exp_expenditure_amount, a.exp_bid_area, a.exp_expenditure_date, + a.exp_expenditure_amount_uppercase, a.exp_staff_tureorfales, a.exp_back_office,a.exp_back_office_id, + a.exp_salesman_code, a.exp_salesman_bm, a.exp_salesman_name, a.exp_salesman_dept_id, + a.exp_salesman_dept_name, a.exp_dispatch_status, a.exp_account_name, a.exp_account_number, + a.exp_deposit_bank, a.exp_line_number_and_othres, a.exp_request_remark,a.exp_cash_deposit,a.exp_lxr, a.exp_lxrdh, + a.exp_return_remark,a.exp_approval_status, a.exp_oa_approval_status,a.exp_oa_remark, a.exp_receive_user_id, + u2.nick_name exp_receive_user_nick_name, + a.create_by, a.create_time, a.update_by, a.update_time, + + b.exp_lk_id as sub_exp_lk_id,b.pz as sub_pz,b.pzDate as sub_pzDate, + b.year as sub_year,b.customerBm as sub_customerBm,b.customerName as sub_customerName, + b.salesmanBm as sub_salesmanBm,b.salesmanName as sub_salesmanName,b.amount as sub_amount, + b.checkAmount as sub_checkAmount,b.remark as sub_remark + from expenses a + left join expenses_lkdetail b on b.exp_id = a.exp_id + + where a.exp_id = #{expId} + order by b.pzDate desc @@ -115,6 +153,7 @@ exp_return_date, exp_expenditure_type, exp_expenditure_amount, + exp_lk_amount, exp_bid_area, exp_expenditure_date, exp_expenditure_amount_uppercase, @@ -161,6 +200,7 @@ #{expReturnDate}, #{expExpenditureType}, #{expExpenditureAmount}, + #{expLkAmount}, #{expBidArea}, #{expExpenditureDate}, #{expExpenditureAmountUppercase}, @@ -285,6 +325,7 @@ exp_return_date = #{expReturnDate}, exp_expenditure_type = #{expExpenditureType}, exp_expenditure_amount = #{expExpenditureAmount}, + exp_lk_amount = #{expLkAmount}, exp_bid_area = #{expBidArea}, exp_expenditure_date = #{expExpenditureDate}, exp_expenditure_amount_uppercase = #{expExpenditureAmountUppercase}, @@ -331,6 +372,17 @@ + + delete from expenses_lkdetail where exp_id = #{expId} + + + + insert into expenses_lkdetail( exp_lk_id, pz, pzDate, year,customerBm, customerName, salesmanBm,salesmanName, amount,checkAmount,remark,exp_id) values + + ( #{item.expLkId}, #{item.pz}, #{item.pzDate}, #{item.year}, #{item.customerBm}, #{item.customerName}, #{item.salesmanBm}, #{item.salesmanName}, cast(#{item.amount,jdbcType=DECIMAL} as decimal(18,3)), cast(#{item.checkAmount,jdbcType=DECIMAL} as decimal(18,3)),#{item.remark}, #{item.expId}) + + + diff --git a/ruoyi-system/target/classes/com/ruoyi/expenses/domain/Expenses.class b/ruoyi-system/target/classes/com/ruoyi/expenses/domain/Expenses.class index b473c54..1a6a792 100644 Binary files a/ruoyi-system/target/classes/com/ruoyi/expenses/domain/Expenses.class and b/ruoyi-system/target/classes/com/ruoyi/expenses/domain/Expenses.class differ diff --git a/ruoyi-system/target/classes/com/ruoyi/expenses/domain/ExpensesLkDetail.class b/ruoyi-system/target/classes/com/ruoyi/expenses/domain/ExpensesLkDetail.class new file mode 100644 index 0000000..765ecd6 Binary files /dev/null and b/ruoyi-system/target/classes/com/ruoyi/expenses/domain/ExpensesLkDetail.class differ diff --git a/ruoyi-system/target/classes/com/ruoyi/expenses/domain/lk/Payment.class b/ruoyi-system/target/classes/com/ruoyi/expenses/domain/lk/Payment.class new file mode 100644 index 0000000..b209316 Binary files /dev/null and b/ruoyi-system/target/classes/com/ruoyi/expenses/domain/lk/Payment.class differ diff --git a/ruoyi-system/target/classes/com/ruoyi/expenses/mapper/ExpensesMapper.class b/ruoyi-system/target/classes/com/ruoyi/expenses/mapper/ExpensesMapper.class index e080205..0ae75da 100644 Binary files a/ruoyi-system/target/classes/com/ruoyi/expenses/mapper/ExpensesMapper.class and b/ruoyi-system/target/classes/com/ruoyi/expenses/mapper/ExpensesMapper.class differ diff --git a/ruoyi-system/target/classes/com/ruoyi/expenses/service/impl/ExpensesServiceImpl.class b/ruoyi-system/target/classes/com/ruoyi/expenses/service/impl/ExpensesServiceImpl.class index 997904d..7c7ac36 100644 Binary files a/ruoyi-system/target/classes/com/ruoyi/expenses/service/impl/ExpensesServiceImpl.class and b/ruoyi-system/target/classes/com/ruoyi/expenses/service/impl/ExpensesServiceImpl.class differ diff --git a/ruoyi-system/target/classes/com/ruoyi/redBook/mapper/OARedBookMapper.class b/ruoyi-system/target/classes/com/ruoyi/redBook/mapper/OARedBookMapper.class index 3ac347c..249c437 100644 Binary files a/ruoyi-system/target/classes/com/ruoyi/redBook/mapper/OARedBookMapper.class and b/ruoyi-system/target/classes/com/ruoyi/redBook/mapper/OARedBookMapper.class differ diff --git a/ruoyi-system/target/classes/com/ruoyi/redBook/service/IRedBookService.class b/ruoyi-system/target/classes/com/ruoyi/redBook/service/IRedBookService.class index a6aa9fb..9d1c756 100644 Binary files a/ruoyi-system/target/classes/com/ruoyi/redBook/service/IRedBookService.class and b/ruoyi-system/target/classes/com/ruoyi/redBook/service/IRedBookService.class differ diff --git a/ruoyi-system/target/classes/com/ruoyi/redBook/service/impl/RedBookServiceImpl.class b/ruoyi-system/target/classes/com/ruoyi/redBook/service/impl/RedBookServiceImpl.class index 32d113b..3301661 100644 Binary files a/ruoyi-system/target/classes/com/ruoyi/redBook/service/impl/RedBookServiceImpl.class and b/ruoyi-system/target/classes/com/ruoyi/redBook/service/impl/RedBookServiceImpl.class differ diff --git a/ruoyi-system/target/classes/mapper/expenses/ExpensesMapper.xml b/ruoyi-system/target/classes/mapper/expenses/ExpensesMapper.xml index 6b71268..d7817ba 100644 --- a/ruoyi-system/target/classes/mapper/expenses/ExpensesMapper.xml +++ b/ruoyi-system/target/classes/mapper/expenses/ExpensesMapper.xml @@ -18,6 +18,7 @@ + @@ -51,6 +52,25 @@ + + + + + + + + + + + + + + + + + + + left join sys_user u on u.user_id=a.create_by left join sys_user u2 on u2.user_id=a.exp_receive_user_id @@ -60,7 +80,7 @@ select a.exp_id, a.exp_code, a.exp_pq_number, a.exp_number, a.exp_bid_number, a.exp_expenditure_mode, a.exp_customer_bm, a.exp_customer_name, a.exp_expenditure_people, a.exp_project, a.exp_return_date, - a.exp_expenditure_type, a.exp_expenditure_amount, a.exp_bid_area, a.exp_expenditure_date, + a.exp_expenditure_type, a.exp_expenditure_amount, a.exp_lk_amount, a.exp_bid_area, a.exp_expenditure_date, a.exp_expenditure_amount_uppercase, a.exp_staff_tureorfales, a.exp_back_office,a.exp_back_office_id, a.exp_salesman_code, a.exp_salesman_bm, a.exp_salesman_name, a.exp_salesman_dept_id, a.exp_salesman_dept_name, a.exp_dispatch_status, a.exp_account_name, a.exp_account_number, @@ -94,9 +114,27 @@ - + select a.exp_id, a.exp_code, a.exp_pq_number, a.exp_number, a.exp_bid_number, a.exp_expenditure_mode, a.exp_customer_bm, + a.exp_customer_name, a.exp_expenditure_people, a.exp_project, a.exp_return_date, + a.exp_expenditure_type, a.exp_expenditure_amount, a.exp_bid_area, a.exp_expenditure_date, + a.exp_expenditure_amount_uppercase, a.exp_staff_tureorfales, a.exp_back_office,a.exp_back_office_id, + a.exp_salesman_code, a.exp_salesman_bm, a.exp_salesman_name, a.exp_salesman_dept_id, + a.exp_salesman_dept_name, a.exp_dispatch_status, a.exp_account_name, a.exp_account_number, + a.exp_deposit_bank, a.exp_line_number_and_othres, a.exp_request_remark,a.exp_cash_deposit,a.exp_lxr, a.exp_lxrdh, + a.exp_return_remark,a.exp_approval_status, a.exp_oa_approval_status,a.exp_oa_remark, a.exp_receive_user_id, + u2.nick_name exp_receive_user_nick_name, + a.create_by, a.create_time, a.update_by, a.update_time, + + b.exp_lk_id as sub_exp_lk_id,b.pz as sub_pz,b.pzDate as sub_pzDate, + b.year as sub_year,b.customerBm as sub_customerBm,b.customerName as sub_customerName, + b.salesmanBm as sub_salesmanBm,b.salesmanName as sub_salesmanName,b.amount as sub_amount, + b.checkAmount as sub_checkAmount,b.remark as sub_remark + from expenses a + left join expenses_lkdetail b on b.exp_id = a.exp_id + + where a.exp_id = #{expId} + order by b.pzDate desc @@ -115,6 +153,7 @@ exp_return_date, exp_expenditure_type, exp_expenditure_amount, + exp_lk_amount, exp_bid_area, exp_expenditure_date, exp_expenditure_amount_uppercase, @@ -161,6 +200,7 @@ #{expReturnDate}, #{expExpenditureType}, #{expExpenditureAmount}, + #{expLkAmount}, #{expBidArea}, #{expExpenditureDate}, #{expExpenditureAmountUppercase}, @@ -285,6 +325,7 @@ exp_return_date = #{expReturnDate}, exp_expenditure_type = #{expExpenditureType}, exp_expenditure_amount = #{expExpenditureAmount}, + exp_lk_amount = #{expLkAmount}, exp_bid_area = #{expBidArea}, exp_expenditure_date = #{expExpenditureDate}, exp_expenditure_amount_uppercase = #{expExpenditureAmountUppercase}, @@ -331,6 +372,17 @@ + + delete from expenses_lkdetail where exp_id = #{expId} + + + + insert into expenses_lkdetail( exp_lk_id, pz, pzDate, year,customerBm, customerName, salesmanBm,salesmanName, amount,checkAmount,remark,exp_id) values + + ( #{item.expLkId}, #{item.pz}, #{item.pzDate}, #{item.year}, #{item.customerBm}, #{item.customerName}, #{item.salesmanBm}, #{item.salesmanName}, cast(#{item.amount,jdbcType=DECIMAL} as decimal(18,3)), cast(#{item.checkAmount,jdbcType=DECIMAL} as decimal(18,3)),#{item.remark}, #{item.expId}) + + + diff --git a/ruoyi-system/target/classes/mapper/redBook/OARedBookMapper.xml b/ruoyi-system/target/classes/mapper/redBook/OARedBookMapper.xml index 376239b..6f7bbba 100644 --- a/ruoyi-system/target/classes/mapper/redBook/OARedBookMapper.xml +++ b/ruoyi-system/target/classes/mapper/redBook/OARedBookMapper.xml @@ -73,13 +73,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" convert(decimal,convert(float,A.红本价格)) price,convert(varchar(10),B.date_0,23) pricedate from [rb_product_price] A left join rb_productVersion B on A.version_uid_0=B.uid_0 - where B.sta_0=1 - - and A.型号 like '%${name_0}%' - - - and A.规格 = #{model} - + where B.sta_0=1 and + + A.namevoltage like '%${item}%' + order by len(A.namevoltage) diff --git a/ruoyi-system/target/maven-archiver/pom.properties b/ruoyi-system/target/maven-archiver/pom.properties index d791922..19e5dee 100644 --- a/ruoyi-system/target/maven-archiver/pom.properties +++ b/ruoyi-system/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Thu Aug 15 09:33:59 CST 2024 +#Fri Aug 16 15:04:24 CST 2024 version=3.8.7 groupId=com.ruoyi artifactId=ruoyi-system diff --git a/ruoyi-system/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/ruoyi-system/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst index 8882699..1b68517 100644 --- a/ruoyi-system/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ b/ruoyi-system/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -47,6 +47,7 @@ com\ruoyi\redBook\service\impl\AsyncRbTaskService.class com\ruoyi\system\mapper\SysUserRoleMapper.class com\ruoyi\system\service\impl\SysDictTypeServiceImpl.class com\ruoyi\system\service\ISysNoticeService.class +com\ruoyi\expenses\domain\lk\Payment.class com\ruoyi\bid\domain\SysOaBidTb.class com\ruoyi\quot\domain\jsw\QuotJswResult.class com\ruoyi\system\service\ISysDictDataService.class @@ -166,6 +167,7 @@ com\ruoyi\priceVerification\service\impl\BidHjServiceImpl.class com\ruoyi\system\service\impl\SysOperLogServiceImpl.class com\ruoyi\quot\domain\jsw\QuotJswFiles.class com\ruoyi\material\domain\material.class +com\ruoyi\expenses\domain\ExpensesLkDetail.class com\ruoyi\technicalConfirm\domain\QuotJsqrXzRemark.class com\ruoyi\system\mapper\SysDictDataMapper.class com\ruoyi\system\service\ISysOperLogService.class diff --git a/ruoyi-system/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/ruoyi-system/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index 698ea32..857f705 100644 --- a/ruoyi-system/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/ruoyi-system/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -127,6 +127,7 @@ E:\myproject\JNBusinessTest\ruoyi-system\src\main\java\com\ruoyi\system\service\ E:\myproject\JNBusinessTest\ruoyi-system\src\main\java\com\ruoyi\system\service\ISysUserService.java E:\myproject\JNBusinessTest\ruoyi-system\src\main\java\com\ruoyi\registeredCompany\domain\RegisteredCompany.java E:\myproject\JNBusinessTest\ruoyi-system\src\main\java\com\ruoyi\bid\service\impl\BidServiceImpl.java +E:\myproject\JNBusinessTest\ruoyi-system\src\main\java\com\ruoyi\expenses\domain\ExpensesLkDetail.java E:\myproject\JNBusinessTest\ruoyi-system\src\main\java\com\ruoyi\quote\service\impl\QuoteServiceImpl.java E:\myproject\JNBusinessTest\ruoyi-system\src\main\java\com\ruoyi\zgys\domain\Zgys.java E:\myproject\JNBusinessTest\ruoyi-system\src\main\java\com\ruoyi\bid\service\IBidService.java @@ -199,6 +200,7 @@ E:\myproject\JNBusinessTest\ruoyi-system\src\main\java\com\ruoyi\sysSapUser\doma E:\myproject\JNBusinessTest\ruoyi-system\src\main\java\com\ruoyi\authorize\service\impl\AuthorizeFileServiceImpl.java E:\myproject\JNBusinessTest\ruoyi-system\src\main\java\com\ruoyi\bid\domain\BidTbHistory.java E:\myproject\JNBusinessTest\ruoyi-system\src\main\java\com\ruoyi\system\mapper\SysRoleMenuMapper.java +E:\myproject\JNBusinessTest\ruoyi-system\src\main\java\com\ruoyi\expenses\domain\lk\Payment.java E:\myproject\JNBusinessTest\ruoyi-system\src\main\java\com\ruoyi\material\service\impl\CMaterialServiceImpl.java E:\myproject\JNBusinessTest\ruoyi-system\src\main\java\com\ruoyi\redBook\service\IRedBookService.java E:\myproject\JNBusinessTest\ruoyi-system\src\main\java\com\ruoyi\materialType\domain\CMaterialType.java diff --git a/ruoyi-system/target/ruoyi-system-3.8.7.jar b/ruoyi-system/target/ruoyi-system-3.8.7.jar index fbde5e5..7d2a89b 100644 Binary files a/ruoyi-system/target/ruoyi-system-3.8.7.jar and b/ruoyi-system/target/ruoyi-system-3.8.7.jar differ diff --git a/ruoyi-ui/src/api/common/sapRfc.js b/ruoyi-ui/src/api/common/sapRfc.js index c2990c2..32bc69b 100644 --- a/ruoyi-ui/src/api/common/sapRfc.js +++ b/ruoyi-ui/src/api/common/sapRfc.js @@ -107,5 +107,14 @@ export function bankCodeList(query) { }) } +// 获取来款信息数据 +export function lkList(query) { + return request({ + url: '/rfc/rfc/lkList', + method: 'get', + params: query + }) +} + diff --git a/ruoyi-ui/src/api/expenses/expenses.js b/ruoyi-ui/src/api/expenses/expenses.js index a7e964b..98c8aee 100644 --- a/ruoyi-ui/src/api/expenses/expenses.js +++ b/ruoyi-ui/src/api/expenses/expenses.js @@ -1,5 +1,15 @@ import request from '@/utils/request' +// 金额计算 +export function toDecimal(x){ + let f = parseFloat(x); + if (isNaN(f)) { + return; + } + f = Math.round(x*100)/100; + return f; +} + // 分派 export function expAssign(query) { return request({ diff --git a/ruoyi-ui/src/views/components/Tools/ChangeRecord/index.vue b/ruoyi-ui/src/views/components/Tools/ChangeRecord/index.vue index 6e99e10..3b10322 100644 --- a/ruoyi-ui/src/views/components/Tools/ChangeRecord/index.vue +++ b/ruoyi-ui/src/views/components/Tools/ChangeRecord/index.vue @@ -1,5 +1,5 @@ @@ -670,6 +758,11 @@ font-size: 18px; font-weight: 600; } + /* 根据需求设置位置上下偏移 */ + .offset { + margin-top: 0px; /* 向上偏移5像素 */ + margin-bottom: 0px; /* 向下偏移5像素 */ + }