Browse Source

app欠款月结客户备案、配件库存

master
fanzongzhe 10 months ago
parent
commit
c972f3f58b
  1. 5
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerFeign.java
  2. 5
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerFeignFallback.java
  3. 7
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeign.java
  4. 5
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeignFallback.java
  5. 7
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerRest.java
  6. 7
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractRest.java
  7. 4
      anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriseperson/CrmMaintenanceenterprisePersonFeign.java
  8. 7
      anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordDetailsVo.java
  9. 4
      anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordFeign.java
  10. 10
      anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriseveh/CrmMaintenanceenterpriseVehFeign.java
  11. 14
      anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordService.java
  12. 37
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java
  13. 1
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java
  14. 4
      anrui-system-ui/src/views/flow/doneList.vue
  15. 31
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/crm/crmmaintenanceenterpriserecord/CarListVo.java
  16. 167
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/crm/crmmaintenanceenterpriserecord/MonthEndDetailsVo.java
  17. 67
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/crm/crmmaintenanceenterpriserecord/MonthEndFeign.java
  18. 52
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/crm/crmmaintenanceenterpriserecord/MonthEndFeignFallback.java
  19. 32
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/crm/crmmaintenanceenterpriserecord/PersonListVo.java
  20. 46
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/crm/crmmaintenanceenterpriserecord/flow/AppMonthEndTaskQuery.java
  21. 35
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/crm/crmmaintenanceenterpriserecord/flow/CompleteMonthEndDto.java
  22. 25
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/crm/crmmaintenanceenterpriserecord/flow/MonthEndDelegateQuery.java
  23. 21
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/crm/crmmaintenanceenterpriserecord/flow/MonthEndFlowableQuery.java
  24. 97
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/crm/crmmaintenanceenterpriserecord/MonthEndRest.java
  25. 70
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/crm/crmmaintenanceenterpriserecord/MonthEndService.java
  26. 8
      yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRest.java
  27. 46
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/FittingsInventoryQuery.java
  28. 55
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/FittingsInventoryVo.java
  29. 4
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventory.java
  30. 2
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.java
  31. 23
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml
  32. 75
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java

5
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<String> selectByCustomSid(@RequestParam("customSid") String customSid);
@ApiOperation("根据SID获取记录")
@GetMapping("/fetchEntityBySid")
@ResponseBody
public ResultBean<BusSalesOrderBorrower> fetchEntityBySid(@RequestParam("sid") String sid);
}

5
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<String> selectByCustomSid(String customSid) {
return null;
}
@Override
public ResultBean<BusSalesOrderBorrower> fetchEntityBySid(String sid) {
return null;
}
}

7
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<BusSalesOrderLoancontract> contracts);
@ApiOperation("根据sid查询")
@GetMapping("/fetchEntityBySid")
@ResponseBody
public ResultBean<BusSalesOrderLoancontract> fetchEntityBySid(@RequestParam("sid") String sid);
}

5
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<BusSalesOrderLoancontract> contracts) {
return null;
}
@Override
public ResultBean<BusSalesOrderLoancontract> fetchEntityBySid(String sid) {
return null;
}
}

7
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<BusSalesOrderBorrower> fetchEntityBySid(String sid) {
ResultBean rb = ResultBean.fireFail();
BusSalesOrderBorrower busSalesOrderBorrower = busSalesOrderBorrowerService.fetchBySid(sid);
return rb.success().setData(busSalesOrderBorrower);
}
}

7
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<BusSalesOrderLoancontract> fetchEntityBySid(String sid) {
ResultBean rb = ResultBean.fireFail();
BusSalesOrderLoancontract loancontract = busSalesOrderLoancontractService.fetchBySid(sid);
return rb.success().setData(loancontract);
}
}

