移动端配件确认和维修领料

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml

@@ -3,11 +3,11 @@
 <mapper namespace="com.yxt.anrui.buscenter.biz.bussalesordervehicle.BusSalesOrderVehicleMapper">
     <insert id="saveList">
         insert into bus_sales_order_vehicle(createBySid,sid,createTime,salesOrderSid,linkNo,linkSid,borrowerSid,
-        isEnable,loanContractSid)
+        isEnable,loanContractSid,temporaryNo)
         values
         <foreach collection="list" item="item" index="index" separator=",">
             (#{item.createBySid},#{item.sid},#{item.createTime},#{item.salesOrderSid},#{item.linkNo},#{item.linkSid},#{item.borrowerSid},
-            #{item.isEnable},#{item.loanContractSid})
+            #{item.isEnable},#{item.loanContractSid},#{item.temporaryNo})
         </foreach>
     </insert>
     <!--    <where> ${ew.sqlSegment} </where>-->

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

@@ -5000,6 +5000,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
             String otherBankNo = "";
             String salesDeptNo = v.getSalesDeptNo();
             String substringVin = vinNo.substring(vinNo.length() - 8);
+            String borrowerNo = v.getBorrowerNo();
             LoanFinBank mloanFinBank = loanFinBankService.selectFinBankByName(bankName);
             if (null != mloanFinBank) {
                 bankSid = mloanFinBank.getSid();
@@ -5178,6 +5179,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                     busVinSid = busSalesOrderVehicleEntity.getSid();
                     busSalesOrderVehicleEntity.setSalesOrderSid(salesOrderSid);
                     busSalesOrderVehicleEntity.setLinkNo(vinNo);
+                    busSalesOrderVehicleEntity.setTemporaryNo(borrowerNo);
                     BaseVehicle baseVehicle = baseVehicleFeign.selOneByVinNo(vinNo).getData();
                     if (null != baseVehicle) {
                         linkSid = baseVehicle.getSid();
@@ -5245,6 +5247,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                 busVinSid = busSalesOrderVehicle.getSid();
                 busSalesOrderVehicle.setSalesOrderSid(salesOrderSid);
                 busSalesOrderVehicle.setLinkNo(vinNo);
+                busSalesOrderVehicle.setTemporaryNo(borrowerNo);
                 BaseVehicle baseVehicle = baseVehicleFeign.selOneByVinNo(vinNo).getData();
                 if (null != baseVehicle) {
                     linkSid = baseVehicle.getSid();

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

@@ -0,0 +1,34 @@
+package com.yxt.anrui.as.api.asbusrepairbill.app;
+
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/8/5 11:36
+ */
+@Data
+public class GoodsConfrimDetailsVo {
+
+    /**
+     * 数量
+     */
+    private String count;
+    /**
+     * 商品名称
+     */
+    private String goodsName;
+    /**
+     * 图号
+     */
+    private String goodsSkuCode;
+    /**
+     * 是否已确认
+     */
+    private Boolean state;
+    /**
+     * 确认人
+     */
+    private String user;
+
+}

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

@@ -0,0 +1,18 @@
+package com.yxt.anrui.as.api.asbusrepairbill.app;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/8/5 9:36
+ */
+@Data
+public class GoodsConfrimListQuery implements Query {
+
+    private String name;
+    private String orgPath;
+    private String userSid;
+
+}

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

@@ -0,0 +1,49 @@
+package com.yxt.anrui.as.api.asbusrepairbill.app;
+
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/8/5 9:35
+ */
+@Data
+public class GoodsConfrimListVo {
+    /**
+     * 工单编号
+     */
+    private String billId;
+    /**
+     * 工单类型
+     */
+    private String billType;
+    /**
+     * 配件接收情况，5/10
+     */
+    private String confrimInfo;
+    /**
+     * 客户名称
+     */
+    private String customerName;
+    /**
+     * 进厂时间
+     */
+    private String entryTime;
+    /**
+     * 维修工单sid
+     */
+    private String sid;
+    /**
+     * 科目
+     */
+    private String subject;
+    /**
+     * 车牌号
+     */
+    private String vehMark;
+    /**
+     * 是否可以勾选
+     */
+    private Boolean isCanSubmit;
+
+}

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

@@ -64,5 +64,6 @@ public class AsBusrepairInventoryBillInit {
     private String registerRemarks;
     private String isGoOut;
     private List<AsBusrepairInventorybillDetailSDto> detailList = new ArrayList<>();
+    private List<AsBusrepairInventorybillDetailSDto> receiveList = new ArrayList<>();
 
 }

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailSDto.java

@@ -72,5 +72,11 @@ public class AsBusrepairInventorybillDetailSDto {
     private String operName;
     private String remarks;
     private String inventoryNum; //库存数量
+    private String returnAmount; //退库金额 = amount
+    private String receivePer; //领料人
+    private String receiveTimes; //领料时间
+    private String sid;
+
+
 
 }

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

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.as.api.asbusrepairbill.*;
+import com.yxt.anrui.as.api.asbusrepairbill.app.GoodsConfrimDetailsVo;
+import com.yxt.anrui.as.api.asbusrepairbill.app.GoodsConfrimListVo;
 import com.yxt.anrui.as.api.asbusrepairbill.app.GoodsReceiveListVo;
 import com.yxt.anrui.as.api.asbusrepairbill.app.GoodsReceiveVo;
 import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.SitemsVo;
@@ -56,4 +58,8 @@ public interface AsBusrepairBillMapper extends BaseMapper<AsBusrepairBill> {
     IPage<GoodsReceiveVo> notConfirmList(IPage<AsBusrepairBill> page, @Param(Constants.WRAPPER) QueryWrapper<AsBusrepairBill> qw);
 
     List<GoodsReceiveListVo> selGoodsReceiveByBillSid(@Param("sid") String sid);
+
+    IPage<GoodsConfrimListVo> notConfirmList2(IPage<AsBusrepairBill> page,@Param(Constants.WRAPPER) QueryWrapper<AsBusrepairBill> qw);
+
+    List<GoodsConfrimDetailsVo> goodsConfrimInfoList(@Param("sid") String sid);
 }

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

@@ -212,4 +212,71 @@
                 LEFT JOIN as_busrepair_inventorybill as i ON d.billSid = i.sid
         WHERE d.state = 1 and i.sourceBillSid = #{sid}
     </select>
+    <select id="notConfirmList2" resultType="com.yxt.anrui.as.api.asbusrepairbill.app.GoodsConfrimListVo">
+        SELECT
+            j.*,
+            IF(j.totalCount = j.count, true, false) as isCanSubmit,
+            concat(j.count,'/',j.totalCount) confrimInfo
+        FROM
+            (
+                SELECT
+                    a.*,
+                    (
+                        SELECT
+                            COUNT(*)
+                        FROM
+                            as_busrepair_inventorybill_detail AS d
+                                LEFT JOIN as_busrepair_inventorybill AS i ON d.billSid = i.sid
+                        WHERE
+                            i.sourceBillSid = a.sid
+                    ) totalCount,
+                    (
+                        SELECT
+                            COUNT(*)
+                        FROM
+                            as_busrepair_inventorybill_detail AS d
+                                LEFT JOIN as_busrepair_inventorybill AS i ON d.billSid = i.sid
+                        WHERE
+                            i.sourceBillSid = a.sid
+                          AND d.state = 2
+                    ) AS count
+                FROM
+                    (
+                    SELECT
+                    b.sid,
+                    b.billNo billId,
+                    b.billType,
+                    b.customerName,
+                    b.entryTime,
+                    b.`subject`,
+                    v.vehMark
+                    FROM
+                    as_busrepair_bill AS b
+                    LEFT JOIN as_busrepair_inventorybill AS i ON i.sourceBillSid = b.sid
+                    LEFT JOIN as_busrepair_inventorybill_detail AS d ON d.billSid = i.sid
+                    LEFT JOIN as_busrepair_bill_vech AS v ON v.billSid = b.sid
+                    <where>
+                        ${ew.sqlSegment}
+                    </where>
+                    GROUP BY
+                    b.sid
+                    ) a
+            ) AS j
+        WHERE
+            totalCount != 0
+    </select>
+    <select id="goodsConfrimInfoList"
+            resultType="com.yxt.anrui.as.api.asbusrepairbill.app.GoodsConfrimDetailsVo">
+        SELECT
+            d.goodsSpuName goodsName,
+            d.count,
+            d.goodsSkuCode,
+            d.operName `user`,
+            IF
+                ( d.state = 2, TRUE, FALSE ) AS state
+        FROM
+            as_busrepair_inventorybill_detail AS d
+                LEFT JOIN as_busrepair_inventorybill AS i ON d.billSid = i.sid
+        where i.sourceBillSid = #{sid}
+    </select>
 </mapper>

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

@@ -1,9 +1,7 @@
 package com.yxt.anrui.as.biz.asbusrepairbill;
 
 import com.yxt.anrui.as.api.asbusrepairbill.*;
-import com.yxt.anrui.as.api.asbusrepairbill.app.GoodsReceiveQuery;
+import com.yxt.anrui.as.api.asbusrepairbill.app.*;
-import com.yxt.anrui.as.api.asbusrepairbill.app.GoodsReceiveSubmit;
-import com.yxt.anrui.as.api.asbusrepairbill.app.GoodsReceiveVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -11,6 +9,8 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * @description: 维修工单
  * @author: dimengzhe
@@ -201,4 +201,27 @@ public class AsBusrepairBillRest {
     public ResultBean<AsBusrepairBillDetailsVo> fetchDetailsBySid2(@PathVariable("sid") String sid) {
         return asBusrepairBillService.fetchDetailsBySid(sid);
     }
+    //----------------------------app维修完毕-----------------------------
+    @PostMapping("/notConfirmList2")
+    @ApiOperation("获取维修完毕待确认列表")
+    ResultBean<PagerVo<GoodsConfrimListVo>> notConfirmList2(@RequestBody PagerQuery<GoodsConfrimListQuery> pagerQuery) {
+        ResultBean<PagerVo<GoodsConfrimListVo>> rb = ResultBean.fireFail();
+        PagerVo<GoodsConfrimListVo> pv = asBusrepairBillService.notConfirmList2(pagerQuery);
+        return rb.success().setData(pv);
+    }
+
+    @PostMapping("/submitList2")
+    @ApiOperation("维修确认提交")
+    ResultBean submitList2(@RequestBody GoodsReceiveSubmit query) {
+        ResultBean rb = ResultBean.fireFail();
+        asBusrepairBillService.submitList2(query);
+        return rb.success();
+    }
+
+    @ApiOperation("工单商品列表")
+    @GetMapping("/goodsConfrimInfoList")
+    public ResultBean<List<GoodsConfrimDetailsVo>> goodsConfrimInfoList(@RequestParam("sid") String sid) {
+        return asBusrepairBillService.goodsConfrimInfoList(sid);
+    }
+
 }

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

@@ -7,10 +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.asbusrepairbill.*;
-import com.yxt.anrui.as.api.asbusrepairbill.app.GoodsReceiveListVo;
+import com.yxt.anrui.as.api.asbusrepairbill.app.*;
-import com.yxt.anrui.as.api.asbusrepairbill.app.GoodsReceiveQuery;
-import com.yxt.anrui.as.api.asbusrepairbill.app.GoodsReceiveSubmit;
-import com.yxt.anrui.as.api.asbusrepairbill.app.GoodsReceiveVo;
 import com.yxt.anrui.as.api.asbusrepairbillaitem.AsBusrepairBillAitem;
 import com.yxt.anrui.as.api.asbusrepairbillinsurance.AsBusrepairBillInsurance;
 import com.yxt.anrui.as.api.asbusrepairbillinsurancerecord.AsBusrepairBillInsuranceRecord;
@@ -647,6 +644,11 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
                     GoodsDetailsVo goodsDetailsVo = new GoodsDetailsVo();
                     BeanUtil.copyProperties(goodsDetail, goodsDetailsVo);
                     BigDecimal constPrice = BigDecimal.ZERO; //销售价常量
+                    BigDecimal count = BigDecimal.ZERO; //数量
+                    if (null != goodsDetail.getCurrentCount()) {
+                        count = goodsDetail.getCurrentCount();
+                    }
+                    goodsDetailsVo.setCount(String.valueOf(goodsDetail.getCurrentCount().intValue()));
                     boolean isTaxRate = false; //进货价是否含税
                     if (null != goodsDetail.getReceivedTime()) {
                         goodsDetailsVo.setReceivedTime(sdf.format(goodsDetail.getReceivedTime()));
@@ -1964,4 +1966,54 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
             }
         }
     }
+
+    public PagerVo<GoodsConfrimListVo> notConfirmList2(PagerQuery<GoodsConfrimListQuery> pagerQuery) {
+        GoodsConfrimListQuery query = pagerQuery.getParams();
+        QueryWrapper<AsBusrepairBill> qw = new QueryWrapper<>();
+        if (query != null) {
+            if (StringUtils.isNotBlank(query.getName())) {
+                qw.and(wrapper -> wrapper.like("b.billNo", query.getName())
+                        .or().like("b.customerName", query.getName())
+                        .or().like("v.vehMark", query.getName())
+                );
+            }
+            String orgPath = query.getOrgPath();
+            List<String> split = Arrays.asList(orgPath.split("/"));
+            String useOrgSid = "";
+            if (split.size() > 1) {
+                //获取本级sid获取本级部门信息
+                SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData();
+                useOrgSid = sysOrganization1.getSid();
+            } else {
+                SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData();
+                useOrgSid = sysOrganization.getSid();
+            }
+            qw.eq("b.deptSid", useOrgSid);
+            qw.eq("b.repairState", 1);
+        }
+        IPage<AsBusrepairBill> page = PagerUtil.queryToPage(pagerQuery);
+        IPage<GoodsConfrimListVo> pagging = baseMapper.notConfirmList2(page, qw);
+        PagerVo<GoodsConfrimListVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+
+    }
+
+    public void submitList2(GoodsReceiveSubmit query) {
+        List<String> list = query.getList();
+        if (!list.isEmpty()) {
+            for (String s : list) {
+                AsBusrepairBill detail = fetchBySid(s);
+                if (null != detail) {
+                    detail.setRepairState(2);
+                    baseMapper.updateById(detail);
+                }
+            }
+        }
+    }
+
+    public ResultBean<List<GoodsConfrimDetailsVo>> goodsConfrimInfoList(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        List<GoodsConfrimDetailsVo> list = baseMapper.goodsConfrimInfoList(sid);
+        return rb.success().setData(list);
+    }
 }

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

@@ -44,6 +44,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -259,25 +260,53 @@ public class AsBusrepairInventorybillService extends MybatisBaseService<AsBusrep
     public String saveBill(AsBusrepairInventorybillDto dto, String busTypeKey) {
         AsBusrepairInventorybill entity = new AsBusrepairInventorybill();
         BeanUtil.copyProperties(dto, entity, "id", "sid");
+        int isEnable = 0;
         if (busTypeKey.equals("0")) {
             entity.setBusTypeKey("0");
             entity.setBusTypeValue("维修出库");
             String billNo = getApplyCode(dto.getCreateOrgSid(), "WXCKD");
             entity.setBillNo(billNo);
+            isEnable = 1;
         } else if (busTypeKey.equals("1")) {
             entity.setBusTypeKey("1");
             entity.setBusTypeValue("维修退库");
             String billNo = getApplyCode(dto.getCreateOrgSid(), "WXTKD");
             entity.setBillNo(billNo);
+            isEnable = 2;
         }
         baseMapper.insert(entity);
         List<AsBusrepairInventorybillDetailSDto> detailList = dto.getDetailList();
         if (!detailList.isEmpty()) {
             for (AsBusrepairInventorybillDetailSDto sDto : detailList) {
                 AsBusrepairInventorybillDetail detail = new AsBusrepairInventorybillDetail();
-                BeanUtil.copyProperties(sDto, detail);
+                BeanUtil.copyProperties(sDto, detail,"id","sid");
-                if (StringUtils.isNotBlank(sDto.getOutboundCount())) {
+//                if (StringUtils.isNotBlank(sDto.getOutboundCount())) {
-                    detail.setCurrentCount(new BigDecimal(sDto.getOutboundCount()));
+//                    detail.setCurrentCount(new BigDecimal(sDto.getOutboundCount()));
+//                }
+                if (isEnable == 1) {
+                    if (StringUtils.isNotBlank(sDto.getCount())) {
+                        detail.setCurrentCount(new BigDecimal(sDto.getCount()));
+                    }
+                } else if (isEnable == 2) {
+                    String sid = sDto.getSid();
+                    AsBusrepairInventorybillDetail detailUpdate = asBusrepairInventorybillDetailService.fetchBySid(sid);
+                    BigDecimal count = BigDecimal.ZERO;
+                    BigDecimal currentCount = BigDecimal.ZERO;
+                    if (null != detailUpdate) {
+                        if (null != detailUpdate.getCurrentCount()) {
+                            currentCount = detailUpdate.getCurrentCount();
+                        }
+                        if (StringUtils.isNotBlank(sDto.getCount())) {
+                            count = new BigDecimal(sDto.getCount());
+                        }
+                        BigDecimal subtract = currentCount.subtract(count);
+                        detailUpdate.setCurrentCount(subtract);
+                        asBusrepairInventorybillDetailService.updateById(detailUpdate);
+                        detail.setCurrentCount(subtract);
+                        if (StringUtils.isNotBlank(sDto.getReturnAmount())) {
+                            detail.setAmount(new BigDecimal(sDto.getReturnAmount()));
+                        }
+                    }
                 }
                 detail.setBillSid(entity.getSid());
                 String inventorySid = sDto.getInventorySid();
@@ -302,6 +331,7 @@ public class AsBusrepairInventorybillService extends MybatisBaseService<AsBusrep
                 if (StringUtils.isNotBlank(sDto.getPrice())) {
                     detail.setGoodsDetailsPrice(new BigDecimal(sDto.getPrice()));
                 }
+                detail.setIsEnable(isEnable);
                 asBusrepairInventorybillDetailService.insert(detail);
                 WmsUpdateCountQuery countQuery = new WmsUpdateCountQuery();
                 countQuery.setSid(sDto.getInventorySid());
@@ -399,6 +429,7 @@ public class AsBusrepairInventorybillService extends MybatisBaseService<AsBusrep
         ResultBean rb = ResultBean.fireFail();
         AsBusrepairInventoryBillInit vo = new AsBusrepairInventoryBillInit();
         AsBusrepairBillDetailsVo data = asBusrepairBillService.fetchDetailsBySid(sid).getData();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         if (null != data) {
             vo.setSourceBillSid(sid);
             if (StringUtils.isNotBlank(data.getBillNo())) {
@@ -454,19 +485,35 @@ public class AsBusrepairInventorybillService extends MybatisBaseService<AsBusrep
                 vo.setSitemVoList(sitemsVos);
             }
             List<AsBusrepairInventorybillDetailSDto> list = new ArrayList<>();
-            //List<AsBusrepairInventorybillDetail> goodsDetails = asBusrepairInventorybillDetailService.getGoodsDetailsByBillSid(sid);
+            List<AsBusrepairInventorybillDetailSDto> list2 = new ArrayList<>();
             List<AsBusrepairInventorybillDetail> goodsDetails = asBusrepairInventorybillDetailService.getGoodsDetailsByBillSidForBack(sid);
             if (!goodsDetails.isEmpty()) {
                 for (AsBusrepairInventorybillDetail goodsDetail : goodsDetails) {
                     AsBusrepairInventorybillDetailSDto goodsDetailsVo = new AsBusrepairInventorybillDetailSDto();
+                    AsBusrepairInventorybillDetailSDto goodsDetailsVo2 = new AsBusrepairInventorybillDetailSDto();
                     BeanUtil.copyProperties(goodsDetail, goodsDetailsVo);
-                    if (null != goodsDetail.getCount()) {
+                    BeanUtil.copyProperties(goodsDetail, goodsDetailsVo2);
-                        goodsDetailsVo.setOutboundCount(goodsDetail.getCount().toString());
+                    if (StringUtils.isNotBlank(goodsDetail.getOperName())) {
+                        goodsDetailsVo.setReceivePer(goodsDetail.getOperName());
+                        goodsDetailsVo2.setReceivePer(goodsDetail.getOperName());
+                    }
+                    if (null != goodsDetail.getReceivedTime()) {
+                        goodsDetailsVo.setReceiveTimes(sdf.format(goodsDetail.getReceivedTime()));
+                        goodsDetailsVo2.setReceiveTimes(sdf.format(goodsDetail.getReceivedTime()));
+                    }
+                    if (null != goodsDetail.getCurrentCount()) {
+                        goodsDetailsVo.setOutboundCount(goodsDetail.getCurrentCount().toString());
+                        goodsDetailsVo2.setOutboundCount(goodsDetail.getCurrentCount().toString());
                     }
                     goodsDetailsVo.setCount("0");
+//                    if (null != goodsDetail.getAmount()) {
+//                        goodsDetailsVo.setReturnAmount(goodsDetail.getAmount().toString());
+//                    }
                     list.add(goodsDetailsVo);
+                    list2.add(goodsDetailsVo2);
                 }
                 vo.setDetailList(list);
+                vo.setReceiveList(list2);
             }
         }
         return rb.success().setData(vo);

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

@@ -27,7 +27,8 @@
         FROM as_busrepair_inventorybill_detail AS d
                  LEFT JOIN as_busrepair_inventorybill AS b ON b.sid = d.billSid
         WHERE b.sourceBillSid = #{sid}
-        GROUP BY d.goodsID
+          and d.isEnable = 1
+--         GROUP BY d.goodsID
     </select>
     <select id="getGoodsDetailsByBillSidForBack"
             resultType="com.yxt.anrui.as.api.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetail">
@@ -38,7 +39,8 @@
                 LEFT JOIN as_busrepair_inventorybill AS b ON b.sid = d.billSid
         WHERE
             b.sourceBillSid = #{sid}
-        GROUP BY
+            and d.isEnable = 1
-            d.goodsID,d.sitemSid
+--         GROUP BY
+--             d.goodsID,d.sitemSid
     </select>
 </mapper>

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

@@ -43,29 +43,29 @@ public class AsBusrepairInventorybillDetailService extends MybatisBaseService<As
 
     public List<AsBusrepairInventorybillDetail> getGoodsDetailsByBillSid(String sid) {
         List<AsBusrepairInventorybillDetail> list = baseMapper.getGoodsDetailsByBillSid(sid);
-        if (!list.isEmpty()) {
+//        if (!list.isEmpty()) {
-            for (AsBusrepairInventorybillDetail record : list) {
+//            for (AsBusrepairInventorybillDetail record : list) {
-                //维修出入库查询已出库数量
+//                //维修出入库查询已出库数量
-                String chuKuCount = asBusrepairInventorybillService.selOutBoundCount(sid, "0", record.getGoodsID()).getData();
+//                String chuKuCount = asBusrepairInventorybillService.selOutBoundCount(sid, "0", record.getGoodsID()).getData();
-                String ruKuCount = asBusrepairInventorybillService.selOutBoundCount(sid, "1", record.getGoodsID()).getData();
+//                String ruKuCount = asBusrepairInventorybillService.selOutBoundCount(sid, "1", record.getGoodsID()).getData();
-                BigDecimal count = new BigDecimal(chuKuCount).subtract(new BigDecimal(ruKuCount));
+//                BigDecimal count = new BigDecimal(chuKuCount).subtract(new BigDecimal(ruKuCount));
-                record.setCount(count);
+//                record.setCount(count);
-            }
+//            }
-        }
+//        }
         return list;
     }
 
     public List<AsBusrepairInventorybillDetail> getGoodsDetailsByBillSidForBack(String sid) {
         List<AsBusrepairInventorybillDetail> list = baseMapper.getGoodsDetailsByBillSidForBack(sid);
-        if (!list.isEmpty()) {
+//        if (!list.isEmpty()) {
-            for (AsBusrepairInventorybillDetail record : list) {
+//            for (AsBusrepairInventorybillDetail record : list) {
-                //维修出入库查询已出库数量
+//                //维修出入库查询已出库数量
-                String chuKuCount = asBusrepairInventorybillService.selOutBoundCountBySitemSid(sid, "0", record.getGoodsID(),record.getSitemSid()).getData();
+//                String chuKuCount = asBusrepairInventorybillService.selOutBoundCountBySitemSid(sid, "0", record.getGoodsID(),record.getSitemSid()).getData();
-                String ruKuCount = asBusrepairInventorybillService.selOutBoundCountBySitemSid(sid, "1", record.getGoodsID(),record.getSitemSid()).getData();
+//                String ruKuCount = asBusrepairInventorybillService.selOutBoundCountBySitemSid(sid, "1", record.getGoodsID(),record.getSitemSid()).getData();
-                BigDecimal count = new BigDecimal(chuKuCount).subtract(new BigDecimal(ruKuCount));
+//                BigDecimal count = new BigDecimal(chuKuCount).subtract(new BigDecimal(ruKuCount));
-                record.setCount(count);
+//                record.setCount(count);
-            }
+//            }
-        }
+//        }
         return list;
     }
 }