Merge remote-tracking branch 'origin/master'

# Conflicts:
#	yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationService.java

@@ -176,7 +176,7 @@ public class BusBillApplicationService extends MybatisBaseService<BusBillApplica
                     busBillTrailer.setOpenTickName(busBillVehicle.getOpenTickName());
                     busBillTrailer.setBillTypeKey(busBillVehicle.getBillTypeKey());
                     busBillTrailer.setBillTypeValue(busBillVehicle.getBillTypeValue());
-                    busBillTrailer.setOneBillMoney(busBillApplication.getOneBillMoney());
+                    busBillTrailer.setOneBillMoney(new BigDecimal(trailerVo.getDealPrice()));
                     busBillTrailerService.save(busBillTrailer);
                 }
             }
@@ -282,7 +282,7 @@ public class BusBillApplicationService extends MybatisBaseService<BusBillApplica
                         busBillTrailer.setBillTypeValue(busBillVehicle.getBillTypeValue());
                         busBillTrailer.setOpenTickSid(busBillVehicle.getOpenTickSid());
                         busBillTrailer.setOpenTickName(busBillVehicle.getOpenTickName());
-                        busBillTrailer.setOneBillMoney(busBillApplication.getOneBillMoney());
+                        busBillTrailer.setOneBillMoney(new BigDecimal(busBillTrailerDto.getOneBillMoney()));
                     }
                 }
                 busBillTrailerService.save(busBillTrailer);

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java

@@ -468,8 +468,15 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
         Sheet sheet = wb.getSheetAt(0);
         ReturnExcelInfo importReturn = getSheetVal(sheet, resultCell);
         resultList = importReturn.getInfos();
+        String msg = "平台中不存在的资方合同编号:";
         for (BePadsincereExcelInfo bePadsincereExcelInfo : resultList) {
             List<LoanRepaymentScheduleDetailsVo> loanRepaymentScheduleDetailsVos = loanRepaymentScheduleService.selectByBankContractNo(bePadsincereExcelInfo.getBankContractNo());
+            if (loanRepaymentScheduleDetailsVos == null || loanRepaymentScheduleDetailsVos.size() == 0) {
+                if (StringUtils.isNotBlank(bePadsincereExcelInfo.getBankContractNo())) {
+                    msg = msg + bePadsincereExcelInfo.getBankContractNo() + ",";
+                    continue;
+                }
+            }
             for (LoanRepaymentScheduleDetailsVo loanRepaymentScheduleDetailsVo : loanRepaymentScheduleDetailsVos) {
                 LoanBePadsincereVehDetailsVo loanBePadsincereVehDetailsVo = new LoanBePadsincereVehDetailsVo();
                 loanBePadsincereVehDetailsVo.setVinNo(loanRepaymentScheduleDetailsVo.getVinNo());
@@ -498,6 +505,10 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
         }
         if (StringUtils.isNotBlank(importReturn.getCheckInfo())) {
             return rb.setMsg(importReturn.getCheckInfo());
+        } else if (!msg.equals("平台中不存在的资方合同编号:")) {
+            int lastIndex = msg.length() - 1;
+            msg = msg.substring(0, lastIndex) + "。";
+            return rb.success().setData(resultList2).setMsg(msg + "成功导入数据，请点击确定按钮");
         } else {
             return rb.success().setData(resultList2).setMsg("成功导入数据，请点击确定按钮");
         }
@@ -645,13 +656,6 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
                     checkWord.add("资方收款账号不能为空");
                     break;
                 }
-                List<LoanRepaymentScheduleDetailsVo> loanRepaymentScheduleDetailsVos = loanRepaymentScheduleService.selectByBankContractNo(excelInfo.getBankContractNo());
-                if (loanRepaymentScheduleDetailsVos == null || loanRepaymentScheduleDetailsVos.size() == 0) {
-                    if (StringUtils.isNotBlank(excelInfo.getBankContractNo())) {
-                        checkWord.add("资方合同号" + excelInfo.getBankContractNo() + "在还款计划表中不存在");
-                        break;
-                    }
-                }
             }
         }
         StringBuffer sbcheck1 = new StringBuffer();

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineMapper.java