4
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 {

7
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<FileQueryUrl> files = new ArrayList<>();
private List<String> files2 = new ArrayList<>();
/**
* 备案有效期
*/
@ -163,6 +169,7 @@ public class CrmMaintenanceenterpriseRecordDetailsVo implements Vo {
* 流程实例ID
*/
private String instanceId;
private String procInsId;
/**
* 联系电话
*/

4
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 {

10
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<CrmMaintenanceenterpriseVehDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
}
}

14
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<Cr
List<PersonListVo> contactPerson = new ArrayList<>();
List<CarListVo> carListVos = new ArrayList<>();
List<FileQueryUrl> files = new ArrayList<>();
List<String> files2 = new ArrayList<>();
if (null != entity) {
BeanUtil.copyProperties(entity, vo);
if (StringUtils.isNotBlank(entity.getProcInstId())) {
@ -301,9 +302,14 @@ public class CrmMaintenanceenterpriseRecordService extends MybatisBaseService<Cr
vo.setFilingIndate(DateUtil.formatDate(entity.getFilingIndate()));
}
CrmCustomerTemp customerTemp = crmCustomerTempService.fetchBySid(entity.getCustomerSid());
String sheng ="";
String shi ="";
String xian ="";
String dizhi ="";
if (null != customerTemp) {
if (StringUtils.isNotBlank(customerTemp.getAddress())) {
vo.setAddress(customerTemp.getAddress());
dizhi = customerTemp.getAddress();
}
if (StringUtils.isNotBlank(customerTemp.getCertificateType())) {
vo.setCertificateType(customerTemp.getCertificateType());
@ -313,9 +319,11 @@ public class CrmMaintenanceenterpriseRecordService extends MybatisBaseService<Cr
}
if (StringUtils.isNotBlank(customerTemp.getCity())) {
vo.setCity(customerTemp.getCity());
shi = customerTemp.getCity();
}
if (StringUtils.isNotBlank(customerTemp.getCounty())) {
vo.setCounty(customerTemp.getCounty());
xian = customerTemp.getCounty();
}
if (StringUtils.isNotBlank(customerTemp.getName())) {
vo.setCustomerName(customerTemp.getName());
@ -343,6 +351,7 @@ public class CrmMaintenanceenterpriseRecordService extends MybatisBaseService<Cr
}
if (StringUtils.isNotBlank(customerTemp.getProvince())) {
vo.setProvince(customerTemp.getProvince());
sheng = customerTemp.getProvince();
}
if (StringUtils.isNotBlank(customerTemp.getIDNumber())) {
vo.setIdnumber(customerTemp.getIDNumber());
@ -350,6 +359,7 @@ public class CrmMaintenanceenterpriseRecordService extends MybatisBaseService<Cr
if (StringUtils.isNotBlank(customerTemp.getWeixin())) {
vo.setWeixin(customerTemp.getWeixin());
}
vo.setCustomerAddress(sheng+shi+xian+dizhi);
}
List<CrmMaintenanceenterprisePerson> personList = crmMaintenanceenterprisePersonService.selByBillSid(sid);
if (!personList.isEmpty()) {
@ -381,10 +391,12 @@ public class CrmMaintenanceenterpriseRecordService extends MybatisBaseService<Cr
for (CrmFileDetailsVo crmFileDetailsVo : crmFileDetailsVos) {
FileQueryUrl url = new FileQueryUrl();
String filePath = crmFileDetailsVo.getFilePath();
url.setUrl(fileUploadComponent.getUrlPrefix() + filePath);
url.setUrl(filePath);
files.add(url);
files2.add(filePath);
}
vo.setFiles(files);
vo.setFiles2(files2);
}
}
return vo;

37
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java

@ -5137,6 +5137,23 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
borrowers.add(busSalesOrderBorrower);
} else {
borrowerSid = vehicleData.getBorrowerSid();
BusSalesOrderBorrower borrower = busSalesOrderBorrowerFeign.fetchEntityBySid(borrowerSid).getData();
if (null == borrower) {
//生成销售订单贷款人表
BusSalesOrderBorrower busSalesOrderBorrower = new BusSalesOrderBorrower();
busSalesOrderBorrower.setSid(borrowerSid);
busSalesOrderBorrower.setSalesOrderSid(salesOrderSid);
busSalesOrderBorrower.setCustomSid(borrowerCustomerSid);
busSalesOrderBorrower.setBorrowerName(borrowerCustomerName);
busSalesOrderBorrower.setMobile("");
busSalesOrderBorrower.setVehCount(1);
busSalesOrderBorrower.setBankSid(bankSid);
busSalesOrderBorrower.setBankName(bankName);
busSalesOrderBorrower.setPolicyName(policyName);
busSalesOrderBorrower.setIsEnable(3);
busSalesOrderBorrower.setCreateBySid(userSid);
borrowers.add(busSalesOrderBorrower);
}
}
if (StringUtils.isBlank(vehicleData.getLoanContractSid())) {
//生成消贷合同表
@ -5158,6 +5175,26 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
contracts.add(bsl);
} else {
loanContractSid = vehicleData.getLoanContractSid();
BusSalesOrderLoancontract loancontract = busSalesOrderLoancontractFeign.fetchEntityBySid(loanContractSid).getData();
if (null == loancontract) {
//生成消贷合同表
BusSalesOrderLoancontract bsl = new BusSalesOrderLoancontract();
bsl.setSid(loanContractSid);
bsl.setSalesOrderSid(salesOrderSid);
bsl.setLoanContractNo(loanContractNo);
bsl.setBankContractNo(bankContractNo);
bsl.setBankName(bankName);
bsl.setPolicyName(policyName);
bsl.setBorrowerSid(borrowerSid);
bsl.setBorrowerName(borrowerCustomerName);
bsl.setVehCount(1);
bsl.setIsEnable(3);
bsl.setCreateBySid(userSid);
bsl.setBusNo("305");
bsl.setRepaymentState("1");
bsl.setRepaymentCreateTime(new Date());
contracts.add(bsl);
}
}
vehicleData.setTemporaryNo(borrowerNo);
vehicleData.setBorrowerSid(borrowerSid);

1
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java

@ -1626,6 +1626,7 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
qw.eq("bv.repoState", 0);
}
}
qw.eq("ld.repaymentState",1);
qw.orderBy(true, true, "ld.loanContractNo", "bv.linkNo");
}
IPage<LoanSettleApply> page = PagerUtil.queryToPage(pagerQuery);

