Merge remote-tracking branch 'origin/master'

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

@@ -137,6 +137,8 @@ public class AsBusrepairBill extends BaseEntity {
     private Integer  repairState;
     @ApiModelProperty("维修工作状态（0未完成，1已完成）")
     private Integer completeState;
+    @ApiModelProperty("是否可出厂")
+    private Integer isOutFactory;
     @ApiModelProperty("出库确认备注")
     private String outboundRemarks;
     @ApiModelProperty("对接人sid")

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

@@ -25,8 +25,12 @@ public class AsBusrepairBillDetailsVo implements Vo {
     private String claimManufacturerSid;
     @ApiModelProperty("特殊标志（1有，0无）")
     private String isSpecialSign;
+    @ApiModelProperty("特殊标志（1有，0无）")
+    private String isSpecialSign2;
     @ApiModelProperty("客户来源 ")
     private String customerSource;
+    @ApiModelProperty("客户来源 ")
+    private String customerSource2;
     @ApiModelProperty("对接人sid")
     private String dockingPeopleSid;
     @ApiModelProperty("对接人")
@@ -49,6 +53,9 @@ public class AsBusrepairBillDetailsVo implements Vo {
     private String taxAmount;
     @ApiModelProperty("是否外出（1是，2否）")
     private String isGoOut;
+    @ApiModelProperty("是否外出（1是，2否）")
+    private String isGoOut2;
+
     @ApiModelProperty("厂家补助")
     private String subsidyAmount;
     @ApiModelProperty("其他费用")
@@ -167,5 +174,5 @@ public class AsBusrepairBillDetailsVo implements Vo {
     private List<FileUrlQuery> fileName = new ArrayList<>(); //文件名称
     @ApiModelProperty("商品登记备注")
     private String registerRemarks;
-
+    private List<String> files = new ArrayList<>(); //文件名称
 }

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

@@ -64,5 +64,9 @@ public class AsBusrepairBillVo implements Vo {
     @ApiModelProperty("是否外出（1是，2否）")
     private String isGoOut;
 
-
+    /*
+    * 工单查询列表-出厂
+    * */
+    @ApiModelProperty("是否可出厂")
+    private String isOutFactory;
 }

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

@@ -70,4 +70,7 @@ public class GoodsDetailsVo implements Vo {
     private List<String> partsSellers = new ArrayList<>();
     @ApiModelProperty("维修项目")
     private String serviceItem;
+    @ApiModelProperty("配件销售人")
+    private String partsSellers2;
+
 }

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

@@ -20,6 +20,8 @@ public class InsuranceVo {
     private String responsibilityKey;
     @ApiModelProperty("是否存在人伤（1是，0否）")
     private String isPersonInjuries;
+    @ApiModelProperty("是否存在人伤（1是，0否）")
+    private String isPersonInjuries2;
     @ApiModelProperty("责任比例Key")
     private String responsibilityRatioKey;
     @ApiModelProperty("责任比例")

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

@@ -17,6 +17,8 @@ public class InvoiceVo {
 
     @ApiModelProperty("是否需要开发票（是1，否0）")
     private String isInvoicing;
+    @ApiModelProperty("是否需要开发票（是1，否0）")
+    private String isInvoicing2;
     @ApiModelProperty("发票类型")
     private String invoiceType;
     @ApiModelProperty("发票类型")
@@ -35,4 +37,6 @@ public class InvoiceVo {
     private String invoiceCompany;
     @ApiModelProperty("加税点项目“,”英文逗号拼接")
     private List<String> taxItems = new ArrayList<>();
+    @ApiModelProperty("加税点项目")
+    private String taxItems2;
 }

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

@@ -45,6 +45,10 @@ public class SitemVo {
     private String repairerName;
     @ApiModelProperty("销售价格常量")
     private String sitemPrice;
+    @ApiModelProperty("维修技师 ‘、’ 拼接")
+    private String staffNames;
+    @ApiModelProperty("单价-100，工时数-5小时，提成-100")
+    private String manHourInfo;
     //-------------维修人员---------------
 //    @ApiModelProperty("维修人员sid")
 //    private String repairerSid;

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

@@ -0,0 +1,29 @@
+package com.yxt.anrui.as.api.asbusrepairbill.app;
+
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/8/2 15:27
+ */
+@Data
+public class GoodsReceiveListVo {
+
+
+    /**
+     * 数量
+     */
+    private String num;
+    /**
+     * 记录sid
+     */
+    private String sid;
+    /**
+     * 商品相关信息，商品名称+换行符+图号
+     */
+    private String val;
+//
+//    private String goodsSpuName;
+//    private String goodsSkuCode;
+}

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

@@ -0,0 +1,20 @@
+package com.yxt.anrui.as.api.asbusrepairbill.app;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/8/2 15:23
+ */
+@Data
+public class GoodsReceiveQuery implements Query {
+    private String menuSid;
+    /**
+     * jkeyword
+     */
+    private String name;
+    private String orgPath;
+    private String userSid;
+}

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

@@ -0,0 +1,18 @@
+package com.yxt.anrui.as.api.asbusrepairbill.app;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/8/2 16:23
+ */
+@Data
+public class GoodsReceiveSubmit {
+
+    private String userSid;
+    private List<String> list = new ArrayList<>();
+}

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

@@ -0,0 +1,48 @@
+package com.yxt.anrui.as.api.asbusrepairbill.app;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/8/2 15:23
+ */
+@Data
+public class GoodsReceiveVo {
+
+    /**
+     * 工单编号
+     */
+    private String billId;
+    /**
+     * 工单类型
+     */
+    private String billType;
+    /**
+     * 客户名称
+     */
+    private String customerName;
+    /**
+     * 进厂时间
+     */
+    private String entryTime;
+    /**
+     * 车架号集合
+     */
+    private List<GoodsReceiveListVo> list = new ArrayList<>();
+    /**
+     * 维修工单sid
+     */
+    private String sid;
+    /**
+     * 科目
+     */
+    private String subject;
+    /**
+     * 车牌号
+     */
+    private String vehMark;
+}

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

@@ -1,10 +1,12 @@
 package com.yxt.anrui.as.api.asbusrepairinventorybilldetail;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * @description:
@@ -83,4 +85,8 @@ public class AsBusrepairInventorybillDetail extends BaseEntity {
     private String partsSellersSid;
     @ApiModelProperty("配件销售")
     private String partsSellers;
+
+    @ApiModelProperty("接收时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date receivedTime;
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyMapper.java

@@ -69,4 +69,7 @@ public interface AsArrearsoutApplyMapper extends BaseMapper<AsArrearsoutApply> {
     String selectNum(String billNo);
 
     int selectBySid(String join);
+
+    @Select("select nodeState from as_arrearsout_apply where pairBillSid = #{pairBillSid}")
+    String selByPairBillSid(String pairBillSid);
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyService.java

@@ -381,7 +381,7 @@ public class AsArrearsoutApplyService extends MybatisBaseService<AsArrearsoutApp
             UpdateFlowFieldVo ufVo = resultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
             if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
-
+                asBusrepairBillService.updateOutFactory(asArrearsoutApply.getPairBillSid());
             } else {
                 //极光推送
                 asArrearsoutApply = fetchBySid(businessSid);
@@ -567,4 +567,8 @@ public class AsArrearsoutApplyService extends MybatisBaseService<AsArrearsoutApp
         delBySids(sids);
         return rb.success();
     }
+
+    public String selByPairBillSid(String pairBillSid) {
+        return baseMapper.selByPairBillSid(pairBillSid);
+    }
 }

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.GoodsReceiveListVo;
+import com.yxt.anrui.as.api.asbusrepairbill.app.GoodsReceiveVo;
 import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.SitemsVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -47,4 +49,11 @@ public interface AsBusrepairBillMapper extends BaseMapper<AsBusrepairBill> {
     IPage<AsBusrepairBwBillPageListVo> bwBillPageList(IPage<AsBusrepairBill> page, @Param(Constants.WRAPPER) QueryWrapper<AsBusrepairBill> qw);
 
     IPage<AsBillListReturnGoodsVo> listReturnGoods(IPage<AsBusrepairBill> page, @Param(Constants.WRAPPER)QueryWrapper<AsBusrepairBill> qw);
+
+    @Update("update as_busrepair_bill set isOutFactory = '1' where sid = #{sid}")
+    void updateOutFactory(String sid);
+
+    IPage<GoodsReceiveVo> notConfirmList(IPage<AsBusrepairBill> page, @Param(Constants.WRAPPER) QueryWrapper<AsBusrepairBill> qw);
+
+    List<GoodsReceiveListVo> selGoodsReceiveByBillSid(@Param("sid") String sid);
 }

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

@@ -56,7 +56,8 @@
                b.mainRepairers,
                b.remarks,
                i.isInvoicing,
-               IF(b.isGoOut = 1, '是', '否') as isGoOut
+               IF(b.isGoOut = 1, '是', '否') as isGoOut,
+               IF(b.isOutFactory = 1, '是', '否') as isOutFactory
         FROM as_busrepair_bill AS b
                  LEFT JOIN as_busrepair_bill_vech AS v ON b.sid = v.billSid
                  LEFT JOIN as_busrepair_bill_invoice AS i ON b.sid = i.billSid
@@ -181,4 +182,34 @@
             ${ew.sqlSegment}
         </where>
     </select>
+    <select id="notConfirmList" resultType="com.yxt.anrui.as.api.asbusrepairbill.app.GoodsReceiveVo">
+        SELECT
+            b.sid,
+            b.billNo billId,
+            b.billType,
+            b.customerName,
+            b.entryTime,
+            b.`subject`,
+            v.vehMark
+        FROM
+            as_busrepair_inventorybill_detail AS d
+                LEFT JOIN as_busrepair_inventorybill as i ON d.billSid = i.sid
+                LEFT JOIN as_busrepair_bill as b ON i.sourceBillSid = b.sid
+                LEFT JOIN as_busrepair_bill_vech as v ON v.billSid = b.sid
+        <where>
+            ${ew.sqlSegment}
+        </where>
+        GROUP BY i.sourceBillSid
+    </select>
+    <select id="selGoodsReceiveByBillSid"
+            resultType="com.yxt.anrui.as.api.asbusrepairbill.app.GoodsReceiveListVo">
+        SELECT
+            d.sid,
+            d.count as num,
+            concat(d.goodsSpuName,'\n',d.goodsSkuCode) val
+        FROM
+            as_busrepair_inventorybill_detail AS d
+                LEFT JOIN as_busrepair_inventorybill as i ON d.billSid = i.sid
+        WHERE d.state = 1 and i.sourceBillSid = #{sid}
+    </select>
 </mapper>

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

@@ -1,6 +1,9 @@
 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.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;
@@ -28,6 +31,22 @@ public class AsBusrepairBillRest {
         return rb.success().setData(pv);
     }
 
+    @PostMapping("/listPageCC")
+    @ApiOperation("工单查询列表-出厂")
+    ResultBean<PagerVo<AsBusrepairBillVo>> listPageCC(@RequestBody PagerQuery<AsBusrepairBillQuery> pagerQuery) {
+        ResultBean<PagerVo<AsBusrepairBillVo>> rb = ResultBean.fireFail();
+        PagerVo<AsBusrepairBillVo> pv = asBusrepairBillService.listPageCC(pagerQuery);
+        return rb.success().setData(pv);
+    }
+
+    @PostMapping("/listPageConfirm")
+    @ApiOperation("工单查询列表-站长出厂确认")
+    ResultBean<PagerVo<AsBusrepairBillVo>> listPageConfirm(@RequestBody PagerQuery<AsBusrepairBillQuery> pagerQuery) {
+        ResultBean<PagerVo<AsBusrepairBillVo>> rb = ResultBean.fireFail();
+        PagerVo<AsBusrepairBillVo> pv = asBusrepairBillService.listPageConfirm(pagerQuery);
+        return rb.success().setData(pv);
+    }
+
     @PostMapping("/listReturnGoods")
     @ApiOperation("工单查询列表")
     ResultBean<PagerVo<AsBillListReturnGoodsVo>> listReturnGoods(@RequestBody PagerQuery<AsBillListReturnGoodsQuery> pagerQuery) {
@@ -159,4 +178,27 @@ public class AsBusrepairBillRest {
         PagerVo<AsBusrepairBwBillPageListVo> pv = asBusrepairBillService.bwBillPageList(pagerQuery);
         return rb.success().setData(pv);
     }
+
+    //----------------------------app配件接收-----------------------------
+    @PostMapping("/notConfirmList")
+    @ApiOperation("获取配件确认列表")
+    ResultBean<PagerVo<GoodsReceiveVo>> notConfirmList(@RequestBody PagerQuery<GoodsReceiveQuery> pagerQuery) {
+        ResultBean<PagerVo<GoodsReceiveVo>> rb = ResultBean.fireFail();
+        PagerVo<GoodsReceiveVo> pv = asBusrepairBillService.notConfirmList(pagerQuery);
+        return rb.success().setData(pv);
+    }
+
+    @PostMapping("/submitList")
+    @ApiOperation("配件确认提交")
+    ResultBean submitList(@RequestBody GoodsReceiveSubmit query) {
+        ResultBean rb = ResultBean.fireFail();
+        asBusrepairBillService.submitList(query);
+        return rb.success();
+    }
+
+    @ApiOperation("app详情回显")
+    @GetMapping("/fetchDetailsBySid2/{sid}")
+    public ResultBean<AsBusrepairBillDetailsVo> fetchDetailsBySid2(@PathVariable("sid") String sid) {
+        return asBusrepairBillService.fetchDetailsBySid(sid);
+    }
 }

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

@@ -7,6 +7,10 @@ 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.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;
@@ -26,6 +30,7 @@ import com.yxt.anrui.as.api.utils.AsRule;
 import com.yxt.anrui.as.api.utils.FileUrlQuery;
 import com.yxt.anrui.as.api.utils.domain.AsBillNo;
 import com.yxt.anrui.as.biz.asappendix.AsAppendixService;
+import com.yxt.anrui.as.biz.asarrearsoutapply.AsArrearsoutApplyService;
 import com.yxt.anrui.as.biz.asbusclaimbill.AsBusclaimBillService;
 import com.yxt.anrui.as.biz.asbusrepairbillaitem.AsBusrepairBillAitemService;
 import com.yxt.anrui.as.biz.asbusrepairbillinsurance.AsBusrepairBillInsuranceRest;
@@ -77,6 +82,7 @@ import javax.annotation.Resource;
 import java.io.File;
 import java.io.InputStream;
 import java.math.BigDecimal;
+import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.time.ZoneId;
@@ -139,7 +145,10 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
     @Autowired
     private AsServiceItemService asServiceItemService;
     @Autowired
+    private AsArrearsoutApplyService asArrearsoutApplyService;
+    @Autowired
     private DocPdfComponent docPdfComponent;
+
     /**
      * 维修领料获取派工单
      *
@@ -469,6 +478,27 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
             if (null != asBusrepairBill.getNodeTime()) {
                 vo.setNodeTime(sdf.format(asBusrepairBill.getNodeTime()));
             }
+            CrmCustomerTemp customerTemp = crmCustomerTempFeign.fetchEntity(asBusrepairBill.getCustomerSid()).getData();
+            if (null != customerTemp) {
+                if (StringUtils.isNotBlank(customerTemp.getSource())) {
+                    vo.setCustomerSource(customerTemp.getSource());
+                    vo.setCustomerSource2(customerTemp.getSource());
+                }
+            }
+            if (StringUtils.isNotBlank(asBusrepairBill.getIsGoOut())) {
+                if (asBusrepairBill.getIsGoOut().equals("1")) {
+                    vo.setIsGoOut2("是");
+                } else if (asBusrepairBill.getIsGoOut().equals("2")) {
+                    vo.setIsGoOut2("否");
+                }
+            }
+            if (null != asBusrepairBill.getIsSpecialSign()) {
+                if (asBusrepairBill.getIsSpecialSign().intValue() == 1) {
+                    vo.setIsSpecialSign2("有");
+                } else if (asBusrepairBill.getIsSpecialSign().intValue() == 0) {
+                    vo.setIsSpecialSign2("无");
+                }
+            }
             AsBusrepairBillVech vech = asBusrepairBillVechService.fetchByBillSid(sid);
             if (null != vech) {
                 if (StringUtils.isNotBlank(vech.getVehMark())) {
@@ -513,12 +543,29 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
                     if (null != invoice.getTaxRate()) {
                         taxRate = invoice.getTaxRate();
                     }
+                    invoiceVo.setTaxItems2(invoice.getTaxItems());
+                } else {
+                    invoiceVo.setTaxItems(new ArrayList<>());
+                }
+                if (null != invoice.getIsInvoicing()) {
+                    if (invoice.getIsInvoicing().intValue() == 1) {
+                        invoiceVo.setIsInvoicing2("是");
+                    } else if (invoice.getIsInvoicing().intValue() == 0) {
+                        invoiceVo.setIsInvoicing2("否");
+                    }
                 }
                 vo.setInvoiceVo(invoiceVo);
             }
             AsBusrepairBillInsurance insurance = asBusrepairBillInsuranceService.fetchByBillSid(sid);
             if (null != insurance) {
                 BeanUtil.copyProperties(insurance, insuranceVo);
+                if (StringUtils.isNotBlank(insurance.getIsPersonInjuries())) {
+                    if (insurance.getIsPersonInjuries().equals("1")) {
+                        insuranceVo.setIsPersonInjuries2("是");
+                    } else if (insurance.getIsPersonInjuries().equals("0")) {
+                        insuranceVo.setIsPersonInjuries2("否");
+                    }
+                }
             }
             List<AsBusrepairBillInsuranceRecord> insuranceRecord = asBusrepairBillInsuranceRecordService.fetchByBillSid(sid);
             if (!insuranceRecord.isEmpty()) {
@@ -540,6 +587,19 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
                 for (AsBusrepairBillSitem sitem : sitems) {
                     SitemVo sitemVo = new SitemVo();
                     BeanUtil.copyProperties(sitem, sitemVo);
+                    String price = "";
+                    String hours = "";
+                    String ticheng = "";
+                    if (null != sitem.getHourPrice()) {
+                        price = sitem.getHourPrice().toString();
+                    }
+                    if (null != sitem.getHours()) {
+                        hours = String.valueOf(sitem.getHours().intValue());
+                    }
+                    if (null != sitem.getExamineHourPrice()) {
+                        ticheng = sitem.getExamineHourPrice().toString();
+                    }
+                    sitemVo.setManHourInfo("单价-" + price + "，工时数-" + hours + "小时，提成-" + ticheng);
                     List<AsBusrepairBillSitemRepairer> repairers = asBusrepairBillSitemRepairerService.fetchByBillSid(sid, sitem.getServiceItemSid());
                     if (!repairers.isEmpty()) {
                         List<String> staffList = new ArrayList<>(); //维修人员信息
@@ -554,6 +614,7 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
                         }
                         sitemVo.setStaffList(staffList);
                         sitemVo.setStaffNameList(staffNameList);
+                        sitemVo.setStaffNames(String.join("、", staffNameList));
                     }
                     sitemVos.add(sitemVo);
                 }
@@ -580,12 +641,16 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
                 vo.setAitemVos(aitemVos);
             }
             List<AsBusrepairInventorybillDetail> goodsDetails = asBusrepairInventorybillDetailService.getGoodsDetailsByBillSid(sid);
+            DecimalFormat df2 =new DecimalFormat("#.00");
             if (!goodsDetails.isEmpty()) {
                 for (AsBusrepairInventorybillDetail goodsDetail : goodsDetails) {
                     GoodsDetailsVo goodsDetailsVo = new GoodsDetailsVo();
                     BeanUtil.copyProperties(goodsDetail, goodsDetailsVo);
                     BigDecimal constPrice = BigDecimal.ZERO; //销售价常量
                     boolean isTaxRate = false; //进货价是否含税
+                    if (null != goodsDetail.getReceivedTime()) {
+                        goodsDetailsVo.setReceivedTime(sdf.format(goodsDetail.getReceivedTime()));
+                    }
                     SmsGoods smsGoods = smsGoodsFeign.fetchEntityByGoodsID(goodsDetail.getGoodsID()).getData();
                     if (null != smsGoods) {
                         if (StringUtils.isNotBlank(smsGoods.getSupplierName())) {
@@ -600,12 +665,17 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
                         String[] strings = partsSellersSid.split(",");
                         List<String> list = Arrays.asList(strings);
                         goodsDetailsVo.setPartsSellersSids(list);
+                    } else {
+                        goodsDetailsVo.setPartsSellersSids(new ArrayList<>());
                     }
                     if (StringUtils.isNotBlank(goodsDetail.getPartsSellers())) {
                         String partsSellers = goodsDetail.getPartsSellers();
                         String[] strings = partsSellers.split(",");
                         List<String> list = Arrays.asList(strings);
                         goodsDetailsVo.setPartsSellers(list);
+                        goodsDetailsVo.setPartsSellers2(goodsDetail.getPartsSellers());
+                    } else {
+                        goodsDetailsVo.setPartsSellers(new ArrayList<>());
                     }
                     if (goodsDetail.getIsTaxRate() != null) {
                         if (goodsDetail.getIsTaxRate().intValue() == 1) {
@@ -616,7 +686,7 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
                                 BigDecimal divide = taxRate.divide(new BigDecimal("100"));
                                 BigDecimal add = divide.add(new BigDecimal("1"));
                                 BigDecimal multiply = constPrice.multiply(add);
-                                goodsDetailsVo.setPrice(multiply.toString());
+                                goodsDetailsVo.setPrice(df2.format(multiply));
                             } else {
                                 goodsDetailsVo.setPrice(constPrice.toString());
                             }
@@ -626,7 +696,7 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
                             BigDecimal divide = taxRate.divide(new BigDecimal("100"));
                             BigDecimal add = divide.add(new BigDecimal("1"));
                             BigDecimal multiply = constPrice.multiply(add);
-                            goodsDetailsVo.setPrice(multiply.toString());
+                            goodsDetailsVo.setPrice(df2.format(multiply));
                         } else {
                             goodsDetailsVo.setPrice(constPrice.toString());
                         }
@@ -647,6 +717,7 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
                 vo.setSettleVo(settleVo);
             }
             List<FileUrlQuery> file = new ArrayList<>();
+            List<String> file2 = new ArrayList<>();
             List<AsAppendix> asAppendices = asAppendixService.fetchByLinkSid(sid);
             if (!asAppendices.isEmpty()) {
                 for (AsAppendix asAppendix : asAppendices) {
@@ -657,9 +728,12 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
                     String fileType = asAppendix.getFileType();
                     fileUrlQuery.setName(fileName + "." + fileType);
                     file.add(fileUrlQuery);
+                    file2.add(url);
                 }
             }
             vo.setFileName(file);
+            vo.setFiles(file2);
+
         }
         return rb.success().setData(vo);
     }
@@ -791,6 +865,256 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
         return p;
     }
 
+    public PagerVo<AsBusrepairBillVo> listPageCC(PagerQuery<AsBusrepairBillQuery> pagerQuery) {
+        AsBusrepairBillQuery query = pagerQuery.getParams();
+        QueryWrapper<AsBusrepairBill> 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<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
+            if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
+                //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+                String orgSidPath = query.getOrgPath();
+                orgSidPath = orgSidPath + "/";
+                int i1 = orgSidPath.indexOf("/");
+                int i2 = orgSidPath.indexOf("/", i1 + 1);
+                int i3 = orgSidPath.indexOf("/", i2 + 1);
+                int i4 = orgSidPath.indexOf("/", i3 + 1);
+                String orgLevelKey = defaultIdReltBean.getData();
+                if ("1".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i1);
+                    qw.like("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("b.createBySid", query.getUserSid());
+                } else {
+                    PagerVo<AsBusrepairBillVo> p = new PagerVo<>();
+                    return p;
+                }
+            } else {
+                PagerVo<AsBusrepairBillVo> p = new PagerVo<>();
+                return p;
+            }
+        } else {
+            String deptSid = "";
+            String orgPath = query.getOrgPath();
+            if (StringUtils.isNotBlank(orgPath)) {
+                List<String> split = Arrays.asList(orgPath.split("/"));
+                if (split.size() > 1) {
+                    //获取本级sid获取本级部门信息
+                    SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData();
+                    deptSid = sysOrganization1.getSid();
+                } else {
+                    SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData();
+                    deptSid = sysOrganization.getSid();
+                }
+            }
+            qw.eq("b.deptSid", deptSid);
+        }
+        if (StringUtils.isNotBlank(query.getUseOrgName())) {
+            qw.like("b.useOrgName", query.getUseOrgName());
+        }
+        if (StringUtils.isNotBlank(query.getDept())) {
+            qw.like("b.deptName", query.getDept());
+        }
+        if (StringUtils.isNotBlank(query.getCreateByName())) {
+            qw.like("b.createByName", query.getCreateByName());
+        }
+        if (StringUtils.isNotBlank(query.getBillNo())) {
+            qw.like("b.billNo", query.getBillNo());
+        }
+        String startDate = query.getStartTime();
+        String endDate = query.getEndTime();
+        qw.apply(StringUtils.isNotEmpty(startDate), "date_format (b.createTime,'%Y-%m-%d') >= date_format('" + startDate + "','%Y-%m-%d')").
+                apply(StringUtils.isNotEmpty(endDate), "date_format (b.createTime,'%Y-%m-%d') <= date_format('" + endDate + "','%Y-%m-%d')"
+                );
+        if (StringUtils.isNotBlank(query.getBillType())) {
+            qw.eq("b.billType", query.getBillType());
+        }
+        if (StringUtils.isNotBlank(query.getSubject())) {
+            qw.like("b.`subject`", query.getSubject());
+        }
+        String entryStartTime = query.getEntryStartTime();
+        String entryEndTime = query.getEntryEndTime();
+        qw.apply(StringUtils.isNotEmpty(entryStartTime), "date_format (b.entryTime,'%Y-%m-%d') >= date_format('" + entryStartTime + "','%Y-%m-%d')").
+                apply(StringUtils.isNotEmpty(entryEndTime), "date_format (b.entryTime,'%Y-%m-%d') <= date_format('" + entryEndTime + "','%Y-%m-%d')"
+                );
+        String finishStartTime = query.getFinishStartTime();
+        String finishEndTime = query.getFinishEndTime();
+        qw.apply(StringUtils.isNotEmpty(finishStartTime), "date_format (b.estimatedFinishTime,'%Y-%m-%d') >= date_format('" + finishStartTime + "','%Y-%m-%d')").
+                apply(StringUtils.isNotEmpty(finishEndTime), "date_format (b.estimatedFinishTime,'%Y-%m-%d') <= date_format('" + finishEndTime + "','%Y-%m-%d')"
+                );
+        if (StringUtils.isNotBlank(query.getCustomerName())) {
+            qw.like("b.customerName", query.getCustomerName());
+        }
+        if (StringUtils.isNotBlank(query.getMobile())) {
+            qw.like("b.mobile", query.getMobile());
+        }
+        if (StringUtils.isNotBlank(query.getCustomerOrg())) {
+            qw.like("b.customerOrg", query.getCustomerOrg());
+        }
+        if (StringUtils.isNotBlank(query.getVehMark())) {
+            qw.like("v.vehMark", query.getVehMark());
+        }
+        if (StringUtils.isNotBlank(query.getVinNo())) {
+            qw.like("v.vinNo", query.getVinNo());
+        }
+
+        if (StringUtils.isNotBlank(query.getWaitorName())) {
+            qw.like("b.waitorName", query.getWaitorName());
+        }
+        if (StringUtils.isNotBlank(query.getGroupName())) {
+            qw.like("b.groupName", query.getGroupName());
+        }
+        if (StringUtils.isNotBlank(query.getMainRepairers())) {
+            qw.like("b.mainRepairers", query.getMainRepairers());
+        }
+        if (StringUtils.isNotBlank(query.getIsInvoicing())) {
+            qw.eq("i.isInvoicing", query.getIsInvoicing());
+        }
+        qw.eq("b.outDoorState",2);
+        qw.orderByDesc("b.createTime");
+        IPage<AsBusrepairBill> page = PagerUtil.queryToPage(pagerQuery);
+        IPage<AsBusrepairBillVo> pagging = baseMapper.listPage(page, qw);
+        PagerVo<AsBusrepairBillVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public PagerVo<AsBusrepairBillVo> listPageConfirm(PagerQuery<AsBusrepairBillQuery> pagerQuery) {
+        AsBusrepairBillQuery query = pagerQuery.getParams();
+        QueryWrapper<AsBusrepairBill> 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<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
+            if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
+                //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+                String orgSidPath = query.getOrgPath();
+                orgSidPath = orgSidPath + "/";
+                int i1 = orgSidPath.indexOf("/");
+                int i2 = orgSidPath.indexOf("/", i1 + 1);
+                int i3 = orgSidPath.indexOf("/", i2 + 1);
+                int i4 = orgSidPath.indexOf("/", i3 + 1);
+                String orgLevelKey = defaultIdReltBean.getData();
+                if ("1".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i1);
+                    qw.like("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("b.createBySid", query.getUserSid());
+                } else {
+                    PagerVo<AsBusrepairBillVo> p = new PagerVo<>();
+                    return p;
+                }
+            } else {
+                PagerVo<AsBusrepairBillVo> p = new PagerVo<>();
+                return p;
+            }
+        } else {
+            String deptSid = "";
+            String orgPath = query.getOrgPath();
+            if (StringUtils.isNotBlank(orgPath)) {
+                List<String> split = Arrays.asList(orgPath.split("/"));
+                if (split.size() > 1) {
+                    //获取本级sid获取本级部门信息
+                    SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData();
+                    deptSid = sysOrganization1.getSid();
+                } else {
+                    SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData();
+                    deptSid = sysOrganization.getSid();
+                }
+            }
+            qw.eq("b.deptSid", deptSid);
+        }
+        if (StringUtils.isNotBlank(query.getUseOrgName())) {
+            qw.like("b.useOrgName", query.getUseOrgName());
+        }
+        if (StringUtils.isNotBlank(query.getDept())) {
+            qw.like("b.deptName", query.getDept());
+        }
+        if (StringUtils.isNotBlank(query.getCreateByName())) {
+            qw.like("b.createByName", query.getCreateByName());
+        }
+        if (StringUtils.isNotBlank(query.getBillNo())) {
+            qw.like("b.billNo", query.getBillNo());
+        }
+        String startDate = query.getStartTime();
+        String endDate = query.getEndTime();
+        qw.apply(StringUtils.isNotEmpty(startDate), "date_format (b.createTime,'%Y-%m-%d') >= date_format('" + startDate + "','%Y-%m-%d')").
+                apply(StringUtils.isNotEmpty(endDate), "date_format (b.createTime,'%Y-%m-%d') <= date_format('" + endDate + "','%Y-%m-%d')"
+                );
+        if (StringUtils.isNotBlank(query.getBillType())) {
+            qw.eq("b.billType", query.getBillType());
+        }
+        if (StringUtils.isNotBlank(query.getSubject())) {
+            qw.like("b.`subject`", query.getSubject());
+        }
+        String entryStartTime = query.getEntryStartTime();
+        String entryEndTime = query.getEntryEndTime();
+        qw.apply(StringUtils.isNotEmpty(entryStartTime), "date_format (b.entryTime,'%Y-%m-%d') >= date_format('" + entryStartTime + "','%Y-%m-%d')").
+                apply(StringUtils.isNotEmpty(entryEndTime), "date_format (b.entryTime,'%Y-%m-%d') <= date_format('" + entryEndTime + "','%Y-%m-%d')"
+                );
+        String finishStartTime = query.getFinishStartTime();
+        String finishEndTime = query.getFinishEndTime();
+        qw.apply(StringUtils.isNotEmpty(finishStartTime), "date_format (b.estimatedFinishTime,'%Y-%m-%d') >= date_format('" + finishStartTime + "','%Y-%m-%d')").
+                apply(StringUtils.isNotEmpty(finishEndTime), "date_format (b.estimatedFinishTime,'%Y-%m-%d') <= date_format('" + finishEndTime + "','%Y-%m-%d')"
+                );
+        if (StringUtils.isNotBlank(query.getCustomerName())) {
+            qw.like("b.customerName", query.getCustomerName());
+        }
+        if (StringUtils.isNotBlank(query.getMobile())) {
+            qw.like("b.mobile", query.getMobile());
+        }
+        if (StringUtils.isNotBlank(query.getCustomerOrg())) {
+            qw.like("b.customerOrg", query.getCustomerOrg());
+        }
+        if (StringUtils.isNotBlank(query.getVehMark())) {
+            qw.like("v.vehMark", query.getVehMark());
+        }
+        if (StringUtils.isNotBlank(query.getVinNo())) {
+            qw.like("v.vinNo", query.getVinNo());
+        }
+
+        if (StringUtils.isNotBlank(query.getWaitorName())) {
+            qw.like("b.waitorName", query.getWaitorName());
+        }
+        if (StringUtils.isNotBlank(query.getGroupName())) {
+            qw.like("b.groupName", query.getGroupName());
+        }
+        if (StringUtils.isNotBlank(query.getMainRepairers())) {
+            qw.like("b.mainRepairers", query.getMainRepairers());
+        }
+        if (StringUtils.isNotBlank(query.getIsInvoicing())) {
+            qw.eq("i.isInvoicing", query.getIsInvoicing());
+        }
+        qw.eq("b.outDoorState",2);
+        qw.orderByDesc("b.createTime");
+        IPage<AsBusrepairBill> page = PagerUtil.queryToPage(pagerQuery);
+        IPage<AsBusrepairBillVo> pagging = baseMapper.listPage(page, qw);
+        PagerVo<AsBusrepairBillVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
     public ResultBean<String> submitNextNode(AsBusrepairBillDto dto) {
         ResultBean rb = ResultBean.fireFail();
         if (StringUtils.isNotBlank(dto.getSid())) {
@@ -1455,13 +1779,13 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
         if (price0) {
             dataMap.put("caps1", "");
             dataMap.put("sumMoney1", "0");
-            dataMap.put("caps2","");
+            dataMap.put("caps2", "");
             dataMap.put("sumMoney2", "0");
-            dataMap.put("outAmount","0");
-            dataMap.put("subsidyAmount","0");
-            dataMap.put("rescueAmount","0");
-            dataMap.put("receivableAmount","0");
-            dataMap.put("actualAmount","0");
+            dataMap.put("outAmount", "0");
+            dataMap.put("subsidyAmount", "0");
+            dataMap.put("rescueAmount", "0");
+            dataMap.put("receivableAmount", "0");
+            dataMap.put("actualAmount", "0");
         } else {
             dataMap.put("caps1", vo.getCaps1());
             dataMap.put("sumMoney1", vo.getSumMoney1());
@@ -1473,7 +1797,7 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
             dataMap.put("receivableAmount", vo.getReceivableAmount());
             dataMap.put("actualAmount", vo.getActualAmount());
         }
-        dataMap.put("userName", vo.getCompany());
+        dataMap.put("userName", vo.getUserName());
         List<SettleItemPdfVo> items = vo.getItems();
         if (!items.isEmpty()) {
             for (SettleItemPdfVo itemPdfVo : items) {
@@ -1485,7 +1809,7 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
                 map.put("hourPrice", itemPdfVo.getHourPrice());
                 map.put("hours", itemPdfVo.getHours());
                 if (price0) {
-                    map.put("price","0");
+                    map.put("price", "0");
                 } else {
                     map.put("price", itemPdfVo.getPrice());
                 }
@@ -1509,8 +1833,8 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
                 map.put("unit", good.getUnit());
                 map.put("count", good.getCount());
                 if (price0) {
-                    map.put("price","0");
-                    map.put("amount","0");
+                    map.put("price", "0");
+                    map.put("amount", "0");
                 } else {
                     map.put("price", good.getPrice());
                     map.put("amount", good.getAmount());
@@ -1593,4 +1917,51 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
         }
     }
 
+    public void updateOutFactory(String sid) {
+        baseMapper.updateOutFactory(sid);
+    }
+    public PagerVo<GoodsReceiveVo> notConfirmList(PagerQuery<GoodsReceiveQuery> pagerQuery) {
+        GoodsReceiveQuery query = pagerQuery.getParams();
+        QueryWrapper<AsBusrepairBill> qw = new QueryWrapper<>();
+        if (query != null) {
+            //工单编号
+            if (StringUtils.isNotBlank(query.getUserSid())) {
+                qw.eq("d.operUserSid", query.getUserSid());
+            }
+            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())
+                );
+            }
+            qw.eq("d.state", 1);
+        }
+        IPage<AsBusrepairBill> page = PagerUtil.queryToPage(pagerQuery);
+        IPage<GoodsReceiveVo> pagging = baseMapper.notConfirmList(page, qw);
+        List<GoodsReceiveVo> records = pagging.getRecords();
+        if (!records.isEmpty()) {
+            for (GoodsReceiveVo record : records) {
+                List<GoodsReceiveListVo> list = baseMapper.selGoodsReceiveByBillSid(record.getSid());
+                if (!list.isEmpty()) {
+                    record.setList(list);
+                }
+            }
+        }
+        PagerVo<GoodsReceiveVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public void submitList(GoodsReceiveSubmit query) {
+        List<String> list = query.getList();
+        if (!list.isEmpty()) {
+            for (String s : list) {
+                AsBusrepairInventorybillDetail detail = asBusrepairInventorybillDetailService.fetchBySid(s);
+                if (null != detail) {
+                    detail.setReceivedTime(new Date());
+                    detail.setState(2);
+                    asBusrepairInventorybillDetailService.updateById(detail);
+                }
+            }
+        }
+    }
 }

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

@@ -299,8 +299,10 @@ public class AsBusrepairInventorybillService extends MybatisBaseService<AsBusrep
                 if (StringUtils.isNotBlank(dto.getWarehouseManagerSid())) {
                     detail.setOperUserSid(dto.getWarehouseManagerSid());
                 }
+                if (StringUtils.isNotBlank(sDto.getPrice())) {
+                    detail.setGoodsDetailsPrice(new BigDecimal(sDto.getPrice()));
+                }
                 asBusrepairInventorybillDetailService.insert(detail);
-
                 WmsUpdateCountQuery countQuery = new WmsUpdateCountQuery();
                 countQuery.setSid(sDto.getInventorySid());
                 countQuery.setCount(new BigDecimal(sDto.getCount()));

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillMapper.java

@@ -29,4 +29,6 @@ public interface WmsReceiptBillMapper extends BaseMapper<WmsReceiptBill> {
     List<WmsReceiptBillDetail> selGoodsListCountBySpuSidAndSouceSid(@Param("goodsSpuSid")String goodsSpuSid, @Param("sourceBillSid")String sourceBillSid);
 
     List<ShelfListVo> getUpShlefListBySid(@Param("sid") String sid);
+
+    String selallotmentNumByReceiptDetailSid(String detailsSid);
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillMapper.xml

@@ -85,4 +85,12 @@
         from wms_shelf_bill wrb
         where wrb.sourceBillSid = #{sid}
     </select>
+    <select id="selallotmentNumByReceiptDetailSid" resultType="java.lang.String">
+        SELECT
+            IFNULL( SUM(d.actualCount), 0 )
+        FROM
+            wms_shelf_bill_detail AS d
+        WHERE
+            d.receiptDetailSid = #{detailsSid}
+    </select>
 </mapper>

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillService.java

@@ -371,6 +371,9 @@ public class WmsReceiptBillService extends MybatisBaseService<WmsReceiptBillMapp
             if (!list.isEmpty()) {
                 for (int i = 0; i < list.size(); i++) {
                     WmsReceiptBillDetailDto2 wmsReceiptBillDetailDto2 = list.get(i);
+                    String detailsSid = wmsReceiptBillDetailDto2.getDetailsSid();
+                    String allotmentNum = baseMapper.selallotmentNumByReceiptDetailSid(detailsSid);
+                    wmsReceiptBillDetailDto2.setAllotmentNum(allotmentNum);
                     int a = i + 1;
                     wmsReceiptBillDetailDto2.setXh(String.valueOf(a));
                     List<WmsReceiptBillDetailBatchDto2> pcList2 = wmsReceiptBillDetailBatchService.getDetailsInit(sid, wmsReceiptBillDetailDto2.getDetailsSid());

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailDto2.java

@@ -70,4 +70,6 @@ public class WmsReceiptBillDetailDto2 {
 
     @ApiModelProperty("有效天数")
     private String shelfLife;
+    @ApiModelProperty("已分配数量 ")
+    private String allotmentNum;
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailVo.java

@@ -66,4 +66,7 @@ public class WmsReceiptBillDetailVo {
     @ApiModelProperty("预约数量（采购订单数量）")
     private String orderCount;
 
+
+
+
 }