Merge remote-tracking branch 'origin/master'

anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/ftl/vouchers/returnMoney2.ftl

@@ -4870,19 +4870,19 @@
                                     <w:u w:val="none"/>
                                 </w:rPr>
                             </w:pPr>
-                            <w:r>
+<#--                            <w:r>-->
-                                <w:rPr>
+<#--                                <w:rPr>-->
-                                    <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:fareast="宋体" w:cs="宋体" w:hint="fareast"/>
+<#--                                    <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:fareast="宋体" w:cs="宋体" w:hint="fareast"/>-->
-                                    <w:i w:val="off"/>
+<#--                                    <w:i w:val="off"/>-->
-                                    <w:i-cs w:val="off"/>
+<#--                                    <w:i-cs w:val="off"/>-->
-                                    <w:color w:val="000000"/>
+<#--                                    <w:color w:val="000000"/>-->
-                                    <w:sz w:val="22"/>
+<#--                                    <w:sz w:val="22"/>-->
-                                    <w:sz-cs w:val="22"/>
+<#--                                    <w:sz-cs w:val="22"/>-->
-                                    <w:u w:val="none"/>
+<#--                                    <w:u w:val="none"/>-->
-                                    <w:lang w:val="EN-US" w:fareast="ZH-CN"/>
+<#--                                    <w:lang w:val="EN-US" w:fareast="ZH-CN"/>-->
-                                </w:rPr>
+<#--                                </w:rPr>-->
-                                <w:t>$</w:t>
+<#--                                <w:t>$</w:t>-->
-                            </w:r>
+<#--                            </w:r>-->
                             <w:r>
                                 <w:rPr>
                                     <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:fareast="宋体" w:cs="宋体" w:hint="fareast"/>
@@ -4894,7 +4894,7 @@
                                     <w:u w:val="none"/>
                                     <w:lang w:val="EN-US" w:fareast="ZH-CN"/>
                                 </w:rPr>
-                                <w:t>{fMoney2!}</w:t>
+                                <w:t>${fMoney2!}</w:t>
                             </w:r>
                         </w:p>
                     </w:tc>
@@ -5785,4 +5785,4 @@
                 <w:docGrid w:type="lines" w:line-pitch="312"/>
             </w:sectPr>
         </wx:sect>
-    </w:body></w:wordDocument>
+    </w:body></w:wordDocument>

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

@@ -19,5 +19,7 @@ public class AitemVo {
     private String aitemName;
     @ApiModelProperty("销售价")
     private String price;
+    @ApiModelProperty("备注")
+    private String remarks;
 
 }

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

@@ -100,5 +100,6 @@ public class AsBusrepairBillDto implements Dto {
     private List<SitemVo> sitemVos = new ArrayList<>();// 服务项目
     private List<AitemVo> aitemVos = new ArrayList<>();// 附加项目
     private SettleVo settleVo = new SettleVo(); //结算信息
+    private List<GoodsDetailsVo> goodsDetailsVos = new ArrayList<>(); //商品信息
 
 }

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

@@ -2,6 +2,9 @@ package com.yxt.anrui.as.api.asbusrepairbill;
 
 import lombok.Data;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @description: 旧件回收登记
  * @author: dimengzhe