4
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({

31
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
}

167
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<CarListVo> carList = new ArrayList<>();
/**
* 证件类型
*/
private String certificateType;
/**
* 证件类型Key
*/
private String certificateTypeKey;
/**
*
*/
private String city;
/**
* 对接人列表
*/
private List<PersonListVo> 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<String> 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;
}

67
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<MonthEndDetailsVo> 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<String> getFlowOperateTitle(@Valid @SpringQueryMap MonthEndFlowableQuery query);
@ApiOperation(value = "加签")
@PutMapping(value = "/delegate")
@ResponseBody
public ResultBean delegate(@RequestBody MonthEndDelegateQuery delegateQuery);
}

52
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<MonthEndDetailsVo> 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<String> getFlowOperateTitle(MonthEndFlowableQuery query) {
return null;
}
@Override
public ResultBean delegate(MonthEndDelegateQuery delegateQuery) {
return null;
}
}

32
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
}

46
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;
}

35
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;
}

25
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;
}

21
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;
}

97
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(销售相关) <br/>
* File: FinCollectionConfirmationFeignFallback.java <br/>
* Class: com.yxt.anrui.fin.biz.fincollectionconfirmation.FinCollectionConfirmationRest <br/>
* Description: 收款确认表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-04-12 17:57:01 <br/>
*
* @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<MonthEndDetailsVo> 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<String> getFlowOperateTitle(MonthEndFlowableQuery query) {
return null;
}
@Override
public ResultBean delegate(MonthEndDelegateQuery delegateQuery) {
return null;
}
}

70
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(销售相关) <br/>
* File: FinCollectionConfirmationService.java <br/>
* Class: com.yxt.anrui.fin.biz.fincollectionconfirmation.FinCollectionConfirmationService <br/>
* Description: 收款确认表 业务逻辑. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-04-12 17:57:01 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Service
public class MonthEndService {
@Autowired
private CrmMaintenanceenterpriseRecordFeign crmMaintenanceenterpriseRecordFeign;
public ResultBean<MonthEndDetailsVo> 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);
}
}

