完善商品退货

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

@@ -5792,6 +5792,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                 BeanUtil.copyProperties(importSleepData, p, "id", "sid");
                 p.setCreateBySid(userSid);
                 p.setIsEnable(3);
+                p.setUpdateTime(new Date());
                 planDetails.add(p);
             }
             loanRepaymentPlanDetailsService.saveList(planDetails);

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

@@ -2,6 +2,13 @@ package com.yxt.anrui.as.biz.asbusrepairbill;
 
 import com.yxt.anrui.as.api.asbusrepairbill.*;
 import com.yxt.anrui.as.api.asbusrepairbill.app.*;
+import com.yxt.anrui.as.api.asbusrepairbillsitem.AsBusrepairBillSitem;
+import com.yxt.anrui.as.api.asbusrepairbillsitemrepairer.AsBusrepairBillSitemRepairer;
+import com.yxt.anrui.as.api.asbusrepairbillvech.AsBusrepairBillVech;
+import com.yxt.anrui.as.biz.asbusrepairbillsitem.AsBusrepairBillSitemService;
+import com.yxt.anrui.as.biz.asbusrepairbillsitemrepairer.AsBusrepairBillSitemRepairerRest;
+import com.yxt.anrui.as.biz.asbusrepairbillsitemrepairer.AsBusrepairBillSitemRepairerService;
+import com.yxt.anrui.as.biz.asbusrepairbillvech.AsBusrepairBillVechService;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -22,7 +29,12 @@ public class AsBusrepairBillRest {
 
     @Autowired
     private AsBusrepairBillService asBusrepairBillService;
-
+    @Autowired
+    private AsBusrepairBillVechService asBusrepairBillVechService;
+    @Autowired
+    private AsBusrepairBillSitemService asBusrepairBillSitemService;
+    @Autowired
+    private AsBusrepairBillSitemRepairerService asBusrepairBillSitemRepairerService;
     @PostMapping("/listPage")
     @ApiOperation("工单查询列表")
     ResultBean<PagerVo<AsBusrepairBillVo>> listPage(@RequestBody PagerQuery<AsBusrepairBillQuery> pagerQuery) {
@@ -99,6 +111,27 @@ public class AsBusrepairBillRest {
         return asBusrepairBillService.fetchDetailsBySid(sid);
     }
 
+    @ApiOperation("获取维修单")
+    @GetMapping("/fetchBySid")
+    public AsBusrepairBill fetchBySid(@RequestParam("sid") String sid) {
+        return asBusrepairBillService.fetchBySid(sid);
+    }
+    @ApiOperation("获取维修项目")
+    @GetMapping("/fetchSitemByBillSid")
+    public List<AsBusrepairBillSitem> fetchSitemByBillSid(@RequestParam("sid") String sid) {
+        return asBusrepairBillSitemService.fetchByBillSid(sid);
+    }
+    @ApiOperation("获取维修项目维修人员")
+    @GetMapping("/fetchSitemRepairerByBillSid")
+    public List<AsBusrepairBillSitemRepairer> fetchSitemRepairerByBillSid(@RequestParam("sid") String sid,@RequestParam("itemSid") String itemSid) {
+        return asBusrepairBillSitemRepairerService.fetchByBillSid(sid,itemSid);
+    }
+    @ApiOperation("获取车辆信息")
+    @GetMapping("/fetchVehInfoByBillSid}")
+    public AsBusrepairBillVech fetchVehInfoByBillSid(@RequestParam("sid") String sid) {
+        return asBusrepairBillVechService.fetchByBillSid(sid);
+    }
+
     @ApiOperation("打印结算单")
     @PostMapping("/printSettlement")
     public ResultBean<String> printSettlement(@RequestBody SettlePdfQuery query) {

yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesreturn/SmsSalesReturnService.java

@@ -41,6 +41,8 @@ import com.yxt.sms.biz.smssalesbillsettle.SmsSalesBillSettleService;
 import com.yxt.sms.biz.smssalesreturn.flowable.*;
 import com.yxt.sms.biz.smssalesreturndetail.SmsSalesReturnDetail;
 import com.yxt.sms.biz.smssalesreturndetail.SmsSalesReturnDetailService;
+import com.yxt.sms.biz.smssalesreturnitem.SmsSalesReturnItem;
+import com.yxt.sms.biz.smssalesreturnitem.SmsSalesReturnItemService;
 import com.yxt.sms.biz.smssalesreturnsettle.SmsSalesReturnSettle;
 import com.yxt.sms.biz.smssalesreturnsettle.SmsSalesReturnSettleService;
 import com.yxt.sms.feign.as.asbusrepairbill.*;
@@ -52,6 +54,8 @@ import com.yxt.sms.feign.flowable.flowtask.FlowTaskVo;
 import com.yxt.sms.feign.flowable.flowtask.LatestTaskVo;
 import com.yxt.sms.feign.fms.fmspaysettle.FmsPaysettleDto;
 import com.yxt.sms.feign.fms.fmspaysettle.FmsPaysettleFeign;
+import com.yxt.sms.feign.fms.fmsreceivesettle.FmsReceivesettle;
+import com.yxt.sms.feign.fms.fmsreceivesettle.FmsReceivesettleFeign;
 import com.yxt.sms.feign.message.MessageFeign;
 import com.yxt.sms.feign.message.MessageFlowVo;
 import com.yxt.sms.feign.message.MessageFlowableQuery;
@@ -126,7 +130,10 @@ public class SmsSalesReturnService extends MybatisBaseService<SmsSalesReturnMapp
     private FlowFeign flowFeign;
     @Autowired
     private MessageFeign messageFeign;
-
+    @Autowired
+    private FmsReceivesettleFeign fmsReceivesettleFeign;
+    @Autowired
+    private SmsSalesReturnItemService smsSalesReturnItemService;
     private QueryWrapper<SmsSalesReturn> createQueryWrapper(SmsSalesReturnQuery query) {
         // todo: 这里根据具体业务调整查询条件
         // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
@@ -458,71 +465,80 @@ public class SmsSalesReturnService extends MybatisBaseService<SmsSalesReturnMapp
 
     public SmsSalesReturnNewDetailsVo returnGoodsBillInit(String sid, String type) {
         SmsSalesReturnNewDetailsVo vo = new SmsSalesReturnNewDetailsVo();
-         List<SmsSitemVo> sitemVos = new ArrayList<>();// 维修项目
+        vo.setType(type);
-        vo.setRemarks("222");
+        vo.setSourceBillSid(sid);
-        SmsSitemVo v = new SmsSitemVo();
+        if (type.equals("0")) {
-        v.setRemarks("saasg");
+            //维修工单
-        sitemVos.add(v);
+            AsBusrepairBill data = asBusrepairBillFeign.fetchBySid(sid);
-         List<SmsGoodsDetailsVo> goodsDetailsVos = new ArrayList<>(); //商品信息
+            if (null != data) {
-        SmsGoodsDetailsVo v2 = new SmsGoodsDetailsVo();
+                vo.setSourceBillNo(data.getBillNo());
-        v2.setRemarks("saasg");
+                vo.setBillType(data.getBillType());
-        goodsDetailsVos.add(v2);
+                vo.setBillDate(DateUtil.formatDate(data.getCreateTime()));
-         List<SalesGoodsReturnVo> returnGoods = new ArrayList<>(); //退货商品列表
+                if (StringUtils.isNotBlank(data.getSubject())) {
-        SalesGoodsReturnVo v3 = new SalesGoodsReturnVo();
+                    vo.setSubject(data.getSubject());
-        v3.setGoodsID("saasg");
+                }
-        returnGoods.add(v3);
+                if (StringUtils.isNotBlank(data.getWaitorName())) {
-         List<SalesItemsReturnVo> returnSitemVos = new ArrayList<>(); //退货维修项目列表
+                    vo.setWaitorName(data.getWaitorName());
-        SalesItemsReturnVo v4 = new SalesItemsReturnVo();
+                }
-        v.setRemarks("saasg");
+                if (StringUtils.isNotBlank(data.getCustomerName())) {
-        returnSitemVos.add(v4);
+                    vo.setCustomerName(data.getCustomerName());
-        vo.setReturnGoods(returnGoods);
+                }
-        vo.setReturnSitemVos(returnSitemVos);
+                if (StringUtils.isNotBlank(data.getMobile())) {
-        vo.setGoodsDetailsVos(goodsDetailsVos);
+                    vo.setMobile(data.getMobile());
-        vo.setSitemVos(sitemVos);
+                }
-//        vo.setType(type);
+                if (null != data.getHourAmount()) {
-//        vo.setSourceBillSid(sid);
+                    vo.setHourAmount(data.getHourAmount().toString());
-//        if (type.equals("0")) {
+                }
-//            //维修工单
+                if (null != data.getGoodsAmount()) {
-//            AsBusrepairBillDetailsVo data = asBusrepairBillFeign.fetchDetailsBySid(sid).getData();
+                    vo.setGoodsAmount(data.getGoodsAmount().toString());
-//            if (null != data) {
+                }
-//                vo.setSourceBillNo(data.getBillNo());
+                if (null != data.getAddAmount()) {
-//                vo.setBillType(data.getBillType());
+                    vo.setAddAmount(data.getAddAmount().toString());
-//                vo.setBillDate(data.getCreateDate());
+                }
-//                if (StringUtils.isNotBlank(data.getSubject())) {
+                AsBusrepairBillVech vech = asBusrepairBillFeign.fetchVehInfoByBillSid(sid);
-//                    vo.setSubject(data.getSubject());
+                if (null != vech) {
-//                }
+                    if (StringUtils.isNotBlank(vech.getVehMark())) {
-//                if (StringUtils.isNotBlank(data.getWaitorName())) {
+                        vo.setVehMark(vech.getVehMark());
-//                    vo.setWaitorName(data.getWaitorName());
+                    }
-//                }
+                    if (StringUtils.isNotBlank(vech.getVinNo())) {
-//                if (StringUtils.isNotBlank(data.getCustomerName())) {
+                        vo.setVinNo(vech.getVinNo());
-//                    vo.setCustomerName(data.getCustomerName());
+                    }
-//                }
+                }
-//                if (StringUtils.isNotBlank(data.getMobile())) {
+                FmsReceivesettle receivesettle = fmsReceivesettleFeign.fetchBySourceSid(sid).getData();
-//                    vo.setMobile(data.getMobile());
+                if (null != receivesettle) {
-//                }
+                    vo.setSettleDate(DateUtil.formatDate(receivesettle.getSettleTime()));
-//                if (StringUtils.isNotBlank(data.getCustomerOrg())) {
+                }
-//                    vo.setCustomerOrg(data.getCustomerOrg());
+                List<SmsSitemVo> sitemVos = new ArrayList<>();// 维修项目
-//                }
+                List<AsBusrepairBillSitem> sitems = asBusrepairBillFeign.fetchSitemByBillSid(sid);
-//                if (StringUtils.isNotBlank(data.getVehMark())) {
+                if (!sitems.isEmpty()) {
-//                    vo.setVehMark(data.getVehMark());
+                    for (AsBusrepairBillSitem sitem : sitems) {
-//                }
+                        SmsSalesReturnItem returnItem = smsSalesReturnItemService.selBySouceSidAndLinkSid(sid,sitem.getSid());
-//                if (StringUtils.isNotBlank(data.getVinNo())) {
+                        if (null == returnItem) {
-//                    vo.setVinNo(data.getVinNo());
+                            SmsSitemVo sitemVo = new SmsSitemVo();
-//                }
+                            BeanUtil.copyProperties(sitem, sitemVo);
-//                SettleVo settleVo = data.getSettleVo();
+                            sitemVo.setItemLinkSid(sitem.getSid());
-//                if (null != settleVo) {
+                            List<AsBusrepairBillSitemRepairer> repairers = asBusrepairBillFeign.fetchSitemRepairerByBillSid(sid, sitem.getServiceItemSid());
-//                    vo.setSettleDate(settleVo.getSettleTime());
+                            if (!repairers.isEmpty()) {
-//                }
+                                List<String> staffList = new ArrayList<>(); //维修人员信息
-//                List<SitemVo> sitemVos = data.getSitemVos();
+                                List<String> staffNameList = new ArrayList<>(); //维修人员信息
-//                List<SmsSitemVo> smsSitemVos = new ArrayList<>();
+                                for (AsBusrepairBillSitemRepairer repairer : repairers) {
-//                if (!sitemVos.isEmpty()) {
+                                    if (StringUtils.isNotBlank(repairer.getRepairerSid())) {
-//                    for (SitemVo smsSitemVo : sitemVos) {
+                                        staffList.add(repairer.getRepairerSid());
-//                        SmsSitemVo sitemVo = new SmsSitemVo();
+                                    }
-//                        BeanUtil.copyProperties(smsSitemVo, sitemVo);
+                                    if (StringUtils.isNotBlank(repairer.getRepairerName())) {
-//                        smsSitemVos.add(sitemVo);
+                                        staffNameList.add(repairer.getRepairerName());
-//                    }
+                                    }
-//                    vo.setSitemVos(smsSitemVos);
+                                }
-//                }
+                                sitemVo.setStaffList(staffList);
+                                sitemVo.setStaffNameList(staffNameList);
+                                sitemVo.setRepairerName(String.join("、", staffNameList));
+                            }
+                            sitemVos.add(sitemVo);
+                        }
+                    }
+                    vo.setSitemVos(sitemVos);
+                }
+
 //                List<GoodsDetailsVo> goodsDetailsVos = data.getGoodsDetailsVos();
 //                List<SmsGoodsDetailsVo> smsGoodsDetailsVos = new ArrayList<>();
 //                if (!goodsDetailsVos.isEmpty()) {
@@ -537,57 +553,55 @@ public class SmsSalesReturnService extends MybatisBaseService<SmsSalesReturnMapp
 //                    }
 //                    vo.setGoodsDetailsVos(smsGoodsDetailsVos);
 //                }
-//            }
+            }
-//        } else if (type.equals("1")) {
+        } else if (type.equals("1")) {
-//            //销售单
+            //销售单
-//            SmsSalesBillDetailsVo data = smsSalesBillService.fetchDetailsVoBySid(sid);
+            SmsSalesBillDetailsVo data = smsSalesBillService.fetchDetailsVoBySid(sid);
-//            if (null != data) {
+            if (null != data) {
-//                vo.setSourceBillNo(data.getBillNo());
+                vo.setSourceBillNo(data.getBillNo());
-//                vo.setBillType("销售单");
+                vo.setBillType("销售单");
-//                vo.setBillDate(data.getCreateTime());
+                vo.setBillDate(data.getCreateTime());
-//                if (StringUtils.isNotBlank(data.getSubject())) {
+                if (StringUtils.isNotBlank(data.getSubject())) {
-//                    vo.setSubject(data.getSubject());
+                    vo.setSubject(data.getSubject());
-//                }
+                }
-//                if (StringUtils.isNotBlank(data.getSalesName())) {
+                if (StringUtils.isNotBlank(data.getSalesName())) {
-//                    vo.setWaitorName(data.getSalesName());
+                    vo.setWaitorName(data.getSalesName());
-//                }
+                }
-//                if (StringUtils.isNotBlank(data.getCustomerName())) {
+                if (StringUtils.isNotBlank(data.getCustomerName())) {
-//                    vo.setCustomerName(data.getCustomerName());
+                    vo.setCustomerName(data.getCustomerName());
-//                }
+                }
-//                if (StringUtils.isNotBlank(data.getMobile())) {
+                if (StringUtils.isNotBlank(data.getMobile())) {
-//                    vo.setMobile(data.getMobile());
+                    vo.setMobile(data.getMobile());
-//                }
+                }
-//                if (StringUtils.isNotBlank(data.getCustomerOrg())) {
+
-//                    vo.setCustomerOrg(data.getCustomerOrg());
+                if (StringUtils.isNotBlank(data.getVehMark())) {
-//                }
+                    vo.setVehMark(data.getVehMark());
-//                if (StringUtils.isNotBlank(data.getVehMark())) {
+                }
-//                    vo.setVehMark(data.getVehMark());
+                if (StringUtils.isNotBlank(data.getVinNo())) {
-//                }
+                    vo.setVinNo(data.getVinNo());
-//                if (StringUtils.isNotBlank(data.getVinNo())) {
+                }
-//                    vo.setVinNo(data.getVinNo());
+                SettlementVo settleVo = data.getSettlementVo();
-//                }
+                if (null != settleVo) {
-//                SettlementVo settleVo = data.getSettlementVo();
+                    vo.setSettleDate(settleVo.getSettleTime());
-//                if (null != settleVo) {
+                }
-//                    vo.setSettleDate(settleVo.getSettleTime());
+                List<SalesGoodsVo> goodsDetailsVos = data.getGoodsVos();
-//                }
+                List<SmsGoodsDetailsVo> smsGoodsDetailsVos = new ArrayList<>();
-//                List<SalesGoodsVo> goodsDetailsVos = data.getGoodsVos();
+                if (!goodsDetailsVos.isEmpty()) {
-//                List<SmsGoodsDetailsVo> smsGoodsDetailsVos = new ArrayList<>();
+                    for (SalesGoodsVo goodsDetailsVo : goodsDetailsVos) {
-//                if (!goodsDetailsVos.isEmpty()) {
+                        SmsGoodsDetailsVo smsGoodsDetailsVo = new SmsGoodsDetailsVo();
-//                    for (SalesGoodsVo goodsDetailsVo : goodsDetailsVos) {
+                        BeanUtil.copyProperties(goodsDetailsVo, smsGoodsDetailsVo);
-//                        SmsGoodsDetailsVo smsGoodsDetailsVo = new SmsGoodsDetailsVo();
+                        //查询已退数量
-//                        BeanUtil.copyProperties(goodsDetailsVo, smsGoodsDetailsVo);
+                        String goodsID = goodsDetailsVo.getGoodsID();
-//                        //查询已退数量
+                        String sumBackCount = baseMapper.selBackCountByGoodsID(goodsID, sid);
-//                        String goodsID = goodsDetailsVo.getGoodsID();
+                        smsGoodsDetailsVo.setReturnedCount(sumBackCount);
-//                        String sumBackCount = baseMapper.selBackCountByGoodsID(goodsID, sid);
+                        smsGoodsDetailsVos.add(smsGoodsDetailsVo);
-//                        smsGoodsDetailsVo.setReturnedCount(sumBackCount);
+                        smsGoodsDetailsVos.add(smsGoodsDetailsVo);
-//                        smsGoodsDetailsVos.add(smsGoodsDetailsVo);
+                    }
-//                        smsGoodsDetailsVos.add(smsGoodsDetailsVo);
+                    vo.setGoodsDetailsVos(smsGoodsDetailsVos);
-//                    }
+                }
-//                    vo.setGoodsDetailsVos(smsGoodsDetailsVos);
+            }
-//                }
+
-//            }
+        }
-//
-//        }
         return vo;
     }
 

yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesreturnitem/SmsSalesReturnItemMapper.java

@@ -61,4 +61,7 @@ public interface SmsSalesReturnItemMapper extends BaseMapper<SmsSalesReturnItem>
 
 	@Delete("delete from sms_sales_return_item where billSid = #{billSid}")
     void deleteByMainSid(String billSid);
+
+    SmsSalesReturnItem selBySouceSidAndLinkSid(@Param("sid") String sid, @Param("linkSid") String linkSid);
+
 }

yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesreturnitem/SmsSalesReturnItemMapper.xml

@@ -3,4 +3,13 @@
 <mapper namespace="com.yxt.sms.biz.smssalesreturnitem.SmsSalesReturnItemMapper">
 <!--    <where> ${ew.sqlSegment} </where>-->
 <!--    ${ew.customSqlSegment} -->
+    <select id="selBySouceSidAndLinkSid" resultType="com.yxt.sms.biz.smssalesreturnitem.SmsSalesReturnItem">
+        SELECT
+            i.*
+        FROM
+            sms_sales_return_item AS i
+                LEFT JOIN sms_sales_return AS r ON i.billSid = r.sid
+        WHERE r.sourceBillSid = #{sid} AND i.itemLinkSid = #{linkSid}
+          AND r.nodeState = '已办结'
+    </select>
 </mapper>

yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesreturnitem/SmsSalesReturnItemService.java

@@ -104,4 +104,8 @@ public class SmsSalesReturnItemService extends MybatisBaseService<SmsSalesReturn
 		BeanUtil.copyProperties(entity, vo);
 		return vo;
 	}
+
+	public SmsSalesReturnItem selBySouceSidAndLinkSid(String sid, String linkSid) {
+		return baseMapper.selBySouceSidAndLinkSid(sid,linkSid);
+	}
 }

yxt-sms-biz/src/main/java/com/yxt/sms/feign/as/asbusrepairbill/AsBusrepairBill.java

@@ -0,0 +1,153 @@
+package com.yxt.sms.feign.as.asbusrepairbill;
+
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @description: 维修工单
+ * @author: dimengzhe
+ * @date: 2024/3/7
+ **/
+@Data
+public class AsBusrepairBill extends BaseEntity {
+    private static final long serialVersionUID = -3448985502134489814L;
+    @ApiModelProperty("制单人姓名")
+    private String createByName;
+    @ApiModelProperty("单据编号")
+    private String billNo;
+    @ApiModelProperty("单据类型0正常工单、1保险理赔、2协议单位")
+    private Integer billTypeKey;
+    @ApiModelProperty("单据类型0正常工单、1保险理赔、2协议单位")
+    private String billType;
+    @ApiModelProperty("进厂时间")
+    private Date entryTime;
+    @ApiModelProperty("预计完工时间-工单")
+    private Date estimatedFinishTime;
+    @ApiModelProperty("科目sid")
+    private String subjectSid;
+    @ApiModelProperty("科目")
+    private String subject;
+    @ApiModelProperty("服务顾问sid")
+    private String waitorSid;
+    @ApiModelProperty("服务顾问姓名")
+    private String waitorName;
+    @ApiModelProperty("主修人（可多选）销售单")
+    private String mainRepairers;
+    @ApiModelProperty("条形码-销售单")
+    private String barCode;
+    @ApiModelProperty("快捷备注-销售单")
+    private String shotRemarks;
+    @ApiModelProperty("备注")
+    private String printRemarks;
+    @ApiModelProperty("整体优惠金额")
+    private BigDecimal discountAmount;
+    @ApiModelProperty("整体优惠券")
+    private BigDecimal coupon;
+    @ApiModelProperty("积分抵扣")
+    private BigDecimal scoreDeduct;
+    @ApiModelProperty("当前环节编码(登记1、派工2、维修3、竣工4、结算5、出厂6")
+    private Integer nodeCode;
+    @ApiModelProperty("当前环节")
+    private String nodeName;
+    @ApiModelProperty("进入当前环节时间")
+    private Date nodeTime;
+    @ApiModelProperty("出厂状态 (0未出厂，1已出厂)")
+    private String outDoorState;
+    @ApiModelProperty("出厂时间")
+    private Date outDoorTime;
+    @ApiModelProperty("使用组织sid")
+    private String useOrgSid;
+    @ApiModelProperty("创建组织sid")
+    private String createOrgSid;
+    @ApiModelProperty("客户sid")
+    private String customerSid;
+    @ApiModelProperty("客户名称")
+    private String customerName;
+    @ApiModelProperty("联系电话")
+    private String mobile;
+    @ApiModelProperty("客户单位")
+    private String customerOrg;
+    @ApiModelProperty("会员卡sid")
+    private String memberCardSid;
+    @ApiModelProperty("会员卡号")
+    private String memberCarNumber;
+    @ApiModelProperty("旧件是否收回登记（0未收回，1已收回）")
+    private Integer oldIsReclaim;
+    @ApiModelProperty("使用组织名称")
+    private String useOrgName;
+    @ApiModelProperty("创建组织名称")
+    private String createOrgName;
+    @ApiModelProperty("组织全路径")
+    private String orgSidPath;
+    @ApiModelProperty("制单部门sid")
+    private String deptSid; // 制单部门sid
+    @ApiModelProperty("制单部门")
+    private String deptName; // 制单部门
+    @ApiModelProperty("班组sid")
+    private String groupSid;
+    @ApiModelProperty("班组名称")
+    private String groupName;
+    @ApiModelProperty("应收金额")
+    private BigDecimal receivableAmount;
+    @ApiModelProperty("实收金额")
+    private BigDecimal actualAmount;
+    @ApiModelProperty("工时费")
+    private BigDecimal hourAmount;
+    @ApiModelProperty("材料费")
+    private BigDecimal goodsAmount;
+    @ApiModelProperty("外出费")
+    private BigDecimal outAmount;
+    @ApiModelProperty("厂家补助")
+    private BigDecimal subsidyAmount;
+    @ApiModelProperty("其他费用")
+    private BigDecimal otherAmount;
+    @ApiModelProperty("附加费")
+    private BigDecimal addAmount;
+    @ApiModelProperty("税额")
+    private BigDecimal taxAmount;
+    @ApiModelProperty("是否外出（1是，2否）")
+    private String isGoOut;
+    @ApiModelProperty("索赔厂家")
+    private String claimManufacturer;
+    @ApiModelProperty("索赔厂家sid")
+    private String claimManufacturerSid;
+    @ApiModelProperty("特殊标志（1有，0无）")
+    private Integer isSpecialSign;
+    @ApiModelProperty("施救费")
+    private BigDecimal rescueAmount;
+    @ApiModelProperty("外出费开票金额")
+    private BigDecimal outKPAmount;
+    @ApiModelProperty("厂家补助开票金额")
+    private BigDecimal subsidyKPAmount;
+    @ApiModelProperty("施救费开票金额")
+    private BigDecimal rescueKPAmount;
+    @ApiModelProperty("厂家补助备注")
+    private String subsidyRemarks;
+    @ApiModelProperty("施救费备注")
+    private String  rescueRemarks;
+    @ApiModelProperty("外出费备注")
+    private String outRemarks;
+    @ApiModelProperty("商品登记备注")
+    private String registerRemarks;
+    @ApiModelProperty("维修状态（0未维修，1维修中，2维修完成）")
+    private Integer  repairState;
+    @ApiModelProperty("维修工作状态（0未完成，1已完成）")
+    private Integer completeState;
+    @ApiModelProperty("是否可出厂")
+    private Integer isOutFactory;
+    @ApiModelProperty("出库确认备注")
+    private String outboundRemarks;
+    @ApiModelProperty("对接人sid")
+    private String  dockingPeopleSid;
+    @ApiModelProperty("对接人")
+    private String dockingPeople;
+    @ApiModelProperty("对接人电话")
+    private String dockingPhone;
+    @ApiModelProperty("是否确认材料费（1是，0否）")
+    private Integer materialConfirm;
+
+}

yxt-sms-biz/src/main/java/com/yxt/sms/feign/as/asbusrepairbill/AsBusrepairBillFeign.java

@@ -24,4 +24,20 @@ public interface AsBusrepairBillFeign {
     @ApiOperation("详情回显")
     @GetMapping("/fetchDetailsBySid/{sid}")
     public ResultBean<AsBusrepairBillDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+
+    @ApiOperation("获取维修单")
+    @GetMapping("/fetchBySid")
+    public AsBusrepairBill fetchBySid(@RequestParam("sid") String sid);
+
+    @ApiOperation("获取车辆信息")
+    @GetMapping("/fetchVehInfoByBillSid}")
+    public AsBusrepairBillVech fetchVehInfoByBillSid(@RequestParam("sid") String sid);
+
+    @ApiOperation("获取维修项目")
+    @GetMapping("/fetchSitemByBillSid")
+    public List<AsBusrepairBillSitem> fetchSitemByBillSid(@RequestParam("sid") String sid);
+
+    @ApiOperation("获取维修项目维修人员")
+    @GetMapping("/fetchSitemRepairerByBillSid")
+    public List<AsBusrepairBillSitemRepairer> fetchSitemRepairerByBillSid(@RequestParam("sid") String sid,@RequestParam("itemSid") String itemSid);
 }

yxt-sms-biz/src/main/java/com/yxt/sms/feign/as/asbusrepairbill/AsBusrepairBillSitem.java

@@ -0,0 +1,53 @@
+package com.yxt.sms.feign.as.asbusrepairbill;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/4/17 15:08
+ */
+@Data
+@ApiModel(value = "维修工单-服务项目", description = "维修工单-服务项目")
+@TableName("as_busrepair_bill_sitem")
+public class AsBusrepairBillSitem extends BaseEntity {
+
+    @ApiModelProperty("工单sid")
+    private String billSid;
+    @ApiModelProperty("项目sid")
+    private String serviceItemSid;
+    @ApiModelProperty("项目名称")
+    private String serviceItem;
+    @ApiModelProperty("工种sid（分类）")
+    private String serviceTypeSid;
+    @ApiModelProperty("工种（分类）")
+    private String serviceType;
+    @ApiModelProperty("科目sid")
+    private String subjectSid;
+    @ApiModelProperty("科目（自费、保内等）")
+    private String subject;
+    @ApiModelProperty("考核工时(考核价）")
+    private BigDecimal examineHourPrice;
+    @ApiModelProperty("工时单价")
+    private BigDecimal hourPrice;
+    @ApiModelProperty("工时数")
+    private BigDecimal hours;
+    @ApiModelProperty("销售价(工时费)=工时单价*工时数")
+    private BigDecimal price;
+    @ApiModelProperty("折扣（0-10，0免费，10不打折）")
+    private Integer discount;
+    @ApiModelProperty("优惠金额（=销售价*(折扣*0.1））")
+    private BigDecimal discountAmount;
+    @ApiModelProperty("金额（销售价-优惠金额）")
+    private BigDecimal amount;
+    @ApiModelProperty("销售价格常量")
+    private BigDecimal sitemPrice;
+
+
+}

yxt-sms-biz/src/main/java/com/yxt/sms/feign/as/asbusrepairbill/AsBusrepairBillSitemRepairer.java

@@ -0,0 +1,34 @@
+package com.yxt.sms.feign.as.asbusrepairbill;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/4/17 15:08
+ */
+@Data
+@ApiModel(value = "维修工单-服务项目-维修人员", description = "维修工单-服务项目-维修人员")
+@TableName("as_busrepair_bill_sitem_repairer")
+public class AsBusrepairBillSitemRepairer extends BaseEntity {
+
+    @ApiModelProperty("工单sid")
+    private String billSid;
+    @ApiModelProperty("单据项目sid（服务项目、商品）")
+    private String repairitemSid;
+    @ApiModelProperty("维修人员sid")
+    private String repairerSid;
+    @ApiModelProperty("维修人员姓名")
+    private String repairerName;
+    @ApiModelProperty("所在组sid")
+    private String groupSid;
+    @ApiModelProperty("所在班组名称")
+    private String groupName;
+
+
+
+}

yxt-sms-biz/src/main/java/com/yxt/sms/feign/as/asbusrepairbill/AsBusrepairBillVech.java

@@ -0,0 +1,36 @@
+package com.yxt.sms.feign.as.asbusrepairbill;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/4/16 16:59
+ */
+@Data
+@ApiModel(value = "维修工单-车辆", description = "维修工单-车辆")
+@TableName("as_busrepair_bill_vech")
+public class AsBusrepairBillVech extends BaseEntity {
+
+
+    @ApiModelProperty("工单sid")
+    private String billSid;
+    @ApiModelProperty("客户sid")
+    private String customerSid;
+    @ApiModelProperty("车牌号")
+    private String vehMark;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("车型")
+    private String vehModel;
+    @ApiModelProperty("行驶里程")
+    private Integer mileage;
+    @ApiModelProperty("油量(空、小于1/4、1/4、1/2、3/4、满)")
+    private String oil;
+    @ApiModelProperty("当前里程（本次里程）")
+    private Integer currentMileage;
+}