diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java index 1bf4f595a9..59a99ad733 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java @@ -340,7 +340,7 @@ public interface BaseVehicleFeign { @ResponseBody public ResultBean> specialRebateDisGetVeh(@RequestBody PagerQuery pq); - @ApiOperation("根据专项返利sid查询选择的车辆信息") + @ApiOperation("根据专项返利sid查询选择的分配车辆信息") @PostMapping("/getVehBySpecialRebateSid") @ResponseBody public ResultBean> getVehBySpecialRebateSid(@RequestParam("specialRebateSid") String specialRebateSid); diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBill.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBill.java index f2d9932c24..f8b2cc3d4b 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBill.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBill.java @@ -164,4 +164,9 @@ public class AsBusrepairBill extends BaseEntity { private String shClaimTypeValue; @ApiModelProperty("加税点项目") private String taxItems; + @ApiModelProperty("厂家报告编号") + private String manuReportNo; + @ApiModelProperty("报告首次提报时间") + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + private Date reportFirstDate; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillPageListQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillPageListQuery.java index fb44d0feb6..c34087c71f 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillPageListQuery.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillPageListQuery.java @@ -11,61 +11,54 @@ import lombok.Data; **/ @Data public class AsBusrepairBillPageListQuery implements Query { - private static final long serialVersionUID = -4727573438243441267L; - private String orgPath; - private String createBySid; + @ApiModelProperty("分公司") private String useOrgName; - @ApiModelProperty("制单部门") private String deptName; - @ApiModelProperty("制单人") private String createByName; - - @ApiModelProperty("单据编号") + @ApiModelProperty("维修单号") private String billNo; - + @ApiModelProperty("索赔类型value") + private String shClaimTypeValue; //制单日期开始时间-制单日期结束时间 private String createTimeStart; private String createTimeEnd; - @ApiModelProperty("工单类型") private String billType; - - @ApiModelProperty("科目") - private String subject; - + @ApiModelProperty("竣工时间") + private String finishTimeStart; + private String finishTimeEnd; + @ApiModelProperty("结算时间") + private String settleTimeStart; + private String settleTimeEnd; //进场时间开始时间-进厂时间结束时间 private String entryTimeStart; private String entryTimeEnd; - - //预计完工开始时间-预计完工结束时间 - private String estimatedFinishTimeStart; - private String estimatedFinishTimeEnd; - + @ApiModelProperty("报告首次提报时间") + private String reportFirstDateStart; + private String reportFirstDateEnd; @ApiModelProperty("客户名称") private String customerName; - @ApiModelProperty("联系电话") private String mobile; - @ApiModelProperty("客户单位") private String customerOrg; - @ApiModelProperty("车牌号") private String vehMark; - @ApiModelProperty("车架号") private String vinNo; - @ApiModelProperty("服务顾问") private String waitorName; @ApiModelProperty("班组名称") private String groupName; - @ApiModelProperty("主修人（可多选）销售单") private String mainRepairers; - //是否开票 + + private String orgPath; + private String userSid; + @ApiModelProperty("菜单url") + private String menuUrl; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillPageListVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillPageListVo.java index 79d3acef99..a2ebae8a4c 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillPageListVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillPageListVo.java @@ -1,8 +1,11 @@ package com.yxt.anrui.as.api.asbusrepairbill; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + /** * @description: 待索赔维修工单返回参数 * @author: dimengzhe @@ -15,39 +18,36 @@ public class AsBusrepairBillPageListVo { @ApiModelProperty("索赔单数量") private String num; - @ApiModelProperty("索赔单编号") private String spdBillNo; - - @ApiModelProperty("单据编号") + @ApiModelProperty("维修单号") private String billNo; - - @ApiModelProperty("环节") - private String nodeName; - + @ApiModelProperty("索赔类型value") + private String shClaimTypeValue; + @ApiModelProperty("厂家报告编号") + private String manuReportNo; + @ApiModelProperty("报告首次提报时间") + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + private Date reportFirstDate; @ApiModelProperty("分公司") private String useOrgName; - @ApiModelProperty("制单部门") private String deptName; - @ApiModelProperty("制单人") private String createByName; - @ApiModelProperty("制单日期") private String createTime; - @ApiModelProperty("工单类型") private String billType; - - @ApiModelProperty("科目") - private String subject; - @ApiModelProperty("进厂时间") - private String entryTime; - - @ApiModelProperty("预计完工时间") - private String estimatedFinishTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + private Date entryTime; + @ApiModelProperty("竣工时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + private Date finishTime; + @ApiModelProperty("结算时间") + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + private Date settleTime; @ApiModelProperty("客户名称") private String customerName; @ApiModelProperty("联系电话") diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillRest.java index 14cc667c0b..cd4313a843 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillRest.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillRest.java @@ -2,7 +2,6 @@ package com.yxt.anrui.as.biz.asbusclaimbill; import cn.hutool.core.date.DateUtil; import com.yxt.anrui.as.api.asbusclaimbill.*; -import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBillPageListVo; import com.yxt.common.base.utils.ExportExcelUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -23,9 +22,7 @@ import java.io.UnsupportedEncodingException; import java.math.BigDecimal; import java.net.URLEncoder; import java.text.ParseException; -import java.text.SimpleDateFormat; import java.util.*; -import java.util.regex.Pattern; /** * @description: diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.java index ca94c84f91..f9b2526fbf 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.java @@ -78,4 +78,7 @@ public interface AsBusrepairBillMapper extends BaseMapper { IPage debtBusiness(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); IPage businessDetails(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + @Update("update as_busrepair_bill set manuReportNo = #{manuReportNo},reportFirstDate = #{reportFirstDate} where sid = #{sid}") + void updateManuReportNo(@Param("sid") String sid, @Param("manuReportNo") String manuReportNo, @Param("reportFirstDate") String reportFirstDate); } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml index c45d44897e..e1d4521779 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml @@ -157,9 +157,12 @@ a.useOrgName, a.deptName, a.createByName, - a.subject, + a.shClaimTypeValue, + a.manuReportNo, + DATE_FORMAT(a.reportFirstDate, '%Y-%m-%d') as reportFirstDate, DATE_FORMAT(a.entryTime, '%Y-%m-%d') as entryTime, - DATE_FORMAT(a.estimatedFinishTime, '%Y-%m-%d') as estimatedFinishTime, + DATE_FORMAT(a.finishTime, '%Y-%m-%d') as finishTime, + a.settleTime, a.customerName, a.mobile, a.customerOrg, @@ -175,6 +178,7 @@ b.vehModel from as_busrepair_bill a LEFT JOIN as_busrepair_bill_vech AS b on a.sid = b.billSid + LEFT JOIN anrui_portal.sys_organization AS s ON a.deptSid = s.sid ${ew.sqlSegment} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java index 378c177edd..55a1a68119 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java @@ -44,6 +44,7 @@ public class AsBusrepairBillRest { private AsBusrepairInventorybillDetailService asBusrepairInventorybillDetailService; @Autowired private AsBusrepairBillInvoiceService asBusrepairBillInvoiceService; + @PostMapping("/listPage") @ApiOperation("工单查询列表") ResultBean> listPage(@RequestBody PagerQuery pagerQuery) { @@ -51,6 +52,7 @@ public class AsBusrepairBillRest { PagerVo pv = asBusrepairBillService.listPage(pagerQuery); return rb.success().setData(pv); } + @PostMapping("/appRepairs") @ApiOperation("app工单查询列表") ResultBean> appRepairs(@RequestBody PagerQuery pagerQuery) { @@ -58,6 +60,7 @@ public class AsBusrepairBillRest { PagerVo pv = asBusrepairBillService.appRepairs(pagerQuery); return rb.success().setData(pv); } + @PostMapping("/listPageCC") @ApiOperation("工单查询列表-出厂") ResultBean> listPageCC(@RequestBody PagerQuery pagerQuery) { @@ -88,6 +91,12 @@ public class AsBusrepairBillRest { return asBusrepairBillService.saveBill(dto); } + @PostMapping("/updateManuReportNo") + @ApiOperation("维护厂家报告编号") + ResultBean updateManuReportNo(@RequestParam("sid") String sid, @RequestParam("manuReportNo") String manuReportNo, @RequestParam("reportFirstDate") String reportFirstDate) { + return asBusrepairBillService.updateManuReportNo(sid, manuReportNo, reportFirstDate); + } + @PostMapping("/updateOldIsReclaim") @ApiOperation("修改维修工单是否登记") ResultBean updateOldIsReclaim(@RequestParam("billNo") String billNo) { @@ -144,27 +153,32 @@ public class AsBusrepairBillRest { public AsBusrepairBillInvoice fetchInvoiceBySid(@RequestParam("sid") String sid) { return asBusrepairBillInvoiceService.fetchByBillSid(sid); } + @ApiOperation("获取维修单") @GetMapping("/fetchBySid") public AsBusrepairBill fetchBySid(@RequestParam("sid") String sid) { AsBusrepairBill asBusrepairBill = asBusrepairBillService.fetchBySid(sid); return asBusrepairBill; } + @ApiOperation("获取维修项目") @GetMapping("/fetchSitemByBillSid") public List fetchSitemByBillSid(@RequestParam("sid") String sid) { return asBusrepairBillSitemService.fetchByBillSid(sid); } + @ApiOperation("获取维修用料") @GetMapping("/fetchGoodsByBillSid") public List fetchGoodsByBillSid(@RequestParam("sid") String sid) { return asBusrepairInventorybillDetailService.getGoodsDetailsByBillSid(sid); } + @ApiOperation("获取维修项目维修人员") @GetMapping("/fetchSitemRepairerByBillSid") - public List fetchSitemRepairerByBillSid(@RequestParam("sid") String sid,@RequestParam("itemSid") String itemSid) { - return asBusrepairBillSitemRepairerService.fetchByBillSid(sid,itemSid); + public List fetchSitemRepairerByBillSid(@RequestParam("sid") String sid, @RequestParam("itemSid") String itemSid) { + return asBusrepairBillSitemRepairerService.fetchByBillSid(sid, itemSid); } + @ApiOperation("获取车辆信息") @GetMapping("/fetchVehInfoByBillSid}") public AsBusrepairBillVech fetchVehInfoByBillSid(@RequestParam("sid") String sid) { @@ -199,9 +213,11 @@ public class AsBusrepairBillRest { @ApiOperation("生成出门证") @PostMapping("/createPdf") - public ResultBean createPdf(@RequestParam("sid") String sid){ + public ResultBean createPdf(@RequestParam("sid") String sid) { return asBusrepairBillService.createPdf(sid); - }; + } + + ; //============================================================================== @@ -284,6 +300,7 @@ public class AsBusrepairBillRest { public ResultBean fetchDetailsBySid2(@PathVariable("sid") String sid) { return asBusrepairBillService.fetchDetailsBySid(sid); } + //----------------------------app维修完毕----------------------------- @PostMapping("/notConfirmList2") @ApiOperation("获取维修完毕待确认列表") diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java index 5171a172d3..2c15d1f77f 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.as.api.asappendix.AsAppendix; import com.yxt.anrui.as.api.asbillsettelapply.AsBillSettelApplyDto; +import com.yxt.anrui.as.api.asbusclaimbill.AsBusclaimBillVo; import com.yxt.anrui.as.api.asbusrepairbill.*; import com.yxt.anrui.as.api.asbusrepairbill.app.*; import com.yxt.anrui.as.api.asbusrepairbill.report.*; @@ -1706,6 +1707,45 @@ public class AsBusrepairBillService extends MybatisBaseService billPageList(PagerQuery pagerQuery) { AsBusrepairBillPageListQuery query = pagerQuery.getParams(); QueryWrapper qw = new QueryWrapper<>(); + //========================================数据授权开始 + if (StringUtils.isNotBlank(query.getMenuUrl())) { + 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("s.orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("s.orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("s.orgSidPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("s.orgSidPath", orgSidPath); + } else if ("5".equals(orgLevelKey)) { + qw.eq("a.createBySid", query.getUserSid()); + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } //ToDo:添加查询条件 //分公司 if (StringUtils.isNotBlank(query.getUseOrgName())) { @@ -1723,6 +1763,9 @@ public class AsBusrepairBillService extends MybatisBaseService= date_format('" + query.getCreateTimeStart() + "','%Y-%m-%d')"). apply(StringUtils.isNotBlank(query.getCreateTimeEnd()), "date_format (a.createTime,'%Y-%m-%d') <= date_format('" + query.getCreateTimeEnd() + "','%Y-%m-%d')" @@ -1731,17 +1774,18 @@ public class AsBusrepairBillService extends MybatisBaseService= date_format('" + query.getEntryTimeStart() + "','%Y-%m-%d')"). apply(StringUtils.isNotBlank(query.getEntryTimeEnd()), "date_format (a.entryTime,'%Y-%m-%d') <= date_format('" + query.getEntryTimeEnd() + "','%Y-%m-%d')" ); - //预计完工开始时间-预计完工结束时间 - qw.apply(StringUtils.isNotBlank(query.getEstimatedFinishTimeStart()), "date_format (a.estimatedFinishTime,'%Y-%m-%d') >= date_format('" + query.getEstimatedFinishTimeStart() + "','%Y-%m-%d')"). - apply(StringUtils.isNotBlank(query.getEstimatedFinishTimeEnd()), "date_format (a.estimatedFinishTime,'%Y-%m-%d') <= date_format('" + query.getEstimatedFinishTimeEnd() + "','%Y-%m-%d')" + qw.apply(StringUtils.isNotBlank(query.getFinishTimeStart()), "date_format (a.finishTime,'%Y-%m-%d') >= date_format('" + query.getFinishTimeStart() + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(query.getFinishTimeEnd()), "date_format (a.finishTime,'%Y-%m-%d') <= date_format('" + query.getFinishTimeEnd() + "','%Y-%m-%d')" + ); + qw.apply(StringUtils.isNotBlank(query.getSettleTimeStart()), "date_format (a.settleTime,'%Y-%m-%d') >= date_format('" + query.getSettleTimeStart() + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(query.getSettleTimeEnd()), "date_format (a.settleTime,'%Y-%m-%d') <= date_format('" + query.getSettleTimeEnd() + "','%Y-%m-%d')" + ); + qw.apply(StringUtils.isNotBlank(query.getReportFirstDateStart()), "date_format (a.reportFirstDate,'%Y-%m-%d') >= date_format('" + query.getReportFirstDateStart() + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(query.getReportFirstDateEnd()), "date_format (a.reportFirstDate,'%Y-%m-%d') <= date_format('" + query.getReportFirstDateEnd() + "','%Y-%m-%d')" ); //客户名称 if (StringUtils.isNotBlank(query.getCustomerName())) { @@ -3069,4 +3113,10 @@ public class AsBusrepairBillService extends MybatisBaseService updateManuReportNo(String sid, String manuReportNo, String reportFirstDate) { + ResultBean rb = ResultBean.fireFail(); + baseMapper.updateManuReportNo(sid,manuReportNo,reportFirstDate); + return rb.success(); + } } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitindetail/WmsInventoryProfitinDetailMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitindetail/WmsInventoryProfitinDetailMapper.xml index bd6a5a9365..2fc38ea29d 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitindetail/WmsInventoryProfitinDetailMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitindetail/WmsInventoryProfitinDetailMapper.xml @@ -20,7 +20,8 @@ supplierSid, supplierName, inCost AS inStoragePrice, - inCount AS inStorageNum + inCount AS inStorageNum, + inCost * inCount AS money FROM wms_inventory_profitin_detail WHERE mainSid = #{mainSid}