8
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<PagerVo<FittingsInventoryVo>> fittingsInventory(@RequestBody PagerQuery<FittingsInventoryQuery> pq) {
ResultBean<PagerVo<FittingsInventoryVo>> rb = ResultBean.fireFail();
PagerVo<FittingsInventoryVo> pv = wmsInventoryService.fittingsInventory(pq);
return rb.success().setData(pv);
}
@ApiOperation("分页列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<WmsInventoryVo>> listPage(@RequestBody PagerQuery<WmsInventoryQuery> pq) {

46
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;
}

55
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;
}

4
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; // 供应商名称
}

2
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.java

@ -68,4 +68,6 @@ public interface WmsInventoryMapper extends BaseMapper<WmsInventory> {
List<WmsInventory> selByDeptSidAndRackSid(@Param("deptSid") String deptSid,@Param("rackSids") List<String> rackSids);
IPage<WmsInventoryBillUseOrgSidVo> selInvenGoodsByUseOrgSid(IPage<WmsInventory> page,@Param(Constants.WRAPPER) QueryWrapper<WmsInventory> qw);
IPage<FittingsInventoryVo> fittingsInventory(IPage<WmsInventory> page, @Param(Constants.WRAPPER) QueryWrapper<WmsInventory> qw);
}

23
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml

@ -387,4 +387,27 @@
${ew.sqlSegment}
</where>
</select>
<select id="fittingsInventory" resultType="com.yxt.wms.biz.inventory.wmsinventory.FittingsInventoryVo">
SELECT * FROM (
SELECT
so.`name` useOrgName,
s.`name` deptName,
wi.goodsSpuName,
wi.goodsSkuCode,
wi.goodsSkuOwnSpec,
wi.unit,
wi.warehouseName,
wi.manufacturerName,
wi.billObjName,
IFNULL(SUM(count),0) as inventoryCount,
s.orgSidPath
FROM
wms_inventory as wi
LEFT JOIN anrui_portal.sys_organization as so ON wi.createOrgSid = so.sid
LEFT JOIN anrui_portal.sys_organization as s ON wi.useOrgSid = s.sid
GROUP BY wi.createOrgSid,wi.useOrgSid,wi.warehouseSid,wi.goodsSkuCode,wi.billObjName) as a
<where>
${ew.sqlSegment}
</where>
</select>
</mapper>

75
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<WmsInventoryMapper,
private PmsPurchasebackDetailFeign pmsPurchasebackDetailFeign;
@Autowired
private WmsWarehouseRackService wmsWarehouseRackService;
@Autowired
private SysUserFeign sysUserFeign;
public PagerVo<WmsInventoryVo> listPage(PagerQuery<WmsInventoryQuery> pq) {
WmsInventoryQuery query = pq.getParams();
QueryWrapper<WmsInventory> qw = new QueryWrapper<>();
@ -612,4 +618,71 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
PagerVo<WmsInventoryBillUseOrgSidVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public PagerVo<FittingsInventoryVo> fittingsInventory(PagerQuery<FittingsInventoryQuery> pq) {
FittingsInventoryQuery query = pq.getParams();
QueryWrapper<WmsInventory> qw = new QueryWrapper<>();
PrivilegeQuery privilegeQuery = new PrivilegeQuery();
privilegeQuery.setOrgPath(query.getOrgPath());
privilegeQuery.setMenuUrl(query.getMenuUrl());
privilegeQuery.setUserSid(query.getUserSid());
ResultBean<String> 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<FittingsInventoryVo> p = new PagerVo<>();
return p;
}
} else {
PagerVo<FittingsInventoryVo> 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<WmsInventory> page = PagerUtil.queryToPage(pq);
IPage<FittingsInventoryVo> pagging = baseMapper.fittingsInventory(page, qw);
PagerVo<FittingsInventoryVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
}

Loading…
Cancel
Save