@@ -105,7 +105,6 @@ public interface ScmVehicleExamineMapper extends BaseMapper<ScmVehicleExamine> {
     @Select("SELECT count(*) FROM scm_vehicle_examine  WHERE useOrgSid = #{useOrgSid} and inspectionResult = '1' ")
     int getToDoNum(@Param("useOrgSid") String useOrgSid);
 
-    @Select("SELECT count(*) FROM scm_vehicle_examine WHERE vinNo = #{vinNo} and useOrgSid = #{orgPath} and inspectionResult = '2' ")
     int getCountByVinNo(@Param("vinNo") String vinNo, @Param("orgPath") String orgPath);
 
     @Select("SELECT COUNT(*) FROM scm_vehicle_examine WHERE businessSid = #{businessSid} AND inspectionResult = 1")

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineMapper.xml

@@ -118,4 +118,17 @@
         </where>
         ORDER BY id DESC
     </select>
+
+    <select id="getCountByVinNo" resultType="int">
+        SELECT
+                COUNT(*)
+        FROM
+                scm_vehicle_examine se
+                        LEFT JOIN anrui_base.`base_vehicle` bv
+                        ON bv.vinNo = se.vinNo
+        WHERE se.vinNo LIKE CONCAT('%', #{vinNo}, '%')
+          AND se.useOrgSid = #{orgPath}
+          AND se.inspectionResult = '2'
+          AND bv.vehicleState != '0004'
+    </select>
 </mapper>

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java

@@ -546,12 +546,12 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
         if (StringUtils.isBlank(dto.getInboundDate())) {
             return rb.setMsg("厂家入库日期不能为空");
         }
-        if (StringUtils.isNotBlank(dto.getVin())){
+        if (StringUtils.isNotBlank(dto.getVin())) {
             String vinNo = dto.getVin();
             vinNo = vinNo.trim();
             vinNo = vinNo.replace(" ", "");
             if (vinNo.length() != 17) {
-                if (vinNo.length() != 8){
+                if (vinNo.length() != 8) {
                     return new ResultBean().fail().setMsg(dto.getVin() + "车架号输入不正确");
                 }
             }
@@ -659,16 +659,9 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
             orgName = sysOrganizationVo.getName();
         }
         String vinNo = dto.getVin();
-        BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(vinNo, orgSid).getData();
-        if (baseVehicle != null) {
-            if ("001".equals(baseVehicle.getManPurOrderTypeKey())){
-                int countByVinNo = baseMapper.getCountByVinNo(vinNo, orgSid);
-                if (countByVinNo > 0) {
-                    return rb.setMsg("该车架号已存在，请勿重复验车！");
-                }
-            }else {
-                return rb.setMsg("该车架号已存在，请勿重复验车！");
-            }
+        int countByVinNo = baseMapper.getCountByVinNo(vinNo, orgSid);
+        if (countByVinNo > 0) {
+            return rb.setMsg("该车架号已存在，请勿重复验车！");
         }
         String staffSid = sysUserFeign.getUserOrgInfoByUserSid(dto.getUserSid()).getData().getStaffSid();
         SysStaffinfoVo data = sysUserFeign.getSysUserByMobile(staffSid).getData();

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillListQuery.java

@@ -15,4 +15,17 @@ public class AsBusrepairBillListQuery implements Query {
 
     @ApiModelProperty("当前环节编码")
     private String nodeCode;
+
+    //工单编号
+    private String billNo;
+
+    //客户名称
+    private String customerName;
+
+    //车牌号
+    private String vehMark;
+
+    //进场日期开始时间-进场日期结束时间
+    private String entryTimeStart;
+    private String entryTimeEnd;
 }

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillListVo.java

@@ -9,10 +9,22 @@ import lombok.Data;
  **/
 @Data
 public class AsBusrepairBillListVo {
-
+    //工单sid
     private String sid;
-
+    //工单编号
     private String billNo;
+    //工单类型
+    private String billType;
+    //客户名称
+    private String customerName;
+    //联系电话
+    private String mobile;
+    //车架号
+    private String vinNo;
+    //车牌号
+    private String vehMark;
+    //进场日期
+    private String entryTime;
+
 
-    
 }

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillOutDetailsVo.java

@@ -0,0 +1,52 @@
+package com.yxt.anrui.as.api.asbusrepairbill;
+
+import com.yxt.anrui.as.api.asbusrepairbillsitem.AsBusrepairBillSitemVo;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/4/28
+ **/
+@Data
+public class AsBusrepairBillOutDetailsVo {
+
+    //操作人
+    private String createByName;
+
+    //操作部门
+    private String deptName;
+
+    //操作日期
+    private String createTime;
+
+    //维修工单编号
+    private String sourceBillNo;
+
+    //维修工单sid
+    private String sourceBillSid;
+
+    //维修工单单据日期
+    private String createTimeBill;
+
+    //服务顾问
+    private String waitorName;
+
+    //工单类型
+    private String billType;
+
+    //科目
+    private String subject;
+
+    //客户名称
+    private String customerName;
+
+    //车牌号/车架号
+    private String vehMark;
+
+    //服务项目
+    private List<AsBusrepairBillSitemVo> sitemList = new ArrayList<>();
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillsitem/AsBusrepairBillSitemVo.java

@@ -0,0 +1,39 @@
+package com.yxt.anrui.as.api.asbusrepairbillsitem;
+
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/4/28
+ **/
+@Data
+public class AsBusrepairBillSitemVo {
+    private String sid;
+    //服务项目
+    private String serviceItem;
+    //工种
+    private String serviceType;
+    //科目
+    private String subject;
+    //维修人
+    private String mainRepairers;
+    //考核工时
+    private String examineHourPrice;
+    //工时单价
+    private String hourPrice;
+    //工时数
+    private String hours;
+    //销售价
+    private String price;
+    //折扣
+    private String discount;
+    //优惠
+    private String discountAmount;
+    //金额
+    private String amount;
+    //备注
+    private String remarks;
+
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybill/AsBusrepairInventorybillQuery.java

@@ -13,4 +13,26 @@ public class AsBusrepairInventorybillQuery implements Query {
     private static final long serialVersionUID = 6148083647218322045L;
 
     private String userSid;
+    private String orgPath;
+
+    //单据编号
+    private String billNo;
+
+    //单据日期开始时间
+    private String createTimeStart;
+
+    //单据日期结束时间
+    private String createTimeEnd;
+
+    //维修工单编号
+    private String sourceBillNo;
+
+    //业务类型
+    private String busTypeValue;
+
+    //操作人
+    private String createByName;
+
+    //经办人
+    private String warehouseManager;
 }

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybill/AsBusrepairInventorybillVo.java

@@ -14,10 +14,16 @@ public class AsBusrepairInventorybillVo {
     private String sid;
     @ApiModelProperty("单据编号")
     private String billNo;
-    @ApiModelProperty("制单人")
+    @ApiModelProperty("单据时间")
+    private String createTime;
+    @ApiModelProperty("维修工单sid")
+    private String sourceBillSid;
+    @ApiModelProperty("维修工单编号")
+    private String sourceBillNo;
+    @ApiModelProperty("操作人")
     private String createByName;
     @ApiModelProperty("业务类型")
     private String busTypeValue;
-    @ApiModelProperty("库管操作人")
+    @ApiModelProperty("经办人")
     private String warehouseManager;
 }

yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyDetailsVo.java

@@ -59,12 +59,19 @@ public class AsOldparthandleApplyDetailsVo implements Vo {
 
     private String sid; // sid
 
+    @ApiModelProperty("备注")
+    private String remarks;
+    @ApiModelProperty("制单人sid")
+    private String createBySid;
 	@ApiModelProperty("制单人姓名")
     private String createByName; // 制单人姓名
 	@ApiModelProperty("发起部门sid")
     private String createDeptSid; // 发起部门sid
 	@ApiModelProperty("发起部门名称")
     private String createDeptName; // 发起部门名称
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @ApiModelProperty("申请日期")
+    private Date createTime;
 	@ApiModelProperty("单据编号")
     private String billNo; // 单据编号
 	@ApiModelProperty("附件路径(多个附件之间英文逗号隔开)")

yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyDto.java

@@ -58,12 +58,19 @@ public class AsOldparthandleApplyDto implements Dto {
 
     private String sid; // sid
 
+    @ApiModelProperty("备注")
+    private String remarks;
+    @ApiModelProperty("制单人sid")
+    private String createBySid;
 	@ApiModelProperty("制单人姓名")
     private String createByName; // 制单人姓名
 	@ApiModelProperty("发起部门sid")
     private String createDeptSid; // 发起部门sid
 	@ApiModelProperty("发起部门名称")
     private String createDeptName; // 发起部门名称
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @ApiModelProperty("申请日期")
+    private Date createTime;
 	@ApiModelProperty("单据编号")
     private String billNo; // 单据编号
 	@ApiModelProperty("附件路径(多个附件之间英文逗号隔开)")

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml

@@ -2,10 +2,17 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yxt.anrui.as.biz.asbusrepairbill.AsBusrepairBillMapper">
     <select id="getList" resultType="com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBillListVo">
-        select sid, billNo
-        from as_busrepair_bill
-        where nodeCode = 2
-          and billType = 1
+        select a.sid,
+               a.billNo,
+               a.billType,
+               a.customerName,
+               a.mobile,
+               b.vinNo,
+               b.vehMark,
+            DATE_FORMAT(a.entryTime,'%Y-%m-%d') as entryTime
+        from as_busrepair_bill a
+                 LEFT JOIN as_busrepair_bill_vech AS b on a.sid = b.billSid
+        where nodeCode = 3
     </select>
 
     <select id="carOutFactory" resultType="com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBillListVo">

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java

@@ -22,7 +22,7 @@ public class AsBusrepairBillRest {
 
     @PostMapping("/listPage")
     @ApiOperation("工单查询列表")
-    ResultBean<PagerVo<AsBusrepairBillVo>> listPage(@RequestBody PagerQuery<AsBusrepairBillQuery> pagerQuery){
+    ResultBean<PagerVo<AsBusrepairBillVo>> listPage(@RequestBody PagerQuery<AsBusrepairBillQuery> pagerQuery) {
         ResultBean<PagerVo<AsBusrepairBillVo>> rb = ResultBean.fireFail();
         PagerVo<AsBusrepairBillVo> pv = asBusrepairBillService.listPage(pagerQuery);
         return rb.success().setData(pv);
@@ -30,13 +30,13 @@ public class AsBusrepairBillRest {
 
     @PostMapping("/saveBill")
     @ApiOperation("保存修改")
-    ResultBean<String> saveBill(@RequestBody AsBusrepairBillDto dto){
+    ResultBean<String> saveBill(@RequestBody AsBusrepairBillDto dto) {
         return asBusrepairBillService.saveBill(dto);
     }
 
     @PostMapping("/submitNextNode")
     @ApiOperation("提交至下一环节")
-    ResultBean<String> submitNextNode(@RequestBody AsBusrepairBillDto dto){
+    ResultBean<String> submitNextNode(@RequestBody AsBusrepairBillDto dto) {
         return asBusrepairBillService.submitNextNode(dto);
     }
 
@@ -65,17 +65,10 @@ public class AsBusrepairBillRest {
         return asBusrepairBillService.fetchDetailsBySid(sid);
     }
 
-    @PostMapping("getList")
-    @ApiOperation("维修领料获取派工维修单")
-    ResultBean<PagerVo<AsBusrepairBillListVo>> getList(@RequestBody PagerQuery<AsBusrepairBillListQuery> pagerQuery){
-        ResultBean<PagerVo<AsBusrepairBillListVo>> rb = ResultBean.fireFail();
-        PagerVo<AsBusrepairBillListVo> pv = asBusrepairBillService.getList(pagerQuery);
-        return rb.success().setData(pv);
-    }
 
     @PostMapping("carOutFactory")
     @ApiOperation("维修工单-车辆出厂")
-    ResultBean<PagerVo<AsBusrepairBillListVo>> carOutFactory(@RequestBody PagerQuery<AsBusrepairBillListQuery> pagerQuery){
+    ResultBean<PagerVo<AsBusrepairBillListVo>> carOutFactory(@RequestBody PagerQuery<AsBusrepairBillListQuery> pagerQuery) {
         ResultBean<PagerVo<AsBusrepairBillListVo>> rb = ResultBean.fireFail();
         PagerVo<AsBusrepairBillListVo> pv = asBusrepairBillService.carOutFactory(pagerQuery);
         return rb.success().setData(pv);
@@ -83,27 +76,45 @@ public class AsBusrepairBillRest {
 
     @PostMapping("confirmOut")
     @ApiOperation("维修工单-车辆出厂-确认出厂")
-    ResultBean confirmOut(@RequestParam String sid){
+    ResultBean confirmOut(@RequestParam String sid) {
         ResultBean rb = ResultBean.fireFail();
         asBusrepairBillService.confirmOut(sid);
         return rb.success();
     }
 
+    //==============================================================================
+
+    @PostMapping("getList")
+    @ApiOperation("维修领料获取派工维修单")
+    ResultBean<PagerVo<AsBusrepairBillListVo>> getList(@RequestBody PagerQuery<AsBusrepairBillListQuery> pagerQuery) {
+        ResultBean<PagerVo<AsBusrepairBillListVo>> rb = ResultBean.fireFail();
+        PagerVo<AsBusrepairBillListVo> pv = asBusrepairBillService.getList(pagerQuery);
+        return rb.success().setData(pv);
+    }
+
     /**
      * 旧件回收登记分页列表
+     *
      * @param pagerQuery
      * @return
      */
     @PostMapping("/pageBillList")
     @ApiOperation("旧件回收登记分页列表")
-    ResultBean<PagerVo<AsBusrepairPageVo>> pageBillList(@RequestBody PagerQuery<AsBusrepairPageQuery> pagerQuery){
+    ResultBean<PagerVo<AsBusrepairPageVo>> pageBillList(@RequestBody PagerQuery<AsBusrepairPageQuery> pagerQuery) {
         ResultBean<PagerVo<AsBusrepairPageVo>> rb = ResultBean.fireFail();
         PagerVo<AsBusrepairPageVo> pv = asBusrepairBillService.pageBillList(pagerQuery);
         return rb.success().setData(pv);
     }
+
     @GetMapping("/getOneByBillNo")
     @ApiOperation("旧件回收登记初始化")
-    ResultBean<AsBusrepairPageVo> getOneByBillNo(@RequestParam("billNo")String billNo){
+    ResultBean<AsBusrepairPageVo> getOneByBillNo(@RequestParam("billNo") String billNo) {
         return asBusrepairBillService.getOneByBillNo(billNo);
     }
+
+    @GetMapping("/detailsInit")
+    @ApiOperation("根据维修单sid获取维修单主信息及服务信息")
+    ResultBean<AsBusrepairBillOutDetailsVo> detailsInit(@RequestParam("sid")String sid){
+        return asBusrepairBillService.detailsInit(sid);
+    }
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java

@@ -99,7 +99,22 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
         AsBusrepairBillListQuery query = pagerQuery.getParams();
         QueryWrapper<AsBusrepairBill> qw = new QueryWrapper<>();
         if (query != null) {
-
+            //工单编号
+            if (StringUtils.isNotBlank(query.getBillNo())) {
+                qw.like("a.billNo", query.getBillNo());
+            }
+            //客户名称
+            if (StringUtils.isNotBlank(query.getCustomerName())) {
+                qw.like("a.customerName", query.getCustomerName());
+            }
+            //车牌号
+            if (StringUtils.isNotBlank(query.getVehMark())) {
+                qw.like("b.vehMark", query.getVehMark());
+            }
+            //进场日期开始时间-进场日期结束时间
+            qw.apply(StringUtils.isNotBlank(query.getEntryTimeStart()), "date_format (a.entryTime,'%Y-%m-%d') >= 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')"
+                    );
         }
         IPage<AsBusrepairBill> page = PagerUtil.queryToPage(pagerQuery);
         IPage<AsBusrepairBillListVo> pagging = baseMapper.getList(page, qw);
@@ -628,4 +643,8 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
         }
         return rb.success();
     }
+
+    public ResultBean<AsBusrepairBillOutDetailsVo> detailsInit(String sid) {
+        return null;
+    }
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillMapper.xml

@@ -2,7 +2,14 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yxt.anrui.as.biz.asbusrepairinventorybill.AsBusrepairInventorybillMapper">
     <select id="pageList" resultType="com.yxt.anrui.as.api.asbusrepairinventorybill.AsBusrepairInventorybillVo">
-        select sid, billNo, createByName, busTypeValue, warehouseManager
+        select sid,
+               billNo,
+               DATE_FORMAT(createTime, '%Y-%m-%d') as createTime,
+               sourceBillSid,
+               sourceBillNo,
+               createByName,
+               busTypeValue,
+               warehouseManager
         from as_busrepair_inventorybill
         <where>
             ${ew.sqlSegment}

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillRest.java

@@ -25,7 +25,7 @@ public class AsBusrepairInventorybillRest {
     @Autowired
     private AsBusrepairInventorybillService asBusrepairInventorybillService;
 
-    @PostMapping("pageList")
+    @PostMapping("/pageList")
     @ApiOperation("维修出库分页列表")
     ResultBean<PagerVo<AsBusrepairInventorybillVo>> pageList(@RequestBody PagerQuery<AsBusrepairInventorybillQuery> pagerQuery) {
         ResultBean<PagerVo<AsBusrepairInventorybillVo>> rb = ResultBean.fireFail();
@@ -33,21 +33,21 @@ public class AsBusrepairInventorybillRest {
         return rb.success().setData(pv);
     }
 
-    @PostMapping("saveOrUpdate")
+    @PostMapping("/saveOrUpdate")
     @ApiOperation("保存或修改")
     ResultBean<String> saveorUpdate(@RequestBody AsBusrepairInventorybillDto dto) {
         return asBusrepairInventorybillService.saveOrUdateBill(dto);
     }
 
-    @PostMapping("outBill")
+    @PostMapping("/outBill")
     @ApiOperation("出库")
-    ResultBean outBill(@RequestBody AsBusrepairInventorybillDto dto){
+    ResultBean outBill(@RequestBody AsBusrepairInventorybillDto dto) {
         return asBusrepairInventorybillService.outBill(dto);
     }
 
-    @PostMapping("quitBill")
+    @PostMapping("/quitBill")
     @ApiOperation("退库")
-    ResultBean quitBill(@RequestBody AsBusrepairInventorybillDto dto){
+    ResultBean quitBill(@RequestBody AsBusrepairInventorybillDto dto) {
         return asBusrepairInventorybillService.quitBill(dto);
     }
 

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillService.java

@@ -59,6 +59,30 @@ public class AsBusrepairInventorybillService extends MybatisBaseService<AsBusrep
             if (StringUtils.isNotBlank(query.getUserSid())) {
                 qw.eq("createBySid", query.getUserSid());
             }
+            //单据编号
+            if (StringUtils.isNotBlank(query.getBillNo())) {
+                qw.like("billNo", query.getBillNo());
+            }
+            //单据日期开始时间-单据日期结束时间
+            qw.apply(StringUtils.isNotBlank(query.getCreateTimeStart()), "date_format (createTime,'%Y-%m-%d') >= date_format('" + query.getCreateTimeStart() + "','%Y-%m-%d')").
+                    apply(StringUtils.isNotBlank(query.getCreateTimeEnd()), "date_format (createTime,'%Y-%m-%d') <= date_format('" + query.getCreateTimeEnd() + "','%Y-%m-%d')"
+                    );
+            //维修工单编号
+            if (StringUtils.isNotBlank(query.getSourceBillNo())) {
+                qw.like("sourceBillNo", query.getSourceBillNo());
+            }
+            //业务类型
+            if (StringUtils.isNotBlank(query.getBusTypeValue())) {
+                qw.like("busTypeValue", query.getBusTypeValue());
+            }
+            //操作人
+            if (StringUtils.isNotBlank(query.getCreateByName())) {
+                qw.like("createByName", query.getCreateByName());
+            }
+            //经办人
+            if (StringUtils.isNotBlank(query.getWarehouseManager())) {
+                qw.like("warehouseManager", query.getWarehouseManager());
+            }
 
         }
         IPage<AsBusrepairInventorybill> page = PagerUtil.queryToPage(pagerQuery);