diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontract.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontract.java index cb3b356d92..89ec052c41 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontract.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontract.java @@ -31,6 +31,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + /** * Project: anrui-buscenter(销售订单)
* File: BusSalesOrderLoancontract.java
@@ -72,5 +74,9 @@ public class BusSalesOrderLoancontract extends BaseEntity { private String busName; // 业务阶段名称 @ApiModelProperty("业务状态码") private String busState; // 业务状态码 + @ApiModelProperty("是否生成还款计划表（0否，1是）") + private String repaymentState; // 是否生成还款计划表（0否，1是） + @ApiModelProperty("还款计划表生成时间") + private Date repaymentCreateTime; // 还款计划表生成时间 } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeign.java index 6cc0f393ec..c703ff0197 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeign.java @@ -34,6 +34,7 @@ import com.yxt.common.core.vo.PagerVo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; +import java.util.Date; import java.util.List; /** @@ -66,12 +67,12 @@ public interface BusSalesOrderLoancontractFeign { @PostMapping("/save") @ResponseBody public ResultBean save(@RequestBody BusSalesOrderLoancontractDto dto); - + @ApiOperation("根据sid删除记录") @DeleteMapping("/delBySids") @ResponseBody public ResultBean delBySids(@RequestBody String[] sids); - + @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") @ResponseBody @@ -90,12 +91,17 @@ public interface BusSalesOrderLoancontractFeign { @ApiOperation("更新资方合同号和状态") @PostMapping("/updateBankConAndBusNo") @ResponseBody - ResultBean updateBankConAndBusNo(@RequestParam("loanContractSid") String loanContractSid,@RequestParam("bankContractNo") String bankContractNo); + ResultBean updateBankConAndBusNo(@RequestParam("loanContractSid") String loanContractSid, @RequestParam("bankContractNo") String bankContractNo); + @ApiOperation("消贷合同生成还款计划表列表") @PostMapping("/listPageForRepay") @ResponseBody public ResultBean> listPageForRepay(@RequestBody PagerQuery pq); + @ApiOperation("设置是否生成还款计划状态") + @PostMapping("/setRepaymentState") + public ResultBean setRepaymentState(@RequestParam("sid") String sid, @RequestParam("createTime")String createTime); + @ApiOperation("推送融资放款的应收") @PostMapping("/pushLoanOrder") @ResponseBody @@ -124,16 +130,16 @@ public interface BusSalesOrderLoancontractFeign { @ApiOperation("根据销售订单sid及贷款人sid查询") @PostMapping("/fetchAllByOrderSidAndDkrSid") @ResponseBody - ResultBean> fetchAllByOrderSidAndDkrSid(@RequestParam("saleOrderSid") String saleOrderSid,@RequestParam("saleOrderBorrowerSid") String saleOrderBorrowerSid); + ResultBean> fetchAllByOrderSidAndDkrSid(@RequestParam("saleOrderSid") String saleOrderSid, @RequestParam("saleOrderBorrowerSid") String saleOrderBorrowerSid); @ApiOperation("根据销售订单sid和贷款人sid删除消贷合同信息") @PostMapping("/delByOrderSidAndDkrSid") @ResponseBody - ResultBean delByOrderSidAndDkrSid(@RequestParam("saleOrderSid") String saleOrderSid,@RequestParam("borrowerSid") String borrowerSid); + ResultBean delByOrderSidAndDkrSid(@RequestParam("saleOrderSid") String saleOrderSid, @RequestParam("borrowerSid") String borrowerSid); @ApiOperation("推送融资放款的其他应收单应收") @PostMapping("/pushOtherDocument") @ResponseBody ResultBean pushOtherDocument(@RequestBody PushOtherDocument push); -} \ No newline at end of file +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeignFallback.java index 4e30c02b96..bc25cbe4e2 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeignFallback.java @@ -31,6 +31,7 @@ import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import org.springframework.stereotype.Component; +import java.util.Date; import java.util.List; /** @@ -91,6 +92,11 @@ public class BusSalesOrderLoancontractFeignFallback implements BusSalesOrderLoan return null; } + @Override + public ResultBean setRepaymentState(String sid, String createTime) { + return null; + } + @Override public ResultBean pushLoanOrder(LoanContractPush loanContractPush) { return null; @@ -130,4 +136,4 @@ public class BusSalesOrderLoancontractFeignFallback implements BusSalesOrderLoan public ResultBean pushOtherDocument(PushOtherDocument push) { return null; } -} \ No newline at end of file +} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractMapper.java index ce2aba62c4..601b9e5bcf 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractMapper.java @@ -68,13 +68,13 @@ public interface BusSalesOrderLoancontractMapper extends BaseMapper selectByBorrowerSid(String saleOrderBorrowerSid); - IPage listPageForRepay(IPage page,@Param(Constants.WRAPPER) QueryWrapper qw); + IPage listPageForRepay(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); @Update("update bus_sales_order_loancontract set bankContractNo=#{bankContractNo},busNo='305',busName='放款资料审核' where sid=#{loanContractSid}") - void updateBankConAndBusNo(@Param("loanContractSid") String loanContractSid,@Param("bankContractNo") String bankContractNo); + void updateBankConAndBusNo(@Param("loanContractSid") String loanContractSid, @Param("bankContractNo") String bankContractNo); @Select("select * from bus_sales_order_loancontract where salesOrderSid = #{sid}") List fetchAllByOrderSid(String sid); @@ -85,10 +85,13 @@ public interface BusSalesOrderLoancontractMapper extends BaseMapper fetchAllByBorrowerSid(String saleOrderBorrowerSid); @Select("select * from bus_sales_order_loancontract where salesOrderSid = #{saleOrderSid} and borrowerSid = #{saleOrderBorrowerSid}") - List fetchAllByOrderSidAndDkrSid(@Param("saleOrderSid") String saleOrderSid,@Param("saleOrderBorrowerSid") String saleOrderBorrowerSid); + List fetchAllByOrderSidAndDkrSid(@Param("saleOrderSid") String saleOrderSid, @Param("saleOrderBorrowerSid") String saleOrderBorrowerSid); FinUncollectedReceivablesDetailed selectByBusVinSId(@Param("name") String name, @Param("sid") String sid); @Delete("delete from bus_sales_order_loancontract where salesOrderSid = #{saleOrderSid} and borrowerSid = #{borrowerSid}") - void delByOrderSidAndDkrSid(@Param("saleOrderSid") String saleOrderSid,@Param("borrowerSid") String borrowerSid); -} \ No newline at end of file + void delByOrderSidAndDkrSid(@Param("saleOrderSid") String saleOrderSid, @Param("borrowerSid") String borrowerSid); + + @Update("update bus_sales_order_loancontract set repaymentState = 1,repaymentCreateTime =#{createTime} where sid=#{sid}") + int setRepaymentState(@Param("sid") String sid,@Param("createTime") String createTime); +} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractMapper.xml index 4e9a9f6bf0..97d291f66b 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractMapper.xml @@ -26,7 +26,14 @@ co.bankName as bankName, co.bankContractNo as bankContractNo, co.policyName as policyName, - co.sid as salesOrderSid + co.sid as salesOrderSid, + CASE + co.repaymentState + WHEN '1' THEN + '是' + WHEN '0' THEN + '否' + END AS builded FROM bus_sales_order_loancontract AS co LEFT JOIN bus_sales_order AS bs ON co.salesOrderSid = bs.sid @@ -46,4 +53,4 @@ resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailed"> select * from anrui_fin.fin_uncollected_receivables_detailed where busVinSid = #{sid} and receivablesName = #{name} - \ No newline at end of file + diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractRest.java index 67c52ebfc6..6f645a8457 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractRest.java @@ -35,6 +35,7 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.Date; import java.util.List; /** @@ -120,6 +121,13 @@ public class BusSalesOrderLoancontractRest implements BusSalesOrderLoancontractF return rb.success().setData(pv); } + @Override + public ResultBean setRepaymentState(String sid, String createTime) { + ResultBean rb = ResultBean.fireFail(); + int i = busSalesOrderLoancontractService.setRepaymentState(sid, createTime); + return rb.success(); + } + @Override public ResultBean pushLoanOrder(LoanContractPush loanContractPush) { return busSalesOrderLoancontractService.pushLoanOrder(loanContractPush); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java index cdc2ac8a9f..b836206a31 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java @@ -84,6 +84,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.math.BigDecimal; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Collections; import java.util.Date; @@ -282,7 +283,7 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService busSalesOrderVehicles = busSalesOrderVehicleService.selByLoanContractSid(record.getSalesOrderSid()); busSalesOrderVehicles.removeAll(Collections.singleton(null)); @@ -292,19 +293,19 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService repaymentSchedule = repaymentScheduleFeign.selByLoanContractSid(record.getSalesOrderSid()); - if (repaymentSchedule.getData() != null) { - record.setBuilded("是"); - List histories = repaymentScheduleFeign.selHistoryBySid(repaymentSchedule.getData().getSid()).getData(); - if (histories.isEmpty() || histories == null) { - record.setHandleBtn(true); - } - } else { - record.setBuilded("否"); - if (StringUtils.isNotBlank(record.getBankContractNo())) { - record.setHandleBtn(true); - } - } +// ResultBean repaymentSchedule = repaymentScheduleFeign.selByLoanContractSid(record.getSalesOrderSid()); +// if (repaymentSchedule.getData() != null) { +// record.setBuilded("是"); +// List histories = repaymentScheduleFeign.selHistoryBySid(repaymentSchedule.getData().getSid()).getData(); +// if (histories.isEmpty() || histories == null) { +// record.setHandleBtn(true); +// } +// } else { +// record.setBuilded("否"); +// if (StringUtils.isNotBlank(record.getBankContractNo())) { +// record.setHandleBtn(true); +// } +// } } } } @@ -1093,4 +1094,8 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService + +
+ + 至 + +
+ 至 @@ -168,7 +175,9 @@ export default { createBySid: '', orgPath: '', menuUrl: '', - kxState: '' + kxState: '', + noMoneyStart: '', + noMoneyEnd: '' }, total: 0 } @@ -243,7 +252,9 @@ export default { createBySid: '', orgPath: '', menuUrl: '', - kxState: '' + kxState: '', + noMoneyStart: '', + noMoneyEnd: '' }, total: 0 } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedQuery.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedQuery.java index 9287390fd2..6ffa8cc43a 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedQuery.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedQuery.java @@ -87,4 +87,7 @@ public class FinUncollectedReceivablesDetailedQuery implements Query { private String menuUrl; @ApiModelProperty("0销售专员申请，1内勤申请") private String state; + + private String noMoneyStart; //未还金额开始 + private String noMoneyEnd; //未还金额结束 } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index d9b5b09e98..7a152d8d7c 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -104,6 +104,8 @@ import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanPlanDetailsVoFo import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails; import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetailsFeign; import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetailsForOverDue; +import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.LoanRepaymentSchedule; +import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.LoanRepaymentScheduleFeign; import com.yxt.anrui.riskcenter.api.loansettleapply.LoanSettleApply; import com.yxt.anrui.riskcenter.api.loansettlebankcost.LoanSettleBankCost; import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions; @@ -211,7 +213,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService createQueryWrapper(FinCollectionConfirmationQuery query) { // todo: 这里根据具体业务调整查询条件 // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); @@ -4203,10 +4206,11 @@ public class FinCollectionConfirmationService extends MybatisBaseService - \ No newline at end of file + diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java index 4ff3211d38..de4af9328e 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java @@ -120,4 +120,6 @@ public interface FinUncollectedReceivablesDetailedMapper extends BaseMapper busVinSid, @Param("kxState") String kxState); String selectOtherReceivableMoneyByBusVinSid(String busVinSid); -} \ No newline at end of file + + IPage selectPageVo2(IPage page, @Param(Constants.WRAPPER)QueryWrapper qw); +} diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml index 1823c3ddc2..00354eaada 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml @@ -356,4 +356,83 @@ FROM fin_uncollected_receivables_detailed WHERE busVinSid = #{busVinSid} - \ No newline at end of file + + diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java index 1820c57524..dfae9ec22d 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java @@ -92,7 +92,7 @@ public class FinUncollectedReceivablesDetailedRest implements FinUncollectedRece @Override public ResultBean> customerBillDetailedListPage(PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); - PagerVo pv = finUncollectedReceivablesDetailedService.detailedListPageVo(pq); + PagerVo pv = finUncollectedReceivablesDetailedService.detailedListPageVo2(pq); return rb.success().setData(pv); } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java index ae99e88f77..9cb042a700 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java @@ -390,6 +390,120 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService return qw; } + public PagerVo detailedListPageVo2(PagerQuery pq) { + //==============================分页开始==================================== + FinUncollectedReceivablesDetailedQuery params = pq.getParams(); + String orgPath = params.getOrgPath(); + String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); + params.setUseOrgSid(useOrgSid); + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(params.getMenuUrl())) { + //授权 + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(params.getOrgPath()); + privilegeQuery.setMenuUrl(params.getMenuUrl()); + privilegeQuery.setUserSid(params.getCreateBySid()); + ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + orgPath = orgPath + "/"; + int i1 = orgPath.indexOf("/"); + int i2 = orgPath.indexOf("/", i1 + 1); + int i3 = orgPath.indexOf("/", i2 + 1); + int i4 = orgPath.indexOf("/", i3 + 1); + String orgLevelKey = defaultIdReltBean.getData(); + if ("1".equals(orgLevelKey)) { + orgPath = orgPath.substring(0, i1); + qw.like("b.orgSidPath", orgPath); + } else if ("2".equals(orgLevelKey)) { + orgPath = orgPath.substring(0, i2); + qw.like("b.orgSidPath", orgPath); + } else if ("3".equals(orgLevelKey)) { + orgPath = orgPath.substring(0, i3); + qw.like("b.orgSidPath", orgPath); + } else if ("4".equals(orgLevelKey)) { + orgPath = orgPath.substring(0, i4); + qw.like("b.orgSidPath", orgPath); + } else if ("5".equals(orgLevelKey)) { + qw.eq("b.createBySid", params.getCreateBySid()); + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } else { + qw.eq("b.useOrgSid", params.getUseOrgSid()); + } + //车架号查询 + if (StringUtils.isNotBlank(params.getVinNo())) { + qw.like("b.vinNo", params.getVinNo()); + } + if (StringUtils.isNotBlank(params.getKxState())) { + qw.like("b.kxState", params.getKxState()); + } + if (StringUtils.isNotBlank(params.getContractNo())) { + qw.like("b.contractNo", params.getContractNo()); + } + if (StringUtils.isNotBlank(params.getCustomerName())) { + qw.like("b.customerName", params.getCustomerName()); + } + if (StringUtils.isNotBlank(params.getReceivablesName())) { + qw.like("b.receivablesName", params.getReceivablesName()); + } + String createStartTime = params.getCreateStartTime(); + String createEndTime = params.getCreateEndTime(); + qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (b.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). + apply(StringUtils.isNotEmpty(createEndTime), "date_format (b.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" + ); + String noMoneyStart = params.getNoMoneyStart(); + String noMoneyEnd = params.getNoMoneyEnd(); + qw.apply(StringUtils.isNotEmpty(noMoneyStart), "b.noSubscriptionMoney >=" + noMoneyStart). + apply(StringUtils.isNotEmpty(noMoneyEnd), "b.noSubscriptionMoney <=" + noMoneyEnd + ); + qw.orderByDesc("b.createTime"); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo2(page, qw); + //=============================分页结束====================================== + List records = pagging.getRecords(); + for (FinUncollectedReceivablesDetailedVo record : records) { + record.setDownload(false); + //获取单条对应的应收未收sid + String sid = record.getSid(); + BigDecimal noSubscriptionMoney = new BigDecimal(record.getNoSubscriptionMoney()); + String busVinSid = record.getBusVinSid(); + BusSalesOrderVehicle data = busSalesOrderVehicleFeign.fetchBySalesOrderVehiclerSid(busVinSid).getData(); + if (null != data) { + String salesOrderSid = data.getSalesOrderSid(); + FinUncollectedReceivablesDetailedPdfVo pdfVo = baseMapper.selectPdf(sid); + if (null != pdfVo) { + //根据销售订单编号查询金融方案 分别取出保证金 + SolutionsDetailsVo svo = loanSolutionsFeign.selectDetails(salesOrderSid).getData(); + if (noSubscriptionMoney.compareTo(BigDecimal.ZERO) <= 0) { + if (null != svo) { + if ((StringUtils.isNotBlank(svo.getBondAmounts()) && !("0.00").equals(svo.getBondAmounts()) && !("0").equals(svo.getBondAmounts())) + || (StringUtils.isNotBlank(svo.getDepositPremium()) && !("0.00").equals(svo.getDepositPremium()) && !("0").equals(svo.getDepositPremium())) + || (StringUtils.isNotBlank(svo.getDepositSettle()) && !("0.00").equals(svo.getDepositSettle())) && !("0").equals(svo.getDepositSettle())) { + BaseVehicleState vehicleState = baseVehicleStateFeign.selectOneByBusSidAndOrderSid(record.getBusVinSid(), salesOrderSid).getData(); + if (null != vehicleState) { + if (StringUtils.isNotBlank(vehicleState.getFinState())) { + if (vehicleState.getFinState().equals("1")) { + record.setDownload(true); + } + } + } + } + } + } + } + } + } + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + public PagerVo detailedListPageVo(PagerQuery pq) { //==============================分页开始==================================== FinUncollectedReceivablesDetailedQuery params = pq.getParams(); @@ -1030,4 +1144,4 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService String otherReceivableMoney = baseMapper.selectOtherReceivableMoneyByBusVinSid(busVinSid); return rb.success().setData(otherReceivableMoney); } -} \ No newline at end of file +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanPlanDetailsVoForLateVoucher.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanPlanDetailsVoForLateVoucher.java index e11b74f02f..213aa6ffc7 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanPlanDetailsVoForLateVoucher.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanPlanDetailsVoForLateVoucher.java @@ -17,4 +17,5 @@ public class LoanPlanDetailsVoForLateVoucher { private String busVinSid; private String salesOrderSid; private String loanContractNo; + private String scheduleSid; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentSchedule.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentSchedule.java index 526c56660a..3b21f7fa81 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentSchedule.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentSchedule.java @@ -72,6 +72,8 @@ public class LoanRepaymentSchedule extends BaseEntity { private String bankContractNo; @ApiModelProperty("其他融资方合同号") private String otherBankNo; + @ApiModelProperty("推送财务凭证部门编码") + private String cwDeptNo; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeign.java index 3e36e8eb4b..240493d92e 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeign.java @@ -33,6 +33,12 @@ public interface LoanRepaymentScheduleFeign { @ResponseBody public ResultBean loanCreateSchedule(@RequestParam("salesOrderSid") String salesOrderSid); + @ApiOperation("根据sid查询实体") + @GetMapping("/fetchBySid") + @ResponseBody + public ResultBean fetchBySid(@RequestParam("sid") String sid); + + @ApiOperation("生成还款计划表") @PostMapping("/loanCreateSchedulePdf") @ResponseBody diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeignFallback.java index 857b905951..2b4aa92a42 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeignFallback.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeignFallback.java @@ -21,6 +21,11 @@ public class LoanRepaymentScheduleFeignFallback implements LoanRepaymentSchedule return null; } + @Override + public ResultBean fetchBySid(String sid) { + return null; + } + @Override public ResultBean loanCreateSchedulePdf(LoanCreateSchedulePdfVo dto) { return null; diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java index aabd8f813c..4ea97bfd16 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java @@ -81,6 +81,7 @@ import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.LoanRepaymentHistory; import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanPlanDetailsVoForFundVoucher; import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails; import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanMoneyVo; +import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.LoanRepaymentSchedule; import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.LoanRepaymentScheduleDetailsVo; import com.yxt.anrui.riskcenter.api.loantransferpaymentapply.LoanTransferPaymentApply; import com.yxt.anrui.riskcenter.api.loantransferpaymentapply.LoanTransferPaymentRecordVo; @@ -1161,8 +1162,13 @@ public class LoanBePadsincereApplyService extends MybatisBaseService recordVos = baseMapper.dkListPageExport(qw); return recordVos; } -} \ No newline at end of file +} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyService.java index 178a69b88d..0ba26cdfe7 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyService.java @@ -50,11 +50,13 @@ import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.LoanRepaymentHistory; import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.LoanRepaymentHistoryRecordVo; import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanPlanDetailsVoForLateVoucher; import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails; +import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.LoanRepaymentSchedule; import com.yxt.anrui.riskcenter.biz.loanbuckleapplyrecord.LoanBuckleApplyRecordService; import com.yxt.anrui.riskcenter.biz.loanbuckleplanhistory.LoanBucklePlanHistoryService; import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService; import com.yxt.anrui.riskcenter.biz.loanrepaymenthistory.LoanRepaymentHistoryService; import com.yxt.anrui.riskcenter.biz.loanrepaymentplandetails.LoanRepaymentPlanDetailsService; +import com.yxt.anrui.riskcenter.biz.loanrepaymentschedule.LoanRepaymentScheduleService; import com.yxt.common.base.config.component.DocPdfComponent; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; @@ -135,6 +137,8 @@ public class LoanBuckleApplyService extends MybatisBaseService listPage(PagerQuery pq) { IPage page = PagerUtil.queryToPage(pq); @@ -700,11 +704,12 @@ public class LoanBuckleApplyService extends MybatisBaseService accrualInit(String orgPath) { ResultBean rb = ResultBean.fireFail(); String orgSidPath = orgPath; @@ -701,11 +704,13 @@ public class LoanMonthlyAccrualApplyService extends MybatisBaseService saveHistory(LoanRepaymentHistoryDto dto) { ResultBean rb = ResultBean.fireFail(); LoanRepaymentHistory entity = new LoanRepaymentHistory(); @@ -855,11 +858,12 @@ public class LoanRepaymentHistoryService extends MybatisBaseService selPushLaterVoucherOnBuckle(@Param("planSids") List planSids); LoanRepaymentPlanDetails fetchMainBankByBusVinSid(@Param("busVinSid") String busVinSid); + + String fetchCwDeptCodeByBusVinSid(@Param("busVinSid") String busVinSid); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml index f23e685cd8..82a6cdb51d 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml @@ -267,7 +267,8 @@ b.useOrgSid, b.deptSid, b.busVinSid, - b.salesOrderSid + b.salesOrderSid, + b.scheduleSid FROM ( SELECT a.*, IFNULL((SELECT (fjj.reveivableMoney - fjj.m) @@ -281,7 +282,8 @@ WHERE j.payCostTitleKey = '006') as fj) as fjj WHERE fjj.busSid = a.sid), 0) as fund FROM ( - SELECT pd.loanContractNo, + SELECT pd.scheduleSid, + pd.loanContractNo, pd.oweState, pd.dueDate, pd.useOrgSid, @@ -692,6 +694,7 @@ resultType="com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanPlanDetailsVoForLateVoucher"> SELECT b.loanContractNo, b.sid AS planSid, + b.scheduleSid, CASE WHEN (b.outstandingMoney + b.bankBeInter + b.fund) > 0 THEN @@ -719,6 +722,7 @@ FROM ( SELECT pd.loanContractNo, pd.oweState, + pd.scheduleSid, pd.dueDate, pd.useOrgSid, pd.deptSid, @@ -774,4 +778,20 @@ resultType="com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails"> select * from loan_repayment_plan_details where busVinSid =#{busVinSid} and policyOrOther = '0' limit 1 - \ No newline at end of file + + diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java index 66a54de13e..74e7e11b3d 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java @@ -29,6 +29,7 @@ import com.yxt.anrui.riskcenter.biz.loanrepaymentschedule.LoanRepaymentScheduleS import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.core.result.ResultBean; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -234,14 +235,15 @@ public class LoanRepaymentPlanDetailsService extends MybatisBaseService fetchBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + LoanRepaymentSchedule repaymentSchedule = loanRepaymentScheduleService.fetchBySid(sid); + return rb.success().setData(repaymentSchedule); + } + @Override public ResultBean loanCreateSchedulePdf(LoanCreateSchedulePdfVo dto) { return loanRepaymentScheduleService.loanCreateSchedulePdf(dto); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java index 12fd2bdc38..8f9813e38a 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java @@ -1,6 +1,7 @@ package com.yxt.anrui.riskcenter.biz.loanrepaymentschedule; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -385,9 +386,14 @@ public class LoanRepaymentScheduleService extends MybatisBaseService busSalesOrderVehicles = busSalesOrderVehicleFeign.selbyContractSid(dto.getSalesOrderSid()).getData(); busSalesOrderVehicles.removeAll(Collections.singleton(null)); @@ -1220,11 +1232,15 @@ public class LoanRepaymentScheduleService extends MybatisBaseService { pushScheduleVoucher(schedule); }); - + //设置消贷合同是否生成还款计划状态 + Future future3 = pool.submit(() -> { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + busSalesOrderLoancontractFeign.setRepaymentState(dto.getSalesOrderSid(),sdf.format(new Date())); + }); } catch (Exception e) { e.printStackTrace(); } @@ -1331,14 +1347,12 @@ public class LoanRepaymentScheduleService extends MybatisBaseService paymentInit(String[] sids) { ResultBean rb = ResultBean.fireFail(); LoanTransferPaymentApplyInit vo = new LoanTransferPaymentApplyInit(); @@ -889,10 +892,9 @@ public class LoanTransferPaymentApplyService extends MybatisBaseService import('@/views/operation/preregistration/preregistration.vue'), name: 'Preregistration', - meta: { - title: '预约登记', - noCache: true - } + meta: { title: '预约单管理', noCache: true } }, { path: '/repairbill/repairbill', component: () => import('@/views/operation/repairbill/repairbill.vue'), name: 'RepairBill', - meta: { - title: '维修开单管理(登记)', - noCache: true - } + meta: { title: '维修开单管理(登记)', noCache: true } }, { path: '/repairbill/repairbillBySendWork', component: () => import('@/views/operation/repairbill/repairbillBySendWork.vue'), name: 'RepairBillBySendWork', - meta: { - title: '维修开单管理(派工)', - noCache: true - } + meta: { title: '维修开单管理(派工)', noCache: true } }, { path: '/repairbill/repairbillByMaintain', component: () => import('@/views/operation/repairbill/repairbillByMaintain.vue'), name: 'RepairBillByMaintain', - meta: { - title: '维修开单管理(维修)', - noCache: true - } + meta: { title: '维修开单管理(维修)', noCache: true } }, { path: '/repairbill/repairbillByBeCompleted', component: () => import('@/views/operation/repairbill/repairbillByBeCompleted.vue'), name: 'RepairBillByBeCompleted', - meta: { - title: '维修开单管理(竣工)', - noCache: true - } + meta: { title: '维修开单管理(竣工)', noCache: true } }, { path: '/repairbill/repairbillBySettleAccounts', component: () => import('@/views/operation/repairbill/repairbillBySettleAccounts.vue'), name: 'RepairBillBySettleAccounts', - meta: { - title: '维修开单管理(结算)', - noCache: true - } + meta: { title: '维修开单管理(结算)', noCache: true } }, { path: '/repairbill/repairbillBYLeaveFactory', component: () => import('@/views/operation/repairbill/repairbillBYLeaveFactory.vue'), name: 'RepairBillBYLeaveFactory', - meta: { - title: '维修开单管理(出厂)', - noCache: true - } - }, + meta: { title: '维修开单管理(出厂)', noCache: true } + } // { // path: '/workslrsettlement/workslrsettlement', // component: () => import('@/views/operation/workslrsettlement/workslrsettlement.vue'), @@ -127,43 +107,31 @@ export const constantRoutes = [{ meta: { title: '仓库管理' }, - children: [{ + children: [ + { path: '/goodsShelves/index', component: () => import('@/views/warehouse/goodsShelves/index.vue'), name: 'GoodsShelves', - meta: { - title: '库位管理', - noCache: true - } + meta: { title: '库位管理', noCache: true } }, { path: '/warehouseArea/index', component: () => import('@/views/warehouse/warehouseArea/index.vue'), name: 'WarehouseArea', - meta: { - title: '库区管理', - noCache: true - } + meta: { title: '库区管理', noCache: true } }, { path: '/warehouseAreaType/index', component: () => import('@/views/warehouse/warehouseAreaType/index.vue'), name: 'WarehouseAreaType', - meta: { - title: '库区类型管理', - noCache: true - } + meta: { title: '库区类型管理', noCache: true } }, { path: '/warehouse/index', component: () => import('@/views/warehouse/warehouse/index.vue'), name: 'Warehouse', - meta: { - title: '仓库管理', - noCache: true - } - }, - + meta: { title: '仓库管理', noCache: true } + } ] }, @@ -174,51 +142,37 @@ export const constantRoutes = [{ meta: { title: '商品管理' }, - children: [{ + children: [ + { path: '/brands/index', component: () => import('@/views/goods/brands/index.vue'), name: 'Brands', - meta: { - title: '品牌管理', - noCache: true - } + meta: { title: '品牌管理', noCache: true } }, { path: '/category/index', component: () => import('@/views/goods/category/index.vue'), name: 'Category', - meta: { - title: '类别管理', - noCache: true - } + meta: { title: '类别管理', noCache: true } }, { path: '/factory/index', component: () => import('@/views/goods/factory/index.vue'), name: 'Factory', - meta: { - title: '厂家管理', - noCache: true - } + meta: { title: '厂家管理', noCache: true } }, { path: '/goods/index', component: () => import('@/views/goods/goods/index.vue'), name: 'Goods', - meta: { - title: '商品管理', - noCache: true - } + meta: { title: '商品管理', noCache: true } }, { path: '/unit/index', component: () => import('@/views/goods/unit/index.vue'), name: 'Unit', - meta: { - title: '单位管理', - noCache: true - } - }, + meta: { title: '单位管理', noCache: true } + } ] }, { @@ -228,132 +182,109 @@ export const constantRoutes = [{ meta: { title: '仓储' }, - children: [{ + children: [ + { path: '/outStorage/index', - name: 'OutStorage', component: () => import('@/views/storage/outStorage/index'), - meta: { - title: '出库管理', - noCache: true - } + name: 'OutStorage', + meta: { title: '出库管理', noCache: true } }, { path: '/inventory/inventory', component: () => import('@/views/storage/inventory/inventory.vue'), name: 'Inventory', - meta: { - title: '库存查询', - noCache: true - } + meta: { title: '库存查询', noCache: true } }, { path: '/inventory/inventoryRefer', component: () => import('@/views/storage/inventory/inventoryRefer.vue'), name: 'InventoryRefer', - meta: { - title: '出入库查询', - noCache: true - } + meta: { title: '出入库查询', noCache: true } }, { path: '/stocktaking/index', - name: 'Stocktaking', component: () => import('@/views/storage/stocktaking/index'), - meta: { - title: '盘点管理', - noCache: true - } + name: 'Stocktaking', + meta: { title: '盘点管理', noCache: true } }, { path: '/allocation/index', - name: 'Allocation', component: () => import('@/views/storage/allocation/index'), - meta: { - title: '调拨管理', - noCache: true - } + name: 'Allocation', + meta: { title: '调拨管理', noCache: true } }, { path: '/deliveryNotice/index', - name: 'DeliveryNotice', component: () => import('@/views/storage/deliveryNotice/index'), - meta: { - title: '到货通知单', - noCache: true - } + name: 'DeliveryNotice', + meta: { title: '到货通知单', noCache: true } }, { path: '/receivingGoods/index', - name: 'ReceivingGoods', component: () => import('@/views/storage/receivingGoods/index'), - meta: { - title: '收货单管理', - noCache: true - } + name: 'ReceivingGoods', + meta: { title: '收货单管理', noCache: true } }, { path: '/upShelf/index', - name: 'UpShelf', component: () => import('@/views/storage/upShelf/index'), - meta: { - title: '上架单管理', - noCache: true - } + name: 'UpShelf', + meta: { title: '上架单管理', noCache: true } }, { path: '/oldPartsFactory/index', - name: 'OldPartsFactory', component: () => import('@/views/storage/oldPartsFactory/index'), - meta: { - title: '旧件返厂', - noCache: true - } + name: 'OldPartsFactory', + meta: { title: '旧件返厂', noCache: true } }, { path: '/oldPartsCope/index', - name: 'OldPartsCope', component: () => import('@/views/storage/oldPartsCope/index'), - meta: { - title: '旧件处理', - noCache: true - } + name: 'OldPartsCope', + meta: { title: '旧件处理', noCache: true } }, { path: '/oldPartsRecovery/index', - name: 'OldPartsRecovery', component: () => import('@/views/storage/oldPartsRecovery/index'), - meta: { - title: '旧件回收', - noCache: true - } + name: 'OldPartsRecovery', + meta: { title: '旧件回收', noCache: true } }, { path: '/oldPartsInStorage/index', - name: 'OldPartsInStorage', component: () => import('@/views/storage/oldPartsInStorage/index'), - meta: { - title: '旧件入库', - noCache: true - } + name: 'OldPartsInStorage', + meta: { title: '旧件入库', noCache: true } }, { path: '/oldPartsInvertory/index', - name: 'OldPartsInvertory', component: () => import('@/views/storage/oldPartsInvertory/index'), - meta: { - title: '旧件库存', - noCache: true - } + name: 'OldPartsInvertory', + meta: { title: '旧件库存', noCache: true } }, { path: '/oldPartsInAndOutStorage/index', - name: 'OldPartsInAndOutStorage', component: () => import('@/views/storage/oldPartsInAndOutStorage/index'), - meta: { - title: '旧件出入库查询', - noCache: true - } + name: 'OldPartsInAndOutStorage', + meta: { title: '旧件出入库查询', noCache: true } }, + { + path: '/storageage/storageage', + component: () => import('@/views/storage/storageage/storageage'), + name: 'StorageAge', + meta: { title: '库龄查询', noCache: true } + }, + { + path: '/carryover/carryoverstock', + component: () => import('@/views/storage/carryover/carryoverstock'), + name: 'CarryoverStock', + meta: { title: '结转库存查询', noCache: true } + }, + { + path: '/carryover/carryforwardrecord', + component: () => import('@/views/storage/carryover/carryforwardrecord'), + name: 'CarryForwardRecord', + meta: { title: '结转记录查询', noCache: true } + } ] }, @@ -364,23 +295,18 @@ export const constantRoutes = [{ meta: { title: '采购' }, - children: [{ + children: [ + { path: '/procurement/procurement', component: () => import('@/views/purchase/procurement/procurement.vue'), name: 'Procurement', - meta: { - title: '采购开单', - noCache: true - } + meta: { title: '采购单管理', noCache: true } }, { path: '/purchasereturn/purchasereturn', component: () => import('@/views/purchase/purchasereturn/purchasereturn.vue'), name: 'PurchaseReturn', - meta: { - title: '采购退货', - noCache: true - } + meta: { title: '采购退货', noCache: true } } ] }, @@ -391,68 +317,48 @@ export const constantRoutes = [{ meta: { title: '报表' }, - children: [{ + children: [ + { path: '/salesstatement/merchandisesalesdetail', component: () => import('@/views/statement/salesstatement/merchandisesalesdetail.vue'), name: 'MerchandiseSalesDetail', - meta: { - title: '销售明细商品', - noCache: true - } + meta: { title: '销售明细商品', noCache: true } }, { path: '/salesstatement/merchandisesalessummary', component: () => import('@/views/statement/salesstatement/merchandisesalessummary.vue'), name: 'MerchandiseSalesSummary', - meta: { - title: '销售汇总商品', - noCache: true - } + meta: { title: '销售汇总商品', noCache: true } }, { path: '/salesstatement/salestrendreport', component: () => import('@/views/statement/salesstatement/salestrendreport.vue'), name: 'SalesTrendReport', - meta: { - title: '销售价趋势报表', - noCache: true - } + meta: { title: '销售价趋势报表', noCache: true } }, { path: '/warehousereport/inventorystatistics', component: () => import('@/views/statement/warehousereport/inventorystatistics.vue'), name: 'InventoryStatistics', - meta: { - title: '库存统计', - noCache: true - } + meta: { title: '库存统计', noCache: true } }, { path: '/warehousereport/receiptandreceiptrecord', component: () => import('@/views/statement/warehousereport/receiptandreceiptrecord.vue'), name: 'ReceiptAndReceiptRecord', - meta: { - title: '收发存明细报表', - noCache: true - } + meta: { title: '收发存明细报表', noCache: true } }, { path: '/purchasereport/detailedpurchasereport', component: () => import('@/views/statement/purchasereport/detailedpurchasereport.vue'), name: 'DetailedPurchaseReport', - meta: { - title: '采购明细报表', - noCache: true - } + meta: { title: '采购明细报表', noCache: true } }, { path: '/purchasereport/purchasesummaryreport', component: () => import('@/views/statement/purchasereport/purchasesummaryreport.vue'), name: 'PurchaseSummaryReport', - meta: { - title: '采购汇总报表', - noCache: true - } + meta: { title: '采购汇总报表', noCache: true } } ] }, @@ -463,68 +369,48 @@ export const constantRoutes = [{ meta: { title: '基础信息' }, - children: [{ + children: [ + { path: '/maintenanceitem/maintenanceitem', component: () => import('@/views/basicinformation/maintenanceitem/maintenanceitem.vue'), name: 'MaintenanceItem', - meta: { - title: '维修项目管理', - noCache: true - } + meta: { title: '维修项目管理', noCache: true } }, { path: '/additionitem/additionitem', component: () => import('@/views/basicinformation/additionitem/additionitem.vue'), name: 'AdditionItem', - meta: { - title: '附加项目管理', - noCache: true - } + meta: { title: '附加项目管理', noCache: true } }, { path: '/setmeal/setmeal', component: () => import('@/views/basicinformation/setmeal/setmeal.vue'), name: 'Setmeal', - meta: { - title: '套餐管理', - noCache: true - } + meta: { title: '套餐管理', noCache: true } }, { path: '/profession/profession', component: () => import('@/views/basicinformation/profession/profession.vue'), name: 'Profession', - meta: { - title: '工种管理', - noCache: true - } + meta: { title: '工种管理', noCache: true } }, { path: '/subjects/subjects', component: () => import('@/views/basicinformation/subjects/subjects.vue'), name: 'Subjects', - meta: { - title: '科目管理', - noCache: true - } + meta: { title: '科目管理', noCache: true } }, { path: '/team/team', component: () => import('@/views/basicinformation/team/team.vue'), name: 'Team', - meta: { - title: '班组管理', - noCache: true - } + meta: { title: '班组管理', noCache: true } }, { path: '/suppliertype/suppliertype', component: () => import('@/views/basicinformation/suppliertype/suppliertype.vue'), name: 'SupplierType', - meta: { - title: '供应商类型管理', - noCache: true - } + meta: { title: '供应商类型管理', noCache: true } }, { path: '/supplier/supplier', @@ -533,7 +419,7 @@ export const constantRoutes = [{ meta: { title: '供应商管理', noCache: true } } ] - }, + } // 404 page must be placed at the end !!! // { path: '*', redirect: '/404', hidden: true } ] diff --git a/yxt-as-ui/src/views/operation/preregistration/preregistration.vue b/yxt-as-ui/src/views/operation/preregistration/preregistration.vue index 663d57bf4c..8d6e5a4dbf 100644 --- a/yxt-as-ui/src/views/operation/preregistration/preregistration.vue +++ b/yxt-as-ui/src/views/operation/preregistration/preregistration.vue @@ -39,7 +39,7 @@ - + @@ -69,14 +69,14 @@ - + @@ -86,12 +86,12 @@ - + - + @@ -203,6 +203,7 @@ export default { createDept: '', createByName: '', billNo: '', + waitorName: '', startCreateDate: '', endCreateDate: '' } @@ -305,6 +306,7 @@ export default { createDept: '', createByName: '', billNo: '', + waitorName: '', startCreateDate: '', endCreateDate: '' } diff --git a/yxt-as-ui/src/views/operation/preregistration/preregistrationAdd.vue b/yxt-as-ui/src/views/operation/preregistration/preregistrationAdd.vue index e0f796abb2..8f905dfae0 100644 --- a/yxt-as-ui/src/views/operation/preregistration/preregistrationAdd.vue +++ b/yxt-as-ui/src/views/operation/preregistration/preregistrationAdd.vue @@ -46,7 +46,7 @@
至 - +
@@ -78,15 +78,15 @@ {{ formobj.customerOrg }} -
服务项目
+
+
服务项目
+ 添加 +
- - + @@ -138,7 +138,7 @@ - + @@ -205,7 +205,8 @@ export default { orgPath: '', createTime: '', vinNo: '', - trackLogs: '', + trackLog: '', + trackLogs: [], createDeptSid: '', createDept: '', customerOrg: '' @@ -214,6 +215,12 @@ export default { } }, methods: { + // 限制日期不可选择开始日期之前的 + pickerEndData(newtime) { + return { + disabledDate(time) { return time.getTime() < new Date(newtime) - 1000 * 60 * 60 * 24 } + } + }, init() { selAllByOrgSidPath({ orgSidPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => { if (resp.success) { @@ -227,7 +234,7 @@ export default { this.$refs['form_obj'].clearValidate() }) this.init() - this.formobj.orgSidPath = window.sessionStorage.getItem('defaultOrgPath') + this.formobj.orgPath = window.sessionStorage.getItem('defaultOrgPath') this.formobj.createByName = window.sessionStorage.getItem('name') this.formobj.createBySid = window.sessionStorage.getItem('userSid') this.formobj.createDept = window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1) @@ -339,10 +346,10 @@ export default { row.hours = Math.round((parseFloat(row.price === '' ? '0' : row.price) / parseFloat(row.hourPrice === '' ? '0' : row.hourPrice)) * 100) / 100 }, handleClick(value) { - this.formobj.trackLogs = value + this.formobj.trackLog = value }, handleAdd() { - if (this.formobj.trackLogs !== '') { + if (this.formobj.trackLog !== '') { req.saveTrackingRecord(this.formobj).then((res) => { if (res.success) { this.$message({ showClose: true, type: 'success', message: '添加成功' }) @@ -355,6 +362,10 @@ export default { saveOrUpdate() { this.$refs['form_obj'].validate((valid) => { if (valid) { + if (this.formobj.sitemVos.length === 0) { + this.$message({ showClose: true, type: 'error', message: '服务项目列表不能为空' }) + return + } this.submitdisabled = true req.saveOrUpdate(this.formobj).then((res) => { if (res.success) { @@ -372,6 +383,10 @@ export default { toService() { this.$refs['form_obj'].validate((valid) => { if (valid) { + if (this.formobj.sitemVos.length === 0) { + this.$message({ showClose: true, type: 'error', message: '服务项目列表不能为空' }) + return + } if (this.formobj.sitemVos.length === 0) { this.$message({ showClose: true, type: 'error', message: '表格不能为空' }) return @@ -439,7 +454,8 @@ export default { orgPath: '', createTime: '', vinNo: '', - trackLogs: '', + trackLog: '', + trackLogs: [], createDeptSid: '', createDept: '', customerOrg: '' @@ -462,4 +478,11 @@ export default { margin-left: 120px !important; width: calc(100% - 115px); } +.titleOne{ + padding: 7px; + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: center; +} diff --git a/yxt-as-ui/src/views/operation/preregistration/preregistrationInfo.vue b/yxt-as-ui/src/views/operation/preregistration/preregistrationInfo.vue index 98c9ad99bd..8ed6eed384 100644 --- a/yxt-as-ui/src/views/operation/preregistration/preregistrationInfo.vue +++ b/yxt-as-ui/src/views/operation/preregistration/preregistrationInfo.vue @@ -74,11 +74,10 @@
跟踪记录
- - - {{ formobj.trackLogs }} - - + + + + @@ -94,6 +93,8 @@ export default { viewState: 1, index: 0, serviceKey: 0, + tableKey: 1, + list: [], formobj: { sid: '', createBySid: '', @@ -113,7 +114,8 @@ export default { orgPath: '', createTime: '', vinNo: '', - trackLogs: '', + trackLog: '', + trackLogs: [], createDeptSid: '', createDept: '', customerOrg: '' @@ -126,6 +128,13 @@ export default { req.fetchBySid(row.sid).then((res) => { if (res.success) { this.formobj = res.data + if (this.formobj.trackLogs.length > 0) { + this.formobj.trackLogs.forEach((e) => { + this.list.push({ + name: e + }) + }) + } } }) }, @@ -149,13 +158,14 @@ export default { orgPath: '', createTime: '', vinNo: '', - trackLogs: '', + trackLog: '', + trackLogs: [], createDeptSid: '', createDept: '', customerOrg: '' } this.$emit('doback') - }, + } } } diff --git a/yxt-as-ui/src/views/storage/carryover/carryforwardrecord.vue b/yxt-as-ui/src/views/storage/carryover/carryforwardrecord.vue new file mode 100644 index 0000000000..a889f46840 --- /dev/null +++ b/yxt-as-ui/src/views/storage/carryover/carryforwardrecord.vue @@ -0,0 +1,224 @@ + + + + diff --git a/yxt-as-ui/src/views/storage/carryover/carryoverstock.vue b/yxt-as-ui/src/views/storage/carryover/carryoverstock.vue new file mode 100644 index 0000000000..47b0124e05 --- /dev/null +++ b/yxt-as-ui/src/views/storage/carryover/carryoverstock.vue @@ -0,0 +1,227 @@ + + + + diff --git a/yxt-as-ui/src/views/storage/storageage/storageage.vue b/yxt-as-ui/src/views/storage/storageage/storageage.vue new file mode 100644 index 0000000000..2ea10c3496 --- /dev/null +++ b/yxt-as-ui/src/views/storage/storageage/storageage.vue @@ -0,0 +1,229 @@ + + + + diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBill.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBill.java index 7e31971995..f5015cfc59 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBill.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBill.java @@ -90,8 +90,6 @@ public class AsBusreserveBill extends BaseEntity { private String createOrgName; // 创建组织 @ApiModelProperty("组织全路径") private String orgSidPath; // 组织全路径 - @ApiModelProperty("跟踪记录") - private String trackLogs; // 跟踪记录 @ApiModelProperty("制单部门sid") private String createDeptSid; // 制单部门sid @ApiModelProperty("制单部门") diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillDetailsVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillDetailsVo.java index f1e046e570..05bc38d5be 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillDetailsVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillDetailsVo.java @@ -90,8 +90,6 @@ public class AsBusreserveBillDetailsVo implements Vo { private String useOrgSid; // 使用组织sid @ApiModelProperty("创建组织sid") private String createOrgSid; // 创建组织sid - @ApiModelProperty("跟踪记录") - private String trackLogs; // 跟踪记录 @ApiModelProperty("制单部门sid") private String createDeptSid; // 制单部门sid @ApiModelProperty("制单部门") @@ -99,4 +97,8 @@ public class AsBusreserveBillDetailsVo implements Vo { @ApiModelProperty("客户单位") private String customerOrg; // 客户单位 private List sitemVos = new ArrayList<>(); + @ApiModelProperty("跟踪记录") + private List trackLogs = new ArrayList<>(); // 跟踪记录 + @ApiModelProperty("跟踪记录") + private String trackLog; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillDto.java index dd360bab8a..42dc1fa5e0 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillDto.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillDto.java @@ -90,8 +90,6 @@ public class AsBusreserveBillDto implements Dto { private String useOrgSid; // 使用组织sid @ApiModelProperty("创建组织sid") private String createOrgSid; // 创建组织sid - @ApiModelProperty("跟踪记录") - private String trackLogs; // 跟踪记录 @ApiModelProperty("制单部门sid") private String createDeptSid; // 制单部门sid @ApiModelProperty("制单部门") @@ -99,6 +97,8 @@ public class AsBusreserveBillDto implements Dto { @ApiModelProperty("客户单位") private String customerOrg; // 客户单位 private List sitemVos = new ArrayList<>(); - - -} \ No newline at end of file + @ApiModelProperty("跟踪记录") + private List trackLogs = new ArrayList<>(); // 跟踪记录 + @ApiModelProperty("跟踪记录") + private String trackLog; +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillQuery.java index 6660a320f7..5b1069fc83 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillQuery.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillQuery.java @@ -76,5 +76,7 @@ public class AsBusreserveBillQuery implements Query { private String startDate; // 预约时间开始 private String endDate; // 预约时间开始 private String state; + @ApiModelProperty("预约服务顾问") + private String waitorName; // 预约服务顾问 } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillVo.java index 4a2aea897c..b627e65dc6 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillVo.java @@ -68,13 +68,15 @@ public class AsBusreserveBillVo implements Vo { private String customerName; // 客户名称 @ApiModelProperty("车牌号") private String vehMark; // 车牌号 + @ApiModelProperty("车架号") + private String vinNo; // 车架号 @ApiModelProperty("联系电话") private String mobile; // 联系电话 @ApiModelProperty("预约时间开始") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") private Date reserveStart; // 预约时间开始 @ApiModelProperty("预约时间截止") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") private Date reserveEnd; // 预约时间截止 @ApiModelProperty("预约服务顾问") private String waitorName; // 预约服务顾问 diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebilltrack/AsBusreserveBillTrack.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebilltrack/AsBusreserveBillTrack.java new file mode 100644 index 0000000000..b9b4b0699e --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebilltrack/AsBusreserveBillTrack.java @@ -0,0 +1,59 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.as.api.asbusreservebilltrack; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * Project: as(as)
+ * File: AsBusreserveBill.java
+ * Class: as.api.asbusreservebill.AsBusreserveBill
+ * Description: 预约单.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-04-09 17:01:49
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "预约单-跟踪记录", description = "预约单-跟踪记录") +@TableName("as_busreserve_bill_track") +public class AsBusreserveBillTrack extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("预约单sid") + private String billSid; // 预约单sid + +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillService.java index 9a9af58e97..c76468eaa5 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillService.java @@ -33,11 +33,13 @@ import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBillDto; import com.yxt.anrui.as.api.asbusrepairbill.SitemVo; import com.yxt.anrui.as.api.asbusreservebill.*; import com.yxt.anrui.as.api.asbusreservebillsitem.AsBusreserveBillSitem; +import com.yxt.anrui.as.api.asbusreservebilltrack.AsBusreserveBillTrack; import com.yxt.anrui.as.api.enums.AsBillTypeEnum; import com.yxt.anrui.as.api.utils.AsRule; import com.yxt.anrui.as.api.utils.domain.AsBillNo; import com.yxt.anrui.as.biz.asbusrepairbill.AsBusrepairBillService; import com.yxt.anrui.as.biz.asbusreservebillsitem.AsBusreserveBillSitemService; +import com.yxt.anrui.as.biz.asbusreservebilltrack.AsBusreserveBillTrackService; import com.yxt.anrui.as.feign.portal.privilege.PrivilegeQuery; import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationFeign; import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationVo; @@ -83,6 +85,9 @@ public class AsBusreserveBillService extends MybatisBaseService createQueryWrapper(AsBusreserveBillQuery query) { // todo: 这里根据具体业务调整查询条件 // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); @@ -91,16 +96,16 @@ public class AsBusreserveBillService extends MybatisBaseService asBusreserveBillTracks = asBusreserveBillTrackService.fetchByMainSid(sid); + if (!asBusreserveBillTracks.isEmpty()) { + List remarks = new ArrayList<>(); + for (AsBusreserveBillTrack asBusreserveBillTrack : asBusreserveBillTracks) { + if (StringUtils.isNotBlank(asBusreserveBillTrack.getRemarks())) { + remarks.add(asBusreserveBillTrack.getRemarks()); + } + } + vo.setTrackLogs(remarks); + } } return vo; } @@ -318,10 +336,12 @@ public class AsBusreserveBillService extends MybatisBaseService_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.as.biz.asbusreservebilltrack; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.as.api.asbusreservebillsitem.AsBusreserveBillSitem; +import com.yxt.anrui.as.api.asbusreservebillsitem.AsBusreserveBillSitemVo; +import com.yxt.anrui.as.api.asbusreservebilltrack.AsBusreserveBillTrack; +import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * Project: as(as)
+ * File: AsBusreserveBillSitemMapper.java
+ * Class: as.biz.asbusreservebillsitem.AsBusreserveBillSitemMapper
+ * Description: 预约单-服务项目.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-04-09 17:01:49
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface AsBusreserveBillTrackMapper extends BaseMapper { + + @Select("select * from as_busreserve_bill_track where billSid =#{sid}") + List fetchByMainSid(@Param("sid") String sid); + + @Delete("delete from as_busreserve_bill_track where billSid = #{sid}") + int delByMainSid(@Param("sid") String sid); +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebilltrack/AsBusreserveBillTrackMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebilltrack/AsBusreserveBillTrackMapper.xml new file mode 100644 index 0000000000..8525721629 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebilltrack/AsBusreserveBillTrackMapper.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebilltrack/AsBusreserveBillTrackRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebilltrack/AsBusreserveBillTrackRest.java new file mode 100644 index 0000000000..31134869c3 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebilltrack/AsBusreserveBillTrackRest.java @@ -0,0 +1,58 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.as.biz.asbusreservebilltrack; + +import com.yxt.anrui.as.api.asbusreservebillsitem.AsBusreserveBillSitemDetailsVo; +import com.yxt.anrui.as.api.asbusreservebillsitem.AsBusreserveBillSitemDto; +import com.yxt.anrui.as.api.asbusreservebillsitem.AsBusreserveBillSitemQuery; +import com.yxt.anrui.as.api.asbusreservebillsitem.AsBusreserveBillSitemVo; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * Project: as(as)
+ * File: AsBusreserveBillSitemFeignFallback.java
+ * Class: as.biz.asbusreservebillsitem.AsBusreserveBillSitemRest
+ * Description: 预约单-服务项目.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-04-09 17:01:49
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "预约单-跟踪记录") +@RestController +@RequestMapping("v1/AsBusreserveBillTrack") +public class AsBusreserveBillTrackRest { + +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebilltrack/AsBusreserveBillTrackService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebilltrack/AsBusreserveBillTrackService.java new file mode 100644 index 0000000000..15fc089806 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebilltrack/AsBusreserveBillTrackService.java @@ -0,0 +1,66 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.as.biz.asbusreservebilltrack; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.as.api.asbusreservebillsitem.*; +import com.yxt.anrui.as.api.asbusreservebilltrack.AsBusreserveBillTrack; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.vo.PagerVo; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Project: as(as)
+ * File: AsBusreserveBillSitemService.java
+ * Class: as.biz.asbusreservebillsitem.AsBusreserveBillSitemService
+ * Description: 预约单-服务项目 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-04-09 17:01:49
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class AsBusreserveBillTrackService extends MybatisBaseService { + + public List fetchByMainSid(String sid) { + return baseMapper.fetchByMainSid(sid); + } + + public int delByMainSid(String sid) { + return baseMapper.delByMainSid(sid); + } + +} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryAgeExportVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryAgeExportVo.java index d91750d98a..b29c135252 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryAgeExportVo.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryAgeExportVo.java @@ -26,10 +26,8 @@ public class WmsInventoryAgeExportVo { private String unit;//计量单位 @ExportEntityMap(CnName = "仓库名称", EnName = "warehouseName") private String warehouseName;//仓库名称 - @ExportEntityMap(CnName = "库区名称", EnName = "warehouseArea") - private String warehouseArea;//库区名称 - @ExportEntityMap(CnName = "货架名称", EnName = "warehouseRackName") - private String warehouseRackName;//货架名称 + @ExportEntityMap(CnName = "库位编码", EnName = "warehouseRackCode") + private String warehouseRackCode;//库位编码 @ExportEntityMap(CnName = "库存数量", EnName = "count") private String count;//库存数量 @ExportEntityMap(CnName = "库龄", EnName = "age") diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryAgeQuery.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryAgeQuery.java index 53731c24db..321130c959 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryAgeQuery.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryAgeQuery.java @@ -22,5 +22,5 @@ public class WmsInventoryAgeQuery implements Query { private String ageStart;//库龄开始 private String ageEnd;//库龄开始 // private String queryName; //单号，来源单号，供应商 - private String useOrgSid; + private String orgPath; } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryAgeVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryAgeVo.java index a69aee0d53..423bde298b 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryAgeVo.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryAgeVo.java @@ -21,8 +21,8 @@ public class WmsInventoryAgeVo implements Vo { private String goodsSkuOwnSpec; //规格型号 private String unit;//计量单位 private String warehouseName;//仓库名称 - private String warehouseArea;//库区名称 - private String warehouseRackName;//货架名称 +// private String warehouseArea;//库区名称 + private String warehouseRackCode;//库位编码 private String count;//库存数量 private String age;//库龄 //来源单号 diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml index 1ad780b69f..ec92ea4544 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml @@ -6,17 +6,17 @@ select * from (select wd.goodsSpuName, - wd.goodsSkuTitle, - wd.goodsSkuCode, - wd.goodsSkuOwnSpec, - wd.unit, - wd.warehouseName, - wd.warehouseArea, - wd.warehouseRackName, - wb.busTypeValue, - wd.cost, - wd.price1, - wd.price2, - wd.subject, - wb.createByName, - DATE_FORMAT(wb.createTime, '%Y-%m-%d') as createTime, - wb.billNo, - wb.sourceBillSid sourceBillNo, - wb.billObjName, - wb.busTypeKey - from wms_inventory a - left join wms_inventory_bill wb on wb.sid = a.billSid - left join wms_inventory_bill_detail wd on wd.sid = a.billDetailSid - where a.sid = #{sid} - union all - select wd.goodsSpuName, - wd.goodsSkuTitle, - wd.goodsSkuCode, - wd.goodsSkuOwnSpec, - wd.unit, - wd.warehouseName, - wd.warehouseArea, - wd.warehouseRackName, - wb.busTypeValue, - wd.cost, - wd.price1, - wd.price2, - wd.subject, - wb.createByName, - DATE_FORMAT(wb.createTime, '%Y-%m-%d') as createTime, - wb.billNo, - wb.sourceBillSid sourceBillNo, - wb.billObjName, - wb.busTypeKey - from wms_inventory_bill_detail wd - left join wms_inventory_bill wb on wb.sid = wd.billSid - where wd.inventorySid = #{sid}) b + wd.goodsSkuTitle, + wd.goodsSkuCode, + wd.goodsSkuOwnSpec, + wd.unit, + wd.warehouseName, + wd.warehouseArea, + wd.warehouseRackName, + wb.busTypeValue, + wd.cost, + wd.price1, + wd.price2, + wd.subject, + wb.createByName, + DATE_FORMAT(wb.createTime, '%Y-%m-%d') as createTime, + wb.billNo, + wb.sourceBillSid sourceBillNo, + wb.billObjName, + wb.busTypeKey + from wms_inventory a + left join wms_inventory_bill wb on wb.sid = a.billSid + left join wms_inventory_bill_detail wd on wd.sid = a.billDetailSid + where a.sid = #{sid} + union all + select wd.goodsSpuName, + wd.goodsSkuTitle, + wd.goodsSkuCode, + wd.goodsSkuOwnSpec, + wd.unit, + wd.warehouseName, + wd.warehouseArea, + wd.warehouseRackName, + wb.busTypeValue, + wd.cost, + wd.price1, + wd.price2, + wd.subject, + wb.createByName, + DATE_FORMAT(wb.createTime, '%Y-%m-%d') as createTime, + wb.billNo, + wb.sourceBillSid sourceBillNo, + wb.billObjName, + wb.busTypeKey + from wms_inventory_bill_detail wd + left join wms_inventory_bill wb on wb.sid = wd.billSid + where wd.inventorySid = #{sid}) b ${ew.sqlSegment} @@ -125,95 +125,83 @@ @@ -229,19 +217,19 @@ SELECT wi.sid, - wi.goodsSpuName, - wi.goodsSkuCode, - wi.goodsSkuOwnSpec, - wi.unit, - wi.warehouseSid, - wi.warehouseName, - wi.warehouseRackSid, - wi.warehouseRackCode, - wwa.areaName, - wi.count + wi.goodsSpuName, + wi.goodsSkuCode, + wi.goodsSkuOwnSpec, + wi.unit, + wi.warehouseSid, + wi.warehouseName, + wi.warehouseRackSid, + wi.warehouseRackCode, + wwa.areaName, + wi.count FROM wms_inventory wi - LEFT JOIN wms_warehouse_area wwa - ON wi.`warehouseRackSid` = wwa.`sid` + LEFT JOIN wms_warehouse_area wwa + ON wi.`warehouseRackSid` = wwa.`sid` ${ew.sqlSegment} @@ -303,4 +291,4 @@ ${ew.sqlSegment} - \ No newline at end of file + diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java index a2083b5a31..0db6edc043 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java @@ -14,6 +14,8 @@ import com.yxt.wms.biz.inventory.wmsinventorybill.WmsInventoryBill; import com.yxt.wms.biz.inventory.wmsinventorybill.WmsInventoryBillService; import com.yxt.wms.feign.base.basegoodssku.BaseGoodsSkuDetailsVo; import com.yxt.wms.feign.base.basegoodssku.BaseGoodsSkuFeign; +import com.yxt.wms.feign.portal.sysorganization.SysOrganizationVo; +import com.yxt.wms.feign.portal.sysstafforg.SysStaffOrgFeign; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -32,6 +34,8 @@ public class WmsInventoryService extends MybatisBaseService listPage(PagerQuery pq) { WmsInventoryQuery query = pq.getParams(); @@ -180,36 +184,36 @@ public class WmsInventoryService extends MybatisBaseService stringList = wmsInventoryUpdatePrice.getSidsList(); - stringList.removeAll(Collections.singleton(null)); - String price = wmsInventoryUpdatePrice.getPrice(); - if (!stringList.isEmpty()) { - int type = wmsInventoryUpdatePrice.getType(); - switch (type) { - case 1: - baseMapper.updatePrice1(price, stringList); - break; - case 2: - baseMapper.updatePrice2(price, stringList); - break; - case 3: - baseMapper.updatePrice3(price, stringList); - break; - case 4: - baseMapper.updatePrice4(price, stringList); - break; - case 5: - baseMapper.updatePrice5(price, stringList); - break; - default: - break; - } - } - return rb.success(); - } -*/ + /* public ResultBean updatePrice(WmsInventoryUpdatePrice wmsInventoryUpdatePrice) { + ResultBean rb = ResultBean.fireFail(); + List stringList = wmsInventoryUpdatePrice.getSidsList(); + stringList.removeAll(Collections.singleton(null)); + String price = wmsInventoryUpdatePrice.getPrice(); + if (!stringList.isEmpty()) { + int type = wmsInventoryUpdatePrice.getType(); + switch (type) { + case 1: + baseMapper.updatePrice1(price, stringList); + break; + case 2: + baseMapper.updatePrice2(price, stringList); + break; + case 3: + baseMapper.updatePrice3(price, stringList); + break; + case 4: + baseMapper.updatePrice4(price, stringList); + break; + case 5: + baseMapper.updatePrice5(price, stringList); + break; + default: + break; + } + } + return rb.success(); + } + */ /* public PagerVo getBillList(PagerQuery pagerQuery) { WmsInventoryBillListQuery query = pagerQuery.getParams(); QueryWrapper qw = new QueryWrapper<>(); @@ -334,8 +338,13 @@ public class WmsInventoryService extends MybatisBaseService inventoryAgeList(PagerQuery pq) { WmsInventoryAgeQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); - if (StringUtils.isNotBlank(query.getUseOrgSid())) { - qw.eq("w.useOrgSid", query.getUseOrgSid()); + if (StringUtils.isNotBlank(query.getOrgPath())) { + String orgPath = query.getOrgPath(); + ResultBean orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(orgPath); + if (orgSidByPath.getSuccess()) { + String useOrgSid = orgSidByPath.getData(); + qw.eq("w.useOrgSid", useOrgSid); + } } if (StringUtils.isNotBlank(query.getGoodsSpuName())) { qw.like("w.goodsSpuName", query.getGoodsSpuName()); @@ -352,7 +361,6 @@ public class WmsInventoryService extends MybatisBaseService=" + query.getAgeStart()). apply(StringUtils.isNotBlank(query.getAgeEnd()), "w.age <=" + query.getAgeStart() ); - qw.eq("1", "1"); qw.orderByDesc("w.firstInDate"); IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.inventoryAgeList(page, qw); @@ -362,8 +370,13 @@ public class WmsInventoryService extends MybatisBaseService ageExportExcel(WmsInventoryAgeQuery query) { QueryWrapper qw = new QueryWrapper<>(); - if (StringUtils.isNotBlank(query.getUseOrgSid())) { - qw.eq("w.useOrgSid", query.getUseOrgSid()); + if (StringUtils.isNotBlank(query.getOrgPath())) { + String orgPath = query.getOrgPath(); + ResultBean orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(orgPath); + if (orgSidByPath.getSuccess()) { + String useOrgSid = orgSidByPath.getData(); + qw.eq("w.useOrgSid", useOrgSid); + } } if (StringUtils.isNotBlank(query.getGoodsSpuName())) { qw.like("w.goodsSpuName", query.getGoodsSpuName()); @@ -380,7 +393,6 @@ public class WmsInventoryService extends MybatisBaseService=" + query.getAgeStart()). apply(StringUtils.isNotBlank(query.getAgeEnd()), "w.age <=" + query.getAgeStart() ); - qw.eq("1", "1"); qw.orderByDesc("w.firstInDate"); List list = baseMapper.ageExportExcel(qw); return list; diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebill/WmsInventorySettleRecordQuery.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebill/WmsInventorySettleRecordQuery.java index 99125b2706..8c79fe568f 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebill/WmsInventorySettleRecordQuery.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebill/WmsInventorySettleRecordQuery.java @@ -14,5 +14,5 @@ public class WmsInventorySettleRecordQuery implements Query { private String startDate; private String endDate; private String useOrgName; - private String useOrgSid; + private String orgPath; } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebill/WmsInventorySettleRecordVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebill/WmsInventorySettleRecordVo.java index e6a2fff9c7..ac7f313185 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebill/WmsInventorySettleRecordVo.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebill/WmsInventorySettleRecordVo.java @@ -1,8 +1,11 @@ package com.yxt.wms.biz.inventory.wmsinventorysettlebill; +import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.vo.Vo; import lombok.Data; +import java.util.Date; + /** * @author Fan * @description @@ -13,6 +16,7 @@ public class WmsInventorySettleRecordVo implements Vo { private String sid; private String createByName; - private String createTime; + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + private Date createTime; private String useOrgName; } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebill/WmsInventorySettlebill.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebill/WmsInventorySettlebill.java index 563b994501..3251f94661 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebill/WmsInventorySettlebill.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebill/WmsInventorySettlebill.java @@ -54,8 +54,6 @@ public class WmsInventorySettlebill extends BaseEntity { @ApiModelProperty("结算单编号") private String billNo; // 结算单编号 - @ApiModelProperty("制单日期") - private String createDate; // 制单日期 @ApiModelProperty("制单人姓名") private String createByName; // 制单人姓名 @ApiModelProperty("库存结算状态（1进行中 2已完成）") @@ -72,5 +70,8 @@ public class WmsInventorySettlebill extends BaseEntity { private String useOrgSid; // 使用组织sid @ApiModelProperty("创建组织sid") private String createOrgSid; // 创建组织sid - + @ApiModelProperty("使用组织") + private String useOrgName; // 使用组织 + @ApiModelProperty("创建组织") + private String createOrgName; // 创建组织 } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebill/WmsInventorySettlebillMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebill/WmsInventorySettlebillMapper.xml index 93c98a5847..12a71de5c1 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebill/WmsInventorySettlebillMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebill/WmsInventorySettlebillMapper.xml @@ -38,5 +38,6 @@ - \ No newline at end of file + diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebill/WmsInventorySettlebillQuery.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebill/WmsInventorySettlebillQuery.java index 1b716f637e..6ee028d931 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebill/WmsInventorySettlebillQuery.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebill/WmsInventorySettlebillQuery.java @@ -29,7 +29,9 @@ package com.yxt.wms.biz.inventory.wmsinventorysettlebill; import com.yxt.common.core.query.Query; import com.fasterxml.jackson.annotation.JsonFormat; + import java.util.Date; + import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -51,29 +53,26 @@ import lombok.Data; @ApiModel(value = "库存结算单 查询条件", description = "库存结算单 查询条件") public class WmsInventorySettlebillQuery implements Query { - @ApiModelProperty("结算单编号") + @ApiModelProperty("结算单编号") private String billNo; // 结算单编号 - @ApiModelProperty("制单日期") + @ApiModelProperty("制单日期") private String createDate; // 制单日期 - @ApiModelProperty("制单人sid") + @ApiModelProperty("制单人sid") private String createUserSid; // 制单人sid - @ApiModelProperty("制单人姓名") + @ApiModelProperty("制单人姓名") private String createByName; // 制单人姓名 - @ApiModelProperty("库存结算状态（1进行中 2已完成）") + @ApiModelProperty("库存结算状态（1进行中 2已完成）") private Integer settleState; // 库存结算状态（1进行中 2已完成） - @ApiModelProperty("库存结算类型（1月结 2年结）") + @ApiModelProperty("库存结算类型（1月结 2年结）") private Integer settleType; // 库存结算类型（1月结 2年结） - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") - @ApiModelProperty("开始时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiModelProperty("开始时间") private Date settle_startTimeStart; // 开始时间 private Date settle_startTimeEnd; // 开始时间 - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") - @ApiModelProperty("结束时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiModelProperty("结束时间") private Date settle_endTimeStart; // 结束时间 private Date settle_endTimeEnd; // 结束时间 - @ApiModelProperty("使用组织sid") - private String useOrgSid; // 使用组织sid - @ApiModelProperty("创建组织sid") - private String createOrgSid; // 创建组织sid + private String orgPath; } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebill/WmsInventorySettlebillService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebill/WmsInventorySettlebillService.java index 7367a53f44..d6b0fc37bc 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebill/WmsInventorySettlebillService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebill/WmsInventorySettlebillService.java @@ -28,9 +28,11 @@ package com.yxt.wms.biz.inventory.wmsinventorysettlebill; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.common.core.result.ResultBean; import com.yxt.wms.biz.inventory.wmsinventory.WmsInventory; import com.yxt.wms.biz.inventory.wmsinventorysettlebilldetail.WmsInventorySettlebillDetail; import com.yxt.wms.biz.inventory.wmsinventorysettlebilldetail.WmsInventorySettlebillDetailService; +import com.yxt.wms.feign.portal.sysstafforg.SysStaffOrgFeign; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -61,7 +63,8 @@ public class WmsInventorySettlebillService extends MybatisBaseService createQueryWrapper(WmsInventorySettlebillQuery query) { // todo: 这里根据具体业务调整查询条件 // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); @@ -141,17 +144,24 @@ public class WmsInventorySettlebillService extends MybatisBaseService carryForwardList(PagerQuery pq) { WmsInventorySettleRecordQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); - if (StringUtils.isNotBlank(query.getUseOrgSid())) { - qw.eq("useOrgSid",query.getUseOrgSid()); + if (com.yxt.common.base.utils.StringUtils.isNotBlank(query.getOrgPath())) { + String orgPath = query.getOrgPath(); + ResultBean orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(orgPath); + if (orgSidByPath.getSuccess()) { + String useOrgSid = orgSidByPath.getData(); + qw.eq("useOrgSid", useOrgSid); + } + } + if (StringUtils.isNotBlank(query.getUseOrgName())) { + qw.like("useOrgName",query.getUseOrgName()); } qw.apply(com.yxt.common.base.utils.StringUtils.isNotBlank(query.getStartDate()), "date_format (createTime,'%Y-%m-%d') >= date_format('" + query.getStartDate() + "','%Y-%m-%d')"). apply(com.yxt.common.base.utils.StringUtils.isNotBlank(query.getEndDate()), "date_format (createTime,'%Y-%m-%d') <= date_format('" + query.getEndDate() + "','%Y-%m-%d')" ); - qw.eq("1","1"); qw.orderByDesc("createTime"); IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.carryForwardList(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } -} \ No newline at end of file +} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebilldetail/WmsInventorySettlebillDetail.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebilldetail/WmsInventorySettlebillDetail.java index aa483ab1d9..2466f70197 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebilldetail/WmsInventorySettlebillDetail.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebilldetail/WmsInventorySettlebillDetail.java @@ -68,10 +68,8 @@ public class WmsInventorySettlebillDetail extends BaseEntity { private String goodsSkuOwnSpec;//规格型号 private String warehouseSid;//仓库sid private String warehouseName;//仓库名称 - private String warehouseAreaSid;//库区sid - private String warehouseArea;//库区名称 - private String warehouseRackSid;//货架sid - private String warehouseRackName;//货架名称 + private String warehouseRackSid;//库位Sid + private String warehouseRackCode;//库位编码 @ApiModelProperty("上期结存") private BigDecimal preBalance; // 上期结存 @ApiModelProperty("本期结存") diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebilldetail/WmsInventorySettlebillDetailMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebilldetail/WmsInventorySettlebillDetailMapper.xml index ad01893b3c..b801fdb623 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebilldetail/WmsInventorySettlebillDetailMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebilldetail/WmsInventorySettlebillDetailMapper.xml @@ -7,7 +7,7 @@ resultType="com.yxt.wms.biz.inventory.wmsinventorysettlebilldetail.WmsInventorySettlebillDetailVo"> SELECT d.sid, - s.createTime, + date_format (s.createTime,'%Y-%m-%d') as createTime, d.currentBalance, d.preBalance, d.settleType, @@ -16,8 +16,7 @@ d.goodsSkuOwnSpec, d.goodsSkuTitle, d.warehouseName, - d.warehouseArea, - d.warehouseRackName + d.warehouseRackCode FROM wms_inventory_settlebill_detail AS d LEFT JOIN wms_inventory_settlebill AS s ON d.billSid = s.sid @@ -32,29 +31,28 @@ - \ No newline at end of file + diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebilldetail/WmsInventorySettlebillDetailQuery.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebilldetail/WmsInventorySettlebillDetailQuery.java index 4a8f5f6246..163768c486 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebilldetail/WmsInventorySettlebillDetailQuery.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebilldetail/WmsInventorySettlebillDetailQuery.java @@ -57,9 +57,8 @@ public class WmsInventorySettlebillDetailQuery implements Query { private String goodsSkuCode;//商品编码（图号） private String goodsSkuOwnSpec;//规格型号 private String warehouseName;//仓库名称 - private String warehouseArea;//库区名称 - private String warehouseRackName;//货架名称 - private String useOrgSid; + private String warehouseRackCode;//库位编码 + private String orgPath; private String startDate; private String endDate; diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebilldetail/WmsInventorySettlebillDetailService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebilldetail/WmsInventorySettlebillDetailService.java index 8b2ea95924..cd066abdee 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebilldetail/WmsInventorySettlebillDetailService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebilldetail/WmsInventorySettlebillDetailService.java @@ -28,12 +28,15 @@ package com.yxt.wms.biz.inventory.wmsinventorysettlebilldetail; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.common.core.result.ResultBean; +import com.yxt.wms.feign.portal.sysstafforg.SysStaffOrgFeign; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.vo.PagerVo; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -53,78 +56,85 @@ import java.util.List; */ @Service public class WmsInventorySettlebillDetailService extends MybatisBaseService { - private QueryWrapper createQueryWrapper(WmsInventorySettlebillDetailQuery query) { - // todo: 这里根据具体业务调整查询条件 - // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); - QueryWrapper qw = new QueryWrapper<>(); - if (com.yxt.common.base.utils.StringUtils.isNotBlank(query.getUseOrgSid())) { - qw.eq("s.useOrgSid", query.getUseOrgSid()); - } - if (com.yxt.common.base.utils.StringUtils.isNotBlank(query.getGoodsSpuName())) { - qw.like("d.goodsSpuName", query.getGoodsSpuName()); - } - if (com.yxt.common.base.utils.StringUtils.isNotBlank(query.getWarehouseName())) { - qw.like("d.warehouseName", query.getWarehouseName()); - } - if (com.yxt.common.base.utils.StringUtils.isNotBlank(query.getGoodsSkuCode())) { - qw.like("d.goodsSkuCode", query.getGoodsSkuCode()); - } - qw.apply(com.yxt.common.base.utils.StringUtils.isNotBlank(query.getStartDate()), "date_format (s.createTime,'%Y-%m-%d') >= date_format('" + query.getStartDate() + "','%Y-%m-%d')"). - apply(com.yxt.common.base.utils.StringUtils.isNotBlank(query.getEndDate()), "date_format (s.createTime,'%Y-%m-%d') <= date_format('" + query.getEndDate() + "','%Y-%m-%d')" - ); - qw.eq("1", "1"); - qw.orderByDesc("s.createTime"); - return qw; - } - - public PagerVo listPageVo(PagerQuery pq) { - WmsInventorySettlebillDetailQuery 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(WmsInventorySettlebillDetailDto dto){ + @Autowired + private SysStaffOrgFeign sysStaffOrgFeign; + + private QueryWrapper createQueryWrapper(WmsInventorySettlebillDetailQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + if (com.yxt.common.base.utils.StringUtils.isNotBlank(query.getOrgPath())) { + String orgPath = query.getOrgPath(); + ResultBean orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(orgPath); + if (orgSidByPath.getSuccess()) { + String useOrgSid = orgSidByPath.getData(); + qw.eq("s.useOrgSid", useOrgSid); + } + } + if (com.yxt.common.base.utils.StringUtils.isNotBlank(query.getGoodsSpuName())) { + qw.like("d.goodsSpuName", query.getGoodsSpuName()); + } + if (com.yxt.common.base.utils.StringUtils.isNotBlank(query.getWarehouseName())) { + qw.like("d.warehouseName", query.getWarehouseName()); + } + if (com.yxt.common.base.utils.StringUtils.isNotBlank(query.getGoodsSkuCode())) { + qw.like("d.goodsSkuCode", query.getGoodsSkuCode()); + } + qw.apply(com.yxt.common.base.utils.StringUtils.isNotBlank(query.getStartDate()), "date_format (s.createTime,'%Y-%m-%d') >= date_format('" + query.getStartDate() + "','%Y-%m-%d')"). + apply(com.yxt.common.base.utils.StringUtils.isNotBlank(query.getEndDate()), "date_format (s.createTime,'%Y-%m-%d') <= date_format('" + query.getEndDate() + "','%Y-%m-%d')" + ); + qw.orderByDesc("s.createTime"); + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + WmsInventorySettlebillDetailQuery 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(WmsInventorySettlebillDetailDto dto) { String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { this.insertByDto(dto); - return; - } - this.updateByDto(dto); - } - - public void insertByDto(WmsInventorySettlebillDetailDto dto){ - WmsInventorySettlebillDetail entity = new WmsInventorySettlebillDetail(); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.insert(entity); - } - - public void updateByDto(WmsInventorySettlebillDetailDto dto){ - String dtoSid = dto.getSid(); + return; + } + this.updateByDto(dto); + } + + public void insertByDto(WmsInventorySettlebillDetailDto dto) { + WmsInventorySettlebillDetail entity = new WmsInventorySettlebillDetail(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(WmsInventorySettlebillDetailDto dto) { + String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { return; - } - WmsInventorySettlebillDetail entity = fetchBySid(dtoSid); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.updateById(entity); - } - - public WmsInventorySettlebillDetailDetailsVo fetchDetailsVoBySid(String sid){ - WmsInventorySettlebillDetail entity = fetchBySid(sid); - WmsInventorySettlebillDetailDetailsVo vo = new WmsInventorySettlebillDetailDetailsVo(); - BeanUtil.copyProperties(entity, vo); - return vo; - } + } + WmsInventorySettlebillDetail entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public WmsInventorySettlebillDetailDetailsVo fetchDetailsVoBySid(String sid) { + WmsInventorySettlebillDetail entity = fetchBySid(sid); + WmsInventorySettlebillDetailDetailsVo vo = new WmsInventorySettlebillDetailDetailsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } - public void delByMainSid(String sid) { - baseMapper.delByMainSid(sid); - } + public void delByMainSid(String sid) { + baseMapper.delByMainSid(sid); + } - public List listExcel(WmsInventorySettlebillDetailQuery query) { - QueryWrapper qw = createQueryWrapper(query); - List list = baseMapper.listExcel(qw); - return list; - } -} \ No newline at end of file + public List listExcel(WmsInventorySettlebillDetailQuery query) { + QueryWrapper qw = createQueryWrapper(query); + List list = baseMapper.listExcel(qw); + return list; + } +} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebilldetail/WmsInventorySettlebillDetailVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebilldetail/WmsInventorySettlebillDetailVo.java index 469c66b5b4..5fd76034ee 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebilldetail/WmsInventorySettlebillDetailVo.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebilldetail/WmsInventorySettlebillDetailVo.java @@ -62,8 +62,7 @@ public class WmsInventorySettlebillDetailVo implements Vo { private String goodsSkuCode;//商品编码（图号） private String goodsSkuOwnSpec;//规格型号 private String warehouseName;//仓库名称 - private String warehouseArea;//库区名称 - private String warehouseRackName;//货架名称 + private String warehouseRackCode;//库位编码 @ApiModelProperty("上期结存") private String preBalance; // 上期结存 @ApiModelProperty("本期结存") diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebilldetail/WmsInventorySettlebillExportVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebilldetail/WmsInventorySettlebillExportVo.java index 42e1d154f9..0adf7a93bb 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebilldetail/WmsInventorySettlebillExportVo.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebilldetail/WmsInventorySettlebillExportVo.java @@ -27,10 +27,8 @@ public class WmsInventorySettlebillExportVo { private String goodsSkuOwnSpec; //规格型号 @ExportEntityMap(CnName = "仓库名称", EnName = "warehouseName") private String warehouseName;//仓库名称 - @ExportEntityMap(CnName = "库区名称", EnName = "warehouseArea") - private String warehouseArea;//库区名称 - @ExportEntityMap(CnName = "货架名称", EnName = "warehouseRackName") - private String warehouseRackName;//货架名称 + @ExportEntityMap(CnName = "库位编码", EnName = "warehouseRackCode") + private String warehouseRackCode;//货架名称 @ExportEntityMap(CnName = "上期结存", EnName = "preBalance") private String preBalance; // 上期结存 @ExportEntityMap(CnName = "本期结存", EnName = "currentBalance") diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/privilege/PrivilegeQuery.java b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/privilege/PrivilegeQuery.java new file mode 100644 index 0000000000..7b53680860 --- /dev/null +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/privilege/PrivilegeQuery.java @@ -0,0 +1,22 @@ +package com.yxt.wms.feign.portal.privilege; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: 权限角色层级 + * @author: dimengzhe + * @date: 2023/5/23 + **/ +@Data +public class PrivilegeQuery { + + @ApiModelProperty("菜单路由") + private String menuUrl; + @ApiModelProperty("组织全路径sid") + private String orgPath; + @ApiModelProperty("菜单sid") + private String menuSid; + @ApiModelProperty("用户sid") + private String userSid; +} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/sysorganization/SysOrganizationFeign.java b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/sysorganization/SysOrganizationFeign.java new file mode 100644 index 0000000000..8910e7775e --- /dev/null +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/sysorganization/SysOrganizationFeign.java @@ -0,0 +1,35 @@ +package com.yxt.wms.feign.portal.sysorganization; + +import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysOrganizationFeign.java
+ * Class: com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign
+ * Description: 组织机构表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "组织机构表") +@FeignClient( + contextId = "anrui-portal-SysOrganization", + name = "anrui-portal", + path = "v1/sysorganization") +public interface SysOrganizationFeign { + + @ApiOperation("获取一条记录 根据sid") + @ResponseBody + @GetMapping("/fetchBySid/{sid}") + public ResultBean fetchBySid(@PathVariable("sid") String sid); +} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/sysorganization/SysOrganizationVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/sysorganization/SysOrganizationVo.java new file mode 100644 index 0000000000..df3d2506a2 --- /dev/null +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/sysorganization/SysOrganizationVo.java @@ -0,0 +1,88 @@ +package com.yxt.wms.feign.portal.sysorganization; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysOrganizationVo.java
+ * Class: com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo
+ * Description: 组织机构表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "组织机构表 视图数据对象", description = "组织机构表 视图数据对象") +@Data +public class SysOrganizationVo implements Vo { + @ApiModelProperty("部门/组织名称") + private String name; + + @ApiModelProperty("父(部门/组织) sid") + private String psid; + + @ApiModelProperty("联系电话") + private String linkPhone; + + @ApiModelProperty("联系人") + private String linkPerson; + + @ApiModelProperty("部门sid全路径") + private String orgSidPath; + + @ApiModelProperty("排序") + private Integer sort; + + @ApiModelProperty("地址") + private String addrs; + + @ApiModelProperty("地理位置经纬度") + private String jwd; + + @ApiModelProperty("二维码") + private String qrText; + + @ApiModelProperty("限制本部门成员查看通讯录:限制开启后，本部门成员只能看到限定范围内的通讯录不能看到所有通讯录，仅可见自己") + private Integer limitOrgMember; + + @ApiModelProperty("部门编码") + private String orgCode; + @ApiModelProperty("sid") + private String sid; + @ApiModelProperty("子集") + private List children = new ArrayList<>(); + @ApiModelProperty("主管人员名称") + private String zgNames; + @ApiModelProperty("分管人员名称") + private String fgNames; + @ApiModelProperty("主管人员sid") + private String zgStaffSid; + @ApiModelProperty("分管人员sid") + private String fgStaffSid; + @ApiModelProperty("组织简称") + private String orgAbbre; + @ApiModelProperty("是否是部门(0否，1是)") + private Integer isDept; + @ApiModelProperty("组织属性key") + private String orgAttributeKey; + @ApiModelProperty("组织属性value") + private String orgAttributeValue; + @ApiModelProperty("管理层级key") + private String orgLevelKey; + @ApiModelProperty("管理层级value") + private String orgLevelValue; + @ApiModelProperty("其他编码") + private String otherCode; + @ApiModelProperty("主管用户sid") + private String managerSid; +} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/sysstafforg/SysStaffOrgFeign.java b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/sysstafforg/SysStaffOrgFeign.java new file mode 100644 index 0000000000..68b3c9cb4a --- /dev/null +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/sysstafforg/SysStaffOrgFeign.java @@ -0,0 +1,25 @@ +package com.yxt.wms.feign.portal.sysstafforg; + +import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * @description: 人员与机构 + * @author: dimengzhe + * @date: 2024/3/6 + **/ +@FeignClient( + contextId = "anrui-portal-SysStaffOrg", + name = "anrui-portal", + path = "v1/sysstafforg") +public interface SysStaffOrgFeign { + + @GetMapping("/getOrgSidByPath") + @ResponseBody + @ApiOperation("根据用户组织全路径获取用户的分公司sid") + ResultBean getOrgSidByPath(@RequestParam("orgPath") String orgPath); +} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/sysuser/OrgList.java b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/sysuser/OrgList.java new file mode 100644 index 0000000000..df15054078 --- /dev/null +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/sysuser/OrgList.java @@ -0,0 +1,21 @@ +package com.yxt.wms.feign.portal.sysuser; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/9/21 9:26 + * @Description + */ +@Data +public class OrgList implements Vo { + private static final long serialVersionUID = -2867882982421321776L; + + private String orgName; + private String orgPath; + + private String deptName; + + private String deptSid; +} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/sysuser/SysUserFeign.java b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/sysuser/SysUserFeign.java new file mode 100644 index 0000000000..92f706afc0 --- /dev/null +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/sysuser/SysUserFeign.java @@ -0,0 +1,28 @@ +package com.yxt.wms.feign.portal.sysuser; + + +import com.yxt.common.core.result.ResultBean; +import com.yxt.wms.feign.portal.privilege.PrivilegeQuery; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +@Api(tags = "用户表") +@FeignClient( + contextId = "anrui-portal-SysUser", + name = "anrui-portal", + path = "v1/sysuser") +public interface SysUserFeign { + + @ApiOperation(value = "查询角色权限的层级获取权限id") + @PostMapping(value = "/selectPrivilegeLevel") + ResultBean selectPrivilegeLevel(@RequestBody PrivilegeQuery query); + + @ApiOperation("根据sid获取一条记录") + @GetMapping("/fetchBySid/{sid}") + public ResultBean fetchBySid(@PathVariable("sid") String sid); +} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/sysuser/SysUserVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/sysuser/SysUserVo.java new file mode 100644 index 0000000000..1aba6ff917 --- /dev/null +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/sysuser/SysUserVo.java @@ -0,0 +1,97 @@ +package com.yxt.wms.feign.portal.sysuser; + + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.ArrayList; +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysUserVo.java
+ * Class: com.yxt.anrui.portal.api.sysuser.SysUserVo
+ * Description: 用户表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "用户表 视图数据对象", description = "用户表 视图数据对象") +@Data +@NoArgsConstructor +public class SysUserVo implements Vo { + private static final long serialVersionUID = 2415131854581950721L; + @ApiModelProperty("部门sid") + private String departmentSid; + @ApiModelProperty("部门名称") + private String departmentName; + @ApiModelProperty("上级部门名称-本级部门名称 岗位名称") + @JsonProperty("pNameAndDepartmentNameAndPostName") + private String pNameAndDepartmentNameAndPostName; + @ApiModelProperty("岗位名称") + private String postName; + @ApiModelProperty("岗位Sid") + private String postSid; + @ApiModelProperty("单位sid") + private String organizationSid; + @ApiModelProperty("单位名称") + private String organizationName; + @ApiModelProperty("用户姓名") + private String name; + @ApiModelProperty("登录名，登录名不能相同") + private String userName; + + @ApiModelProperty("id") + private Integer id; + @ApiModelProperty("用户sid") + private String sid; + @ApiModelProperty("是否是管理员：1管理员，2一般用户，0是超级管理员,3尚无单位人员") + private String isAdmin; + @ApiModelProperty("角色名称") + private String roleName; + + @ApiModelProperty("关联的人员sid") + private String staffSid; + + @ApiModelProperty("手机号") + private String mobile; + @ApiModelProperty(value = "禁用状态") + private String isEnable; + + @ApiModelProperty("用户类型:1员工、2客户、3供应商") + private String userType; + @ApiModelProperty("用户类型:1、2、3") + private String userTypeKey; + @ApiModelProperty("用户头像") + private String headImage; + @ApiModelProperty("组织名称") + private String orgNamePath; + @ApiModelProperty("组织sid") + private String orgSidPath; + @ApiModelProperty(value = "token") + private String token; + @ApiModelProperty(value = "角色sids") + private List roleSids = new ArrayList<>(); + + private List orgList = new ArrayList<>(); + @ApiModelProperty("默认的组织机构sid全路径") + private String defaultOrgPath; + @ApiModelProperty("默认的组织机构名称全路径") + private String defaultOrgPathName; + + private String defaultDeptName; + private String defaultDeptSid; + + @ApiModelProperty("是否需要更换密码") + private Boolean needResetPsd; + @ApiModelProperty("工号") + private String jobNumber; +}