@@ -10,6 +13,8 @@ import lombok.Data;
 @Data
 public class AsBusrepairPageVo {
 
+    private String sid;
+
     //维修工单编号
     private String billNo;
     //工单创建日期
@@ -22,10 +27,12 @@ public class AsBusrepairPageVo {
     private String vehMark;
     //车架号
     private String vinNo;
+
+
     //旧件回收说明
     private String shortss;
     //旧件照片
-    private String photos;
+    private List<String> photos = new ArrayList<>();
 
 
 }

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

@@ -13,27 +13,28 @@ import java.math.BigDecimal;
  */
 @Data
 public class GoodsDetailsVo implements Vo {
+    private String sid;
     //商品名称
     private String goodsSpuName;
-    //商品Sku名称
+//    //商品Sku名称
-    private String goodsSkuTitle;
+//    private String goodsSkuTitle;
     //商品编码（图号）
     private String goodsSkuCode;
     //规格型号
     private String goodsSkuOwnSpec;
-    @ApiModelProperty("出库前的库存量")
+//    @ApiModelProperty("出库前的库存量")
-    private String currentCount;
+//    private String currentCount;
     @ApiModelProperty("计量单位")
     private String unit;
-    @ApiModelProperty("仓库sid")
+//    @ApiModelProperty("仓库sid")
-    private String warehouseSid;
+//    private String warehouseSid;
     @ApiModelProperty("仓库名称")
     private String warehouseName;
     //库位编号
     private String warehouseRackCode;
-
+//
-    @ApiModelProperty("需求数量（维修工单中）")
+//    @ApiModelProperty("需求数量（维修工单中）")
-    private String needCount;
+//    private String needCount;
     @ApiModelProperty("出/退库数量")
     private String count;
     @ApiModelProperty("销售价（元）")
@@ -44,10 +45,11 @@ public class GoodsDetailsVo implements Vo {
     private String discountAmount;
     //金额（销售价-优惠金额）
     private String amount;
-    @ApiModelProperty("科目")
+//    @ApiModelProperty("科目")
-    private String subject;
+//    private String subject;
-    @ApiModelProperty("领料人姓名")
+//    @ApiModelProperty("领料人姓名")
-    private String operName;
+//    private String operName;
-
+    @ApiModelProperty("备注")
+    private String remarks;
 
 }

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

@@ -0,0 +1,18 @@
+package com.yxt.anrui.as.api.asbusrepairbill;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/4/29 10:50
+ */
+@Data
+public class ReparirerStaffVo {
+
+    @ApiModelProperty("维修人员sid")
+    private String repairerSid;
+    @ApiModelProperty("维修人员姓名")
+    private String repairerName;
+}

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

@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @author Fan
@@ -38,15 +40,17 @@ public class SitemVo {
     private String discountAmount;
     @ApiModelProperty("金额（销售价-优惠金额）")
     private String amount;
+    @ApiModelProperty("备注")
+    private String remarks;
     //-------------维修人员---------------
-    @ApiModelProperty("维修人员sid")
+//    @ApiModelProperty("维修人员sid")
-    private String repairerSid;
+//    private String repairerSid;
-    @ApiModelProperty("维修人员姓名")
+//    @ApiModelProperty("维修人员姓名")
-    private String repairerName;
+//    private String repairerName;
-    @ApiModelProperty("所在组sid")
+//    @ApiModelProperty("所在组sid")
-    private String groupSid;
+//    private String groupSid;
-    @ApiModelProperty("所在班组名称")
+//    @ApiModelProperty("所在班组名称")
-    private String groupName;
+//    private String groupName;
-
+    private List<ReparirerStaffVo> staffList = new ArrayList<>(); //维修人员信息
 
 }

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

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBill;
 import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBillListVo;
 import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBillVo;
+import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairPageVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Update;
@@ -30,4 +31,8 @@ public interface AsBusrepairBillMapper extends BaseMapper<AsBusrepairBill> {
     int selectBySid(String join);
 
     IPage<AsBusrepairBillVo> listPage(IPage<AsBusrepairBill> page, @Param(Constants.WRAPPER) QueryWrapper<AsBusrepairBill> qw);
+
+    IPage<AsBusrepairPageVo> pageBillList(IPage<AsBusrepairBill> page, @Param(Constants.WRAPPER) QueryWrapper<AsBusrepairBill> qw);
+
+    AsBusrepairPageVo selectByBillNo(String sid);
 }

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

@@ -9,15 +9,18 @@
                a.mobile,
                b.vinNo,
                b.vehMark,
-            DATE_FORMAT(a.entryTime,'%Y-%m-%d') as entryTime
+               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">
-        select * from as_busrepair_bill
+        select *
-        <where>${ew.sqlSegment}</where>
+        from as_busrepair_bill
+        <where>
+            ${ew.sqlSegment}
+        </where>
     </select>
     <select id="selectNum" resultType="java.lang.Integer">
         select IFNULL(CAST(REPLACE(MAX(billNo), #{bill}, '') AS SIGNED), 0) as code
@@ -27,36 +30,67 @@
     <select id="selectBySid" resultType="java.lang.Integer">
         SELECT COUNT(*)
         FROM as_busrepair_bill
-        WHERE nodeCode != '1' and find_in_set(sid, #{join})
+        WHERE nodeCode != '1'
+          and find_in_set(sid, #{join})
     </select>
     <select id="listPage" resultType="com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBillVo">
-        SELECT
+        SELECT b.sid,
-        b.sid,
+               b.billNo,
-        b.billNo,
+               b.nodeName,
-        b.nodeName,
+               b.useOrgName,
-        b.useOrgName,
+               b.dept,
-        b.dept,
+               b.createByName,
-        b.createByName,
+               b.createTime,
-        b.createTime,
+               b.billType,
-        b.billType,
+               b.`subject`,
-        b.`subject`,
+               b.entryTime,
-        b.entryTime,
+               b.estimatedFinishTime,
-        b.estimatedFinishTime,
+               b.customerName,
-        b.customerName,
+               b.mobile,
-        b.mobile,
+               b.customerOrg,
-        b.customerOrg,
+               v.vehMark,
-        v.vehMark,
+               v.vinNo,
-        v.vinNo,
+               v.vehModel,
-        v.vehModel,
+               b.waitorName,
-        b.waitorName,
+               b.groupName,
-        b.groupName,
+               b.mainRepairers,
-        b.mainRepairers,
+               b.remarks,
-        b.remarks,
+               i.isInvoicing
-        i.isInvoicing
+        FROM as_busrepair_bill AS b
-        FROM
+                 LEFT JOIN as_busrepair_bill_vech AS v ON b.sid = v.billSid
-        as_busrepair_bill AS b
+                 LEFT JOIN as_busrepair_bill_invoice AS i ON b.sid = i.billSid
-        LEFT JOIN as_busrepair_bill_vech AS v ON b.sid = v.billSid
+        <where>
-        LEFT JOIN as_busrepair_bill_invoice AS i ON b.sid = i.billSid
+            ${ew.sqlSegment}
-        <where>${ew.sqlSegment}</where>
+        </where>
+    </select>
+
+    <select id="pageBillList" resultType="com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairPageVo">
+        select b.sid,
+               a.billNo,
+               a.billType,
+               DATE_FORMAT(a.createTime, '%Y-%m-%d') as billTime,
+               a.customerSid,
+               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>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="selectByBillNo" resultType="com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairPageVo">
+        select a.billNo,
+               DATE_FORMAT(a.createTime, '%Y-%m-%d') as billTime,
+               a.customerSid,
+               a.customerName,
+               b.vehMark,
+               b.vinNo
+        from as_busrepair_bill a
+                 LEFT JOIN as_busrepair_bill_vech AS b on a.sid = b.billSid
+        where b.sid = #{sid}
     </select>
 </mapper>

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

@@ -108,8 +108,8 @@ public class AsBusrepairBillRest {
 
     @GetMapping("/getOneByBillNo")
     @ApiOperation("旧件回收登记初始化")
-    ResultBean<AsBusrepairPageVo> getOneByBillNo(@RequestParam("billNo") String billNo) {
+    ResultBean<AsBusrepairPageVo> getOneByBillNo(@RequestParam("sid") String sid) {
-        return asBusrepairBillService.getOneByBillNo(billNo);
+        return asBusrepairBillService.getOneByBillNo(sid);
     }
 
     @GetMapping("/detailsInit")

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

@@ -265,13 +265,18 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
                     BeanUtil.copyProperties(sitemVo, sitem, "id", "sid");
                     sitem.setBillSid(sid);
                     asBusrepairBillSitemService.insert(sitem);
-                    AsBusrepairBillSitemRepairer repairer = new AsBusrepairBillSitemRepairer();
+                    List<ReparirerStaffVo> staffList = sitemVo.getStaffList();
-                    BeanUtil.copyProperties(sitemVo, repairer, "id", "sid");
+                    if (!staffList.isEmpty()) {
-                    repairer.setBillSid(sid);
+                        for (ReparirerStaffVo staffVo : staffList) {
-                    if (StringUtils.isNotBlank(sitemVo.getServiceItemSid())) {
+                            AsBusrepairBillSitemRepairer repairer = new AsBusrepairBillSitemRepairer();
-                        repairer.setRepairitemSid(sitemVo.getServiceItemSid());
+                            BeanUtil.copyProperties(staffVo, repairer, "id", "sid");
+                            repairer.setBillSid(sid);
+                            if (StringUtils.isNotBlank(sitemVo.getServiceItemSid())) {
+                                repairer.setRepairitemSid(sitemVo.getServiceItemSid());
+                            }
+                            asBusrepairBillSitemRepairerService.insert(repairer);
+                        }
                     }
-                    asBusrepairBillSitemRepairerService.insert(repairer);
                 }
             }
             //附加项目
@@ -288,10 +293,36 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
                     if (StringUtils.isNotBlank(aitemVo.getPrice())) {
                         aitem.setPrice(new BigDecimal(aitemVo.getPrice()));
                     }
+                    if (StringUtils.isNotBlank(aitemVo.getRemarks())) {
+                        aitem.setRemarks(aitemVo.getRemarks());
+                    }
                     aitem.setBillSid(sid);
                     asBusrepairBillAitemService.insert(aitem);
                 }
             }
+            //商品信息
+            if (!dto.getGoodsDetailsVos().isEmpty() && dto.getGoodsDetailsVos().size() > 0) {
+                List<GoodsDetailsVo> goodsDetailsVos = dto.getGoodsDetailsVos();
+                for (GoodsDetailsVo goodsVo : goodsDetailsVos) {
+                    AsBusrepairInventorybillDetail goods = asBusrepairInventorybillDetailService.fetchBySid(goodsVo.getSid());
+                    if (StringUtils.isNotBlank(goodsVo.getPrice())) {
+                        goods.setPrice(new BigDecimal(goodsVo.getPrice()));
+                    }
+                    if (StringUtils.isNotBlank(goodsVo.getDiscount())) {
+                        goods.setDiscount(new Integer(goodsVo.getDiscount()));
+                    }
+                    if (StringUtils.isNotBlank(goodsVo.getDiscountAmount())) {
+                        goods.setDiscountAmount(new BigDecimal(goodsVo.getDiscountAmount()));
+                    }
+                    if (StringUtils.isNotBlank(goodsVo.getAmount())) {
+                        goods.setAmount(new BigDecimal(goodsVo.getAmount()));
+                    }
+                    if (StringUtils.isNotBlank(goodsVo.getRemarks())) {
+                        goods.setRemarks(goodsVo.getRemarks());
+                    }
+                    asBusrepairInventorybillDetailService.updateById(goods);
+                }
+            }
         }
         return rb.success().setData(sid);
     }
@@ -383,9 +414,15 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
                 for (AsBusrepairBillSitem sitem : sitems) {
                     SitemVo sitemVo = new SitemVo();
                     BeanUtil.copyProperties(sitem, sitemVo);
-                    AsBusrepairBillSitemRepairer repairer = asBusrepairBillSitemRepairerService.fetchByBillSid(sid, sitem.getServiceItemSid());
+                    List<AsBusrepairBillSitemRepairer> repairers = asBusrepairBillSitemRepairerService.fetchByBillSid(sid, sitem.getServiceItemSid());
-                    if (null != repairer) {
+                    if (!repairers.isEmpty()) {
-                        BeanUtil.copyProperties(repairer, sitemVo);
+                        List<ReparirerStaffVo> staffList = new ArrayList<>(); //维修人员信息
+                        for (AsBusrepairBillSitemRepairer repairer : repairers) {
+                            ReparirerStaffVo staffVo = new ReparirerStaffVo();
+                            BeanUtil.copyProperties(repairer, staffVo);
+                            staffList.add(staffVo);
+                        }
+                        sitemVo.setStaffList(staffList);
                     }
                     sitemVos.add(sitemVo);
                 }
@@ -408,7 +445,7 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
                 }
                 vo.setAitemVos(aitemVos);
             }
-            List<AsBusrepairInventorybillDetail> goodsDetails = asBusrepairInventorybillDetailService.getDetailsByBillSid(sid);
+            List<AsBusrepairInventorybillDetail> goodsDetails = asBusrepairInventorybillDetailService.getDetailsByBillSid(sid, "0");
             if (!goodsDetails.isEmpty()) {
                 for (AsBusrepairInventorybillDetail goodsDetail : goodsDetails) {
                     GoodsDetailsVo goodsDetailsVo = new GoodsDetailsVo();
@@ -585,12 +622,32 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
     }
 
     public PagerVo<AsBusrepairPageVo> pageBillList(PagerQuery<AsBusrepairPageQuery> pagerQuery) {
-
+        AsBusrepairPageQuery query = pagerQuery.getParams();
-        return null;
+        QueryWrapper<AsBusrepairBill> qw = new QueryWrapper<>();
+        //ToDo:添加查询条件
+        //维修工单编号
+        if (StringUtils.isNotBlank(query.getBillNo())) {
+            qw.like("a.billNo", query.getBillNo());
+        }
+        //单据日期开始时间-单据日期结束时间
+        qw.apply(StringUtils.isNotBlank(query.getCreateTimeStart()), "date_format (a.createTime,'%Y-%m-%d') >= 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')"
+                );
+        //车牌号
+        if (StringUtils.isNotBlank(query.getVehMark())) {
+            qw.like("b.vehMark", query.getVehMark());
+        }
+        qw.eq("a.nodeCode", 3);
+        IPage<AsBusrepairBill> page = PagerUtil.queryToPage(pagerQuery);
+        IPage<AsBusrepairPageVo> pagging = baseMapper.pageBillList(page, qw);
+        PagerVo<AsBusrepairPageVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
     }
 
-    public ResultBean<AsBusrepairPageVo> getOneByBillNo(String billNo) {
+    public ResultBean<AsBusrepairPageVo> getOneByBillNo(String sid) {
-        return null;
+        ResultBean<AsBusrepairPageVo> rb = ResultBean.fireFail();
+        AsBusrepairPageVo asBusrepairPageVo = baseMapper.selectByBillNo(sid);
+        return rb.success().setData(asBusrepairPageVo);
     }
 
     public ResultBean<String> sureMaterialFee(AsBusrepairBillDto dto) {

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillsitemrepairer/AsBusrepairBillSitemRepairerMapper.java

@@ -33,6 +33,8 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
+import java.util.List;
+
 /**
  * @author liupopo
  * @version 1.0
@@ -43,8 +45,8 @@ public interface AsBusrepairBillSitemRepairerMapper extends BaseMapper<AsBusrepa
 
 
     @Select("select * from as_busrepair_bill_sitem_repairer where billSid = #{billSid} and repairitemSid =#{itemSid}")
-    AsBusrepairBillSitemRepairer fetchByBillSidAndItemSid(@Param("billSid") String billSid, @Param("itemSid")String itemSid);
+    List<AsBusrepairBillSitemRepairer> fetchByBillSidAndItemSid(@Param("billSid") String billSid, @Param("itemSid")String itemSid);
 
     @Delete("delete from as_busrepair_bill_sitem_repairer where billSid = #{sid}")
     void delByBillSid(String billSid);
-}
+}

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillsitemrepairer/AsBusrepairBillSitemRepairerService.java

@@ -30,6 +30,8 @@ import com.yxt.anrui.as.api.asbusrepairbillsitemrepairer.AsBusrepairBillSitemRep
 import com.yxt.common.base.service.MybatisBaseService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * @author liupopo
  * @version 1.0
@@ -38,11 +40,11 @@ import org.springframework.stereotype.Service;
 @Service
 public class AsBusrepairBillSitemRepairerService extends MybatisBaseService<AsBusrepairBillSitemRepairerMapper, AsBusrepairBillSitemRepairer> {
 
-    public AsBusrepairBillSitemRepairer fetchByBillSid(String billSid,String itemSid) {
+    public List<AsBusrepairBillSitemRepairer> fetchByBillSid(String billSid, String itemSid) {
         return baseMapper.fetchByBillSidAndItemSid(billSid,itemSid);
     }
 
     public void delByBillSid(String billSid) {
         baseMapper.delByBillSid(billSid);
     }
-}
+}

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailMapper.java

@@ -18,5 +18,5 @@ public interface AsBusrepairInventorybillDetailMapper extends BaseMapper<AsBusre
 
     List<AsBusrepairInventorybillDetail> selectByMainSid(String sid);
 
-    List<AsBusrepairInventorybillDetail> getDetailsByBillSid(@Param("busRepairBillSid") String busRepairBillSid);
+    List<AsBusrepairInventorybillDetail> getDetailsByBillSid(@Param("busRepairBillSid") String busRepairBillSid,@Param("busTypeKey")String busTypeKey);
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailMapper.xml

@@ -22,5 +22,6 @@
                 LEFT JOIN as_busrepair_inventorybill_detail AS d ON b.sid = d.billSid
         WHERE
             b.sourceBillSid = #{busRepairBillSid}
+            and b.busTypeKey = #{busTypeKey}
     </select>
-</mapper>
+</mapper>

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailService.java

@@ -31,7 +31,7 @@ public class AsBusrepairInventorybillDetailService extends MybatisBaseService<As
     }
 
 
-    public List<AsBusrepairInventorybillDetail> getDetailsByBillSid(String busRepairBillSid) {
+    public List<AsBusrepairInventorybillDetail> getDetailsByBillSid(String busRepairBillSid,String busTypeKey) {
-        return baseMapper.getDetailsByBillSid(busRepairBillSid);
+        return baseMapper.getDetailsByBillSid(busRepairBillSid,busTypeKey);
     }
 }