diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerFeign.java index 1ece09d950..a00216fe3e 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerFeign.java @@ -119,4 +119,9 @@ public interface BusSalesOrderBorrowerFeign { @PostMapping("/selectByCustomSid") @ResponseBody ResultBean selectByCustomSid(@RequestParam("customSid") String customSid); + + @ApiOperation("根据SID获取记录") + @GetMapping("/fetchEntityBySid") + @ResponseBody + public ResultBean fetchEntityBySid(@RequestParam("sid") String sid); } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerFeignFallback.java index 2931ca2fc3..a224d9d75a 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerFeignFallback.java @@ -114,4 +114,9 @@ public class BusSalesOrderBorrowerFeignFallback implements BusSalesOrderBorrower public ResultBean selectByCustomSid(String customSid) { return null; } + + @Override + public ResultBean fetchEntityBySid(String sid) { + return null; + } } 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 b18b9f0b1d..c9bb39ea05 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 @@ -150,4 +150,11 @@ public interface BusSalesOrderLoancontractFeign { @ApiOperation("批量保存") @PostMapping("/saveList") ResultBean saveList(@RequestBody List contracts); + + @ApiOperation("根据sid查询") + @GetMapping("/fetchEntityBySid") + @ResponseBody + public ResultBean fetchEntityBySid(@RequestParam("sid") String sid); + + } 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 5a2eb2c4f4..4d0a2ad95b 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 @@ -146,4 +146,9 @@ public class BusSalesOrderLoancontractFeignFallback implements BusSalesOrderLoan public ResultBean saveList(List contracts) { return null; } + + @Override + public ResultBean fetchEntityBySid(String sid) { + return null; + } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerRest.java index 279c8b0a08..93c2f3f8f8 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerRest.java @@ -145,4 +145,11 @@ public class BusSalesOrderBorrowerRest implements BusSalesOrderBorrowerFeign { String borrowerSid = busSalesOrderBorrowerService.selectByCustomSid(customSid); return rb.success().setData(borrowerSid); } + + @Override + public ResultBean fetchEntityBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + BusSalesOrderBorrower busSalesOrderBorrower = busSalesOrderBorrowerService.fetchBySid(sid); + return rb.success().setData(busSalesOrderBorrower); + } } 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 f5ea480294..30527f6dd4 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 @@ -198,4 +198,11 @@ public class BusSalesOrderLoancontractRest implements BusSalesOrderLoancontractF int i = busSalesOrderLoancontractService.saveList(contracts); return rb.success(); } + + @Override + public ResultBean fetchEntityBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + BusSalesOrderLoancontract loancontract = busSalesOrderLoancontractService.fetchBySid(sid); + return rb.success().setData(loancontract); + } } diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriseperson/CrmMaintenanceenterprisePersonFeign.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriseperson/CrmMaintenanceenterprisePersonFeign.java index 604a7470ce..b9407a4cb7 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriseperson/CrmMaintenanceenterprisePersonFeign.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriseperson/CrmMaintenanceenterprisePersonFeign.java @@ -50,8 +50,8 @@ import java.util.List; */ @Api(tags = "定点企业备案-对接人员") @FeignClient( - contextId = "crm-CrmMaintenanceenterprisePerson", - name = "crm", + contextId = "anrui-crm-CrmMaintenanceenterprisePerson", + name = "anrui-crm", path = "v1/crmmaintenanceenterpriseperson", fallback = CrmMaintenanceenterprisePersonFeignFallback.class) public interface CrmMaintenanceenterprisePersonFeign { diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordDetailsVo.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordDetailsVo.java index 24cd447a91..c39561c85d 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordDetailsVo.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordDetailsVo.java @@ -63,6 +63,11 @@ public class CrmMaintenanceenterpriseRecordDetailsVo implements Vo { * 详细地址 */ private String address; + + /** + * 详细地址 + */ + private String customerAddress; /** * 车辆列表 */ @@ -147,6 +152,7 @@ public class CrmMaintenanceenterpriseRecordDetailsVo implements Vo { * 附件 */ private List files = new ArrayList<>(); + private List files2 = new ArrayList<>(); /** * 备案有效期 */ @@ -163,6 +169,7 @@ public class CrmMaintenanceenterpriseRecordDetailsVo implements Vo { * 流程实例ID */ private String instanceId; + private String procInsId; /** * 联系电话 */ diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordFeign.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordFeign.java index 6f7feb5b33..977b3da238 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordFeign.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordFeign.java @@ -54,8 +54,8 @@ import java.util.List; */ @Api(tags = "定点企业备案") @FeignClient( - contextId = "crm-CrmMaintenanceenterpriseRecord", - name = "crm", + contextId = "anrui-crm-CrmMaintenanceenterpriseRecord", + name = "anrui-crm", path = "v1/maintenanceEnterprise", fallback = CrmMaintenanceenterpriseRecordFeignFallback.class) public interface CrmMaintenanceenterpriseRecordFeign { diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriseveh/CrmMaintenanceenterpriseVehFeign.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriseveh/CrmMaintenanceenterpriseVehFeign.java index 476bef0291..f6689180d4 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriseveh/CrmMaintenanceenterpriseVehFeign.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriseveh/CrmMaintenanceenterpriseVehFeign.java @@ -50,8 +50,8 @@ import java.util.List; */ @Api(tags = "定点企业备案-车辆信息") @FeignClient( - contextId = "crm-CrmMaintenanceenterpriseVeh", - name = "crm", + contextId = "anrui-crm-CrmMaintenanceenterpriseVeh", + name = "anrui-crm", path = "v1/crmmaintenanceenterpriseveh", fallback = CrmMaintenanceenterpriseVehFeignFallback.class) public interface CrmMaintenanceenterpriseVehFeign { @@ -65,14 +65,14 @@ public interface CrmMaintenanceenterpriseVehFeign { @PostMapping("/save") @ResponseBody public ResultBean save(@RequestBody CrmMaintenanceenterpriseVehDto dto); - + @ApiOperation("根据sid删除记录") @DeleteMapping("/delBySids") @ResponseBody public ResultBean delBySids(@RequestBody String[] sids); - + @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") @ResponseBody public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); -} \ No newline at end of file +} diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordService.java index 5bbab40c1d..5dc14b0dd3 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordService.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordService.java @@ -291,6 +291,7 @@ public class CrmMaintenanceenterpriseRecordService extends MybatisBaseService contactPerson = new ArrayList<>(); List carListVos = new ArrayList<>(); List files = new ArrayList<>(); + List files2 = new ArrayList<>(); if (null != entity) { BeanUtil.copyProperties(entity, vo); if (StringUtils.isNotBlank(entity.getProcInstId())) { @@ -301,9 +302,14 @@ public class CrmMaintenanceenterpriseRecordService extends MybatisBaseService personList = crmMaintenanceenterprisePersonService.selByBillSid(sid); if (!personList.isEmpty()) { @@ -381,10 +391,12 @@ public class CrmMaintenanceenterpriseRecordService extends MybatisBaseService page = PagerUtil.queryToPage(pagerQuery); diff --git a/anrui-system-ui/src/views/flow/doneList.vue b/anrui-system-ui/src/views/flow/doneList.vue index 874a385e87..a140fb8a58 100644 --- a/anrui-system-ui/src/views/flow/doneList.vue +++ b/anrui-system-ui/src/views/flow/doneList.vue @@ -313,8 +313,8 @@ export default { } selectUrl(this.selectUrl_list).then((response) => { if (response.success && response.data.url !== '') { - // this.url = 'http://127.0.0.1:9531' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list))) - this.url = 'http://anrui.yyundong.com' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list))) + this.url = 'http://127.0.0.1:9531' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list))) + // this.url = 'http://anrui.yyundong.com' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list))) // this.url = 'http://120.46.172.184' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list))) } else if (response.success && response.data.url === '') { this.$notify({ diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/crm/crmmaintenanceenterpriserecord/CarListVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/crm/crmmaintenanceenterpriserecord/CarListVo.java new file mode 100644 index 0000000000..dbc5c3a047 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/crm/crmmaintenanceenterpriserecord/CarListVo.java @@ -0,0 +1,31 @@ +package com.yxt.anrui.terminal.api.crm.crmmaintenanceenterpriserecord; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/7/22 14:42 + */ +@Data +public class CarListVo { + + /** + * 购买日期 + */ + private String buyDate; + private String sid; + /** + * 车牌号 + */ + private String vehMark; + /** + * 车架号 + */ + private String vinNo; + + + @ApiModelProperty("售后客户车辆信息sid") + private String asVinSid; // 售后客户车辆信息sid +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/crm/crmmaintenanceenterpriserecord/MonthEndDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/crm/crmmaintenanceenterpriserecord/MonthEndDetailsVo.java new file mode 100644 index 0000000000..52db901634 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/crm/crmmaintenanceenterpriserecord/MonthEndDetailsVo.java @@ -0,0 +1,167 @@ +package com.yxt.anrui.terminal.api.crm.crmmaintenanceenterpriserecord; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author Administrator + * @description + * @date 2023/11/13 15:38 + */ +@Data +public class MonthEndDetailsVo implements Vo { + /** + * 客户sid + */ + private String customerSid; + /** + * 详细地址 + */ + private String address; + + /** + * 详细地址 + */ + private String customerAddress; + /** + * 车辆列表 + */ + private List carList = new ArrayList<>(); + /** + * 证件类型 + */ + private String certificateType; + /** + * 证件类型Key + */ + private String certificateTypeKey; + /** + * 市 + */ + private String city; + /** + * 对接人列表 + */ + private List contactPerson = new ArrayList<>(); + /** + * 县 + */ + private String county; + /** + * 申请人 + */ + private String createByName; + /** + * 申请人sid + */ + private String createBySid; + /** + * 分公司 + */ + private String createOrgName; + /** + * 分公司sid + */ + private String createOrgSid; + /** + * 申请日期 + */ + private String createTime; + /** + * 客户名称 + */ + private String customerName; + /** + * 客户类型 + */ + private String customerType; + /** + * 客户类型Key + */ + private String customerTypeKey; + /** + * 申请部门 + */ + private String deptName; + /** + * 申请部门sid + */ + private String deptSid; + /** + * 电子邮箱 + */ + private String e_mail; + /** + * 紧急联系人 + */ + private String emergencyContact; + /** + * 紧急联系电话 + */ + private String emergencyMobile; + /** + * 证书有效期 + */ + private String endDate; + + private List files2 = new ArrayList<>(); + /** + * 备案有效期 + */ + private String filingIndate; + /** + * 备案类别，默认赋值"首次" + */ + private String filingType; + /** + * 证书号码 + */ + private String idnumber; + /** + * 流程实例ID + */ + private String instanceId; + private String procInsId; + /** + * 联系电话 + */ + private String mobile; + /** + * 省 + */ + private String province; + /** + * 已备人数，首次备案默认为空 + */ + private String readyStrength; + /** + * 已备车辆，首次备案默认为空 + */ + private String readyVehicle; + /** + * 备注 + */ + private String remarks; + private String sid; + /** + * 流程ID + */ + private String taskId; + /** + * 分公司 + */ + private String useOrgName; + /** + * 分公司sid + */ + private String useOrgSid; + /** + * 微信号 + */ + private String weixin; + + +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/crm/crmmaintenanceenterpriserecord/MonthEndFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/crm/crmmaintenanceenterpriserecord/MonthEndFeign.java new file mode 100644 index 0000000000..b5aa72a7e8 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/crm/crmmaintenanceenterpriserecord/MonthEndFeign.java @@ -0,0 +1,67 @@ +package com.yxt.anrui.terminal.api.crm.crmmaintenanceenterpriserecord; + + +import com.yxt.anrui.terminal.api.crm.crmmaintenanceenterpriserecord.flow.MonthEndDelegateQuery; +import com.yxt.anrui.terminal.api.crm.crmmaintenanceenterpriserecord.flow.AppMonthEndTaskQuery; +import com.yxt.anrui.terminal.api.crm.crmmaintenanceenterpriserecord.flow.MonthEndFlowableQuery; +import com.yxt.anrui.terminal.api.crm.crmmaintenanceenterpriserecord.flow.CompleteMonthEndDto; +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.cloud.openfeign.SpringQueryMap; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; + +/** + * @description: + * @author: fzz + * @date: 2023/8/8 + **/ +@Api(tags = "欠款月结客户") +@FeignClient( + contextId = "terminal-MonthEnd", + name = "anrui-terminal", + path = "/crm/v1/MonthEnd", + fallback = MonthEndFeignFallback.class) +public interface MonthEndFeign { + + + @ApiOperation("详情") + @GetMapping("/detail/{sid}") + @ResponseBody + ResultBean detail(@PathVariable("sid") String sid); + + //-------------------------流程----------------------------------------- + + @ApiOperation("办理") + @PutMapping("/agreeCreditInfo") + @ResponseBody + ResultBean agreeCreditInfo(@Valid @RequestBody CompleteMonthEndDto dto); + + @ApiOperation("驳回") + @PutMapping("/rejectCreditInfo") + @ResponseBody + ResultBean rejectCreditInfo(@Valid @RequestBody AppMonthEndTaskQuery query); + + @ApiOperation("撤回") + @PutMapping("/recallCreditInfo") + @ResponseBody + ResultBean recallCreditInfo(@Valid @RequestBody AppMonthEndTaskQuery query); + + @ApiOperation("终止") + @PutMapping("/stopCreditInfo") + @ResponseBody + ResultBean stopCreditInfo(@Valid @RequestBody AppMonthEndTaskQuery query); + + @ApiOperation("获取流程操作标题") + @GetMapping("/getFlowOperateTitle") + @ResponseBody + ResultBean getFlowOperateTitle(@Valid @SpringQueryMap MonthEndFlowableQuery query); + + @ApiOperation(value = "加签") + @PutMapping(value = "/delegate") + @ResponseBody + public ResultBean delegate(@RequestBody MonthEndDelegateQuery delegateQuery); +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/crm/crmmaintenanceenterpriserecord/MonthEndFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/crm/crmmaintenanceenterpriserecord/MonthEndFeignFallback.java new file mode 100644 index 0000000000..f883bc18a2 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/crm/crmmaintenanceenterpriserecord/MonthEndFeignFallback.java @@ -0,0 +1,52 @@ +package com.yxt.anrui.terminal.api.crm.crmmaintenanceenterpriserecord; + +import com.yxt.anrui.terminal.api.crm.crmmaintenanceenterpriserecord.flow.MonthEndDelegateQuery; +import com.yxt.anrui.terminal.api.crm.crmmaintenanceenterpriserecord.flow.AppMonthEndTaskQuery; +import com.yxt.anrui.terminal.api.crm.crmmaintenanceenterpriserecord.flow.MonthEndFlowableQuery; +import com.yxt.anrui.terminal.api.crm.crmmaintenanceenterpriserecord.flow.CompleteMonthEndDto; +import com.yxt.common.core.result.ResultBean; +import org.springframework.stereotype.Component; + +/** + * @description: + * @author: fzz + * @date: + **/ +@Component +public class MonthEndFeignFallback implements MonthEndFeign { + + @Override + public ResultBean detail(String sid) { + return null; + } + + @Override + public ResultBean agreeCreditInfo(CompleteMonthEndDto dto) { + return null; + } + + @Override + public ResultBean rejectCreditInfo(AppMonthEndTaskQuery query) { + return null; + } + + @Override + public ResultBean recallCreditInfo(AppMonthEndTaskQuery query) { + return null; + } + + @Override + public ResultBean stopCreditInfo(AppMonthEndTaskQuery query) { + return null; + } + + @Override + public ResultBean getFlowOperateTitle(MonthEndFlowableQuery query) { + return null; + } + + @Override + public ResultBean delegate(MonthEndDelegateQuery delegateQuery) { + return null; + } +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/crm/crmmaintenanceenterpriserecord/PersonListVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/crm/crmmaintenanceenterpriserecord/PersonListVo.java new file mode 100644 index 0000000000..2c12a3d859 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/crm/crmmaintenanceenterpriserecord/PersonListVo.java @@ -0,0 +1,32 @@ +package com.yxt.anrui.terminal.api.crm.crmmaintenanceenterpriserecord; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/7/22 14:42 + */ +@Data +public class PersonListVo { + + /** + * 手机号码 + */ + private String mobile; + /** + * 姓名 + */ + private String name; + /** + * 备注 + */ + private String remarks; + private String sid; + + @ApiModelProperty("对接人员sid") + private String personSid; // 对接人员sid + + +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/crm/crmmaintenanceenterpriserecord/flow/AppMonthEndTaskQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/crm/crmmaintenanceenterpriserecord/flow/AppMonthEndTaskQuery.java new file mode 100644 index 0000000000..9944e7d0a4 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/crm/crmmaintenanceenterpriserecord/flow/AppMonthEndTaskQuery.java @@ -0,0 +1,46 @@ +package com.yxt.anrui.terminal.api.crm.crmmaintenanceenterpriserecord.flow; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * @author Administrator + * @description + * @date 2023/10/17 9:14 + */ +@Data +public class AppMonthEndTaskQuery implements Query { + /** + * 终止、驳回、撤回 + */ + @ApiModelProperty("任务Id") + @NotBlank(message = "参数错误：taskId") + private String taskId; + /** + * 终止、驳回、撤回 + */ + @ApiModelProperty("业务sid") + @NotBlank(message = "参数错误：businessSid") + private String businessSid; + /** + * 终止、驳回 + */ + @ApiModelProperty("任务意见") + private String comment; + /** + * 终止、撤回、驳回 + */ + @ApiModelProperty("用户Sid") + private String userSid; + /** + * 终止 + */ + @ApiModelProperty("流程实例Id") + @JsonProperty("procInsId") + private String instanceId; + +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/crm/crmmaintenanceenterpriserecord/flow/CompleteMonthEndDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/crm/crmmaintenanceenterpriserecord/flow/CompleteMonthEndDto.java new file mode 100644 index 0000000000..37cbc9ce2f --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/crm/crmmaintenanceenterpriserecord/flow/CompleteMonthEndDto.java @@ -0,0 +1,35 @@ +package com.yxt.anrui.terminal.api.crm.crmmaintenanceenterpriserecord.flow; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * @author Administrator + * @description + * @date 2023/10/17 9:13 + */ +@Data +public class CompleteMonthEndDto implements Dto { + @ApiModelProperty(value = "任务id") + @NotBlank(message = "参数错误：taskId") + private String taskId; + @ApiModelProperty(value = "流程id") + @NotBlank(message = "参数错误：procInsId") + @JsonProperty("procInsId") + private String instanceId; + @ApiModelProperty(value = "意见") + private String comment; + @ApiModelProperty(value = "业务sid") + @NotBlank(message = "参数错误：businessSid") + private String businessSid; + @ApiModelProperty(value = "用户sid") + @NotBlank(message = "参数错误：userSid") + private String userSid; + @ApiModelProperty(value = "节点id") + @NotBlank(message = "参数错误：taskDefKey") + private String taskDefKey; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/crm/crmmaintenanceenterpriserecord/flow/MonthEndDelegateQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/crm/crmmaintenanceenterpriserecord/flow/MonthEndDelegateQuery.java new file mode 100644 index 0000000000..f6cafd069f --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/crm/crmmaintenanceenterpriserecord/flow/MonthEndDelegateQuery.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.terminal.api.crm.crmmaintenanceenterpriserecord.flow; + +import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Administrator + * @description + * @date 2023/9/28 10:16 + */ +@Data +public class MonthEndDelegateQuery { + @ApiModelProperty + private String userSid; + @ApiModelProperty("流程实例id") + @JsonProperty("procInsId") + private String instanceId; + @ApiModelProperty("任务Id") + private String taskId; + @ApiModelProperty("审批人sid") + private String assignee; + @ApiModelProperty("填写意见") + private String views; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/crm/crmmaintenanceenterpriserecord/flow/MonthEndFlowableQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/crm/crmmaintenanceenterpriserecord/flow/MonthEndFlowableQuery.java new file mode 100644 index 0000000000..e5a81addca --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/crm/crmmaintenanceenterpriserecord/flow/MonthEndFlowableQuery.java @@ -0,0 +1,21 @@ +package com.yxt.anrui.terminal.api.crm.crmmaintenanceenterpriserecord.flow; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +@Data +public class MonthEndFlowableQuery implements Query { + private static final long serialVersionUID = -5879668616710833830L; + + @ApiModelProperty(value = "节点key") + private String taskDefKey; + @ApiModelProperty(value = "业务sid") + private String businessSid; + @ApiModelProperty(value = "0 上一环节 1下一环节") + @NotNull(message = "参数错误：next") + private Integer next; + +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/crm/crmmaintenanceenterpriserecord/MonthEndRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/crm/crmmaintenanceenterpriserecord/MonthEndRest.java new file mode 100644 index 0000000000..e67e71fa07 --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/crm/crmmaintenanceenterpriserecord/MonthEndRest.java @@ -0,0 +1,97 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.biz.crm.crmmaintenanceenterpriserecord; + +import com.yxt.anrui.terminal.api.crm.crmmaintenanceenterpriserecord.MonthEndDetailsVo; +import com.yxt.anrui.terminal.api.crm.crmmaintenanceenterpriserecord.MonthEndFeign; +import com.yxt.anrui.terminal.api.crm.crmmaintenanceenterpriserecord.flow.AppMonthEndTaskQuery; +import com.yxt.anrui.terminal.api.crm.crmmaintenanceenterpriserecord.flow.CompleteMonthEndDto; +import com.yxt.anrui.terminal.api.crm.crmmaintenanceenterpriserecord.flow.MonthEndDelegateQuery; +import com.yxt.anrui.terminal.api.crm.crmmaintenanceenterpriserecord.flow.MonthEndFlowableQuery; +import com.yxt.anrui.terminal.api.finance.collectionConfirm.*; +import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.Api; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * Project: anrui-fin(销售相关)
+ * File: FinCollectionConfirmationFeignFallback.java
+ * Class: com.yxt.anrui.fin.biz.fincollectionconfirmation.FinCollectionConfirmationRest
+ * Description: 收款确认表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-04-12 17:57:01
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "欠款月结客户备案") +@RequestMapping("/crm/v1/MonthEnd") +@RestController +public class MonthEndRest implements MonthEndFeign { + + @Autowired + private MonthEndService monthEndService; + + + @Override + public ResultBean detail(String sid) { + return monthEndService.detail(sid); + } + + @Override + public ResultBean agreeCreditInfo(CompleteMonthEndDto dto) { + return null; + } + + @Override + public ResultBean rejectCreditInfo(AppMonthEndTaskQuery query) { + return null; + } + + @Override + public ResultBean recallCreditInfo(AppMonthEndTaskQuery query) { + return null; + } + + @Override + public ResultBean stopCreditInfo(AppMonthEndTaskQuery query) { + return null; + } + + @Override + public ResultBean getFlowOperateTitle(MonthEndFlowableQuery query) { + return null; + } + + @Override + public ResultBean delegate(MonthEndDelegateQuery delegateQuery) { + return null; + } +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/crm/crmmaintenanceenterpriserecord/MonthEndService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/crm/crmmaintenanceenterpriserecord/MonthEndService.java new file mode 100644 index 0000000000..ebde9a11ac --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/crm/crmmaintenanceenterpriserecord/MonthEndService.java @@ -0,0 +1,70 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.biz.crm.crmmaintenanceenterpriserecord; + + +import cn.hutool.core.bean.BeanUtil; +import com.yxt.anrui.crm.api.crmmaintenanceenterpriserecord.CrmMaintenanceenterpriseRecordDetailsVo; +import com.yxt.anrui.crm.api.crmmaintenanceenterpriserecord.CrmMaintenanceenterpriseRecordFeign; +import com.yxt.anrui.terminal.api.crm.crmmaintenanceenterpriserecord.MonthEndDetailsVo; +import com.yxt.common.core.result.ResultBean; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; +import java.util.stream.Collectors; + +/** + * Project: anrui-fin(销售相关)
+ * File: FinCollectionConfirmationService.java
+ * Class: com.yxt.anrui.fin.biz.fincollectionconfirmation.FinCollectionConfirmationService
+ * Description: 收款确认表 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-04-12 17:57:01
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class MonthEndService { + + @Autowired + private CrmMaintenanceenterpriseRecordFeign crmMaintenanceenterpriseRecordFeign; + + public ResultBean detail(String sid) { + ResultBean rb = ResultBean.fireFail(); + MonthEndDetailsVo vo = new MonthEndDetailsVo(); + CrmMaintenanceenterpriseRecordDetailsVo data = crmMaintenanceenterpriseRecordFeign.fetchDetailsBySid(sid).getData(); + if (null != data) { + BeanUtil.copyProperties(data,vo); + } + return rb.success().setData(vo); + } +} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRest.java index e79cf33ca9..1f8cd0412d 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRest.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRest.java @@ -42,6 +42,14 @@ public class WmsInventoryRest { return wmsInventoryService.getListByGoodsID(goodsID); } + @ApiOperation("配件库存查询") + @PostMapping("/fittingsInventory") + public ResultBean> fittingsInventory(@RequestBody PagerQuery pq) { + ResultBean> rb = ResultBean.fireFail(); + PagerVo pv = wmsInventoryService.fittingsInventory(pq); + return rb.success().setData(pv); + } + @ApiOperation("分页列表") @PostMapping("/listPage") public ResultBean> listPage(@RequestBody PagerQuery pq) { diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/FittingsInventoryQuery.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/FittingsInventoryQuery.java new file mode 100644 index 0000000000..f8e40bee14 --- /dev/null +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/FittingsInventoryQuery.java @@ -0,0 +1,46 @@ +package com.yxt.wms.biz.inventory.wmsinventory; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/8/21 16:41 + */ +@Data +public class FittingsInventoryQuery implements Query { + + /** + * 供应商 + */ + private String billObjName; + /** + * 服务站 + */ + private String deptName; + /** + * 图号 + */ + private String goodsSkuCode; + /** + * 商品名称 + */ + private String goodsSpuName; + /** + * 厂家 + */ + private String manufacturerName; + private String menuUrl; + private String orgPath; + /** + * 分公司 + */ + private String useOrgName; + private String userSid; + /** + * 仓库 + */ + private String warehouseName; + +} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/FittingsInventoryVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/FittingsInventoryVo.java new file mode 100644 index 0000000000..b613a783ad --- /dev/null +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/FittingsInventoryVo.java @@ -0,0 +1,55 @@ +package com.yxt.wms.biz.inventory.wmsinventory; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/8/21 16:43 + */ +@Data +public class FittingsInventoryVo implements Vo { + + /** + * 供应商 + */ + private String billObjName; + /** + * 图号 + */ + private String goodsSkuCode; + /** + * 规格 + */ + private String goodsSkuOwnSpec; + /** + * 商品名称 + */ + private String goodsSpuName; + /** + * 库存 + */ + private String inventoryCount; + /** + * 厂家 + */ + private String manufacturerName; + /** + * 服务站 + */ + private String deptName; + /** + * 分公司 + */ + private String useOrgName; + /** + * 单位 + */ + private String unit; + /** + * 仓库 + */ + private String warehouseName; + +} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventory.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventory.java index 483cdbe8fe..d47c167724 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventory.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventory.java @@ -68,4 +68,8 @@ public class WmsInventory extends BaseEntity { private String manufacturerSid; // 库位sid @ApiModelProperty("厂家名称") private String manufacturerName; // 库位编号 + @ApiModelProperty("供应商sid") + private String billObjSid; // 供应商sid + @ApiModelProperty("供应商名称") + private String billObjName; // 供应商名称 } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.java index 8a4d611ffa..ed427b2d26 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.java @@ -68,4 +68,6 @@ public interface WmsInventoryMapper extends BaseMapper { List selByDeptSidAndRackSid(@Param("deptSid") String deptSid,@Param("rackSids") List rackSids); IPage selInvenGoodsByUseOrgSid(IPage page,@Param(Constants.WRAPPER) QueryWrapper qw); + + IPage fittingsInventory(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); } 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 53118dddcf..aa284a37f9 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 @@ -387,4 +387,27 @@ ${ew.sqlSegment} + 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 7436e8e1a6..4452c4062f 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 @@ -18,12 +18,17 @@ import com.yxt.wms.biz.inventory.wmsinventory.appH5.HouseRackH5Vo; import com.yxt.wms.biz.inventory.wmsinventory.appH5.HouseRackListVo; import com.yxt.wms.biz.inventory.wmsinventorybill.WmsInventoryBill; import com.yxt.wms.biz.inventory.wmsinventorybill.WmsInventoryBillService; +import com.yxt.wms.biz.inventory.wmsshelfbill.WmsShelfBill; +import com.yxt.wms.biz.inventory.wmsshelfbill.WmsShelfBillQuery; +import com.yxt.wms.biz.inventory.wmsshelfbill.WmsShelfBillVo; import com.yxt.wms.feign.base.basegoodssku.BaseGoodsSkuDetailsVo; import com.yxt.wms.feign.base.basegoodssku.BaseGoodsSkuFeign; import com.yxt.wms.feign.pms.PmsPurchasebackDetailFeign; +import com.yxt.wms.feign.portal.privilege.PrivilegeQuery; import com.yxt.wms.feign.portal.sysorganization.SysOrganizationFeign; import com.yxt.wms.feign.portal.sysorganization.SysOrganizationVo; import com.yxt.wms.feign.portal.sysstafforg.SysStaffOrgFeign; +import com.yxt.wms.feign.portal.sysuser.SysUserFeign; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -48,7 +53,8 @@ public class WmsInventoryService extends MybatisBaseService listPage(PagerQuery pq) { WmsInventoryQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); @@ -612,4 +618,71 @@ public class WmsInventoryService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); return p; } + + public PagerVo fittingsInventory(PagerQuery pq) { + FittingsInventoryQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(query.getOrgPath()); + privilegeQuery.setMenuUrl(query.getMenuUrl()); + privilegeQuery.setUserSid(query.getUserSid()); + ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + String orgSidPath = query.getOrgPath(); + orgSidPath = orgSidPath + "/"; + int i1 = orgSidPath.indexOf("/"); + int i2 = orgSidPath.indexOf("/", i1 + 1); + int i3 = orgSidPath.indexOf("/", i2 + 1); + int i4 = orgSidPath.indexOf("/", i3 + 1); + String orgLevelKey = defaultIdReltBean.getData(); + if ("1".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i1); + qw.like("a.orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("a.orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("a.orgSidPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("a.orgSidPath", orgSidPath); + } else if ("5".equals(orgLevelKey)) { +// qw.eq("wsb.createBySid", query.getUserSid()); + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } else { + PagerVo p = new PagerVo<>(); + return p; + } + //ToDo:添加查询条件 + if (StringUtils.isNotBlank(query.getBillObjName())) { + qw.like("a.billObjName", query.getBillObjName()); + } + if (StringUtils.isNotBlank(query.getDeptName())) { + qw.like("a.deptName", query.getDeptName()); + } + if (StringUtils.isNotBlank(query.getGoodsSkuCode())) { + qw.like("a.goodsSkuCode", query.getGoodsSkuCode()); + } + if (StringUtils.isNotBlank(query.getGoodsSpuName())) { + qw.like("a.goodsSpuName", query.getGoodsSpuName()); + } + if (StringUtils.isNotBlank(query.getManufacturerName())) { + qw.like("a.manufacturerName", query.getManufacturerName()); + } + if (StringUtils.isNotBlank(query.getUseOrgName())) { + qw.like("a.useOrgName", query.getUseOrgName()); + } + if (StringUtils.isNotBlank(query.getWarehouseName())) { + qw.like("a.warehouseName", query.getWarehouseName()); + } + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.fittingsInventory(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } }