diff --git a/anrui-riskcenter-ui/src/api/financialdetails/financialdetails.js b/anrui-riskcenter-ui/src/api/financialdetails/financialdetails.js new file mode 100644 index 0000000000..e91b2782b2 --- /dev/null +++ b/anrui-riskcenter-ui/src/api/financialdetails/financialdetails.js @@ -0,0 +1,13 @@ +import request from '@/utils/request' + +export default { + // 查询分页列表 + listPage: function(data) { + return request({ + url: '/riskcenter/v1/LoanFundDay/listPage', + method: 'post', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + } +} diff --git a/anrui-riskcenter-ui/src/router/index.js b/anrui-riskcenter-ui/src/router/index.js index 1bb17a7c63..40d6e72d61 100644 --- a/anrui-riskcenter-ui/src/router/index.js +++ b/anrui-riskcenter-ui/src/router/index.js @@ -855,6 +855,22 @@ export const constantRoutes = [ } ] }, + { + path: '/financialdetails', + component: Layout, + redirect: '/financialdetails', + meta: { + title: '资金占用费明细查询' + }, + children: [ + { + path: '/financialdetails/financialdetails', + component: () => import('@/views/financialdetails/financialdetails.vue'), + name: 'FinancialDetails', + meta: { title: '资金占用费明细查询', noCache: true } + } + ] + }, // 流程审批 // 金融产品政策报备--编辑 diff --git a/anrui-riskcenter-ui/src/views/financialdetails/financialdetails.vue b/anrui-riskcenter-ui/src/views/financialdetails/financialdetails.vue new file mode 100644 index 0000000000..ab2ed342a2 --- /dev/null +++ b/anrui-riskcenter-ui/src/views/financialdetails/financialdetails.vue @@ -0,0 +1,212 @@ + + + + diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AitemVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AitemVo.java new file mode 100644 index 0000000000..e6e24c9f96 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AitemVo.java @@ -0,0 +1,23 @@ +package com.yxt.anrui.as.api.asbusrepairbill; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @author Fan + * @description + * @date 2024/4/18 9:07 + */ +@Data +public class AitemVo { + + @ApiModelProperty("附加项目sid") + private String aitemsid; + @ApiModelProperty("附加项目名称") + private String aitemName; + @ApiModelProperty("销售价") + private String price; + +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBill.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBill.java index ea3f6af279..0e65adabcb 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBill.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBill.java @@ -47,7 +47,7 @@ public class AsBusrepairBill extends BaseEntity { private BigDecimal coupon; @ApiModelProperty("积分抵扣") private BigDecimal scoreDeduct; - @ApiModelProperty("当前环节编码(登记1、派工2、竣工3、结算4)") + @ApiModelProperty("当前环节编码(登记1、派工2、维修3、竣工4、结算5、出厂6") private Integer nodeCode; @ApiModelProperty("当前环节") private String nodeName; diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillDetailsVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillDetailsVo.java new file mode 100644 index 0000000000..b5a7529542 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillDetailsVo.java @@ -0,0 +1,99 @@ +package com.yxt.anrui.as.api.asbusrepairbill; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * @author Fan + * @description + * @date 2024/4/18 9:09 + */ +@Data +public class AsBusrepairBillDetailsVo implements Vo { + private String sid; + @ApiModelProperty("制单人姓名") + private String createByName; + @ApiModelProperty("操作人") + private String operator; + @ApiModelProperty("单据编号") + private String billNo; + @ApiModelProperty("单据类型0正常工单、1保险理赔、2协议单位") + private String billType; + @ApiModelProperty("进厂时间") + private String entryTime; + @ApiModelProperty("预计完工时间-工单") + private String 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 String discountAmount; + @ApiModelProperty("整体优惠券") + private String coupon; + @ApiModelProperty("积分抵扣") + private String scoreDeduct; + @ApiModelProperty("当前环节编码(登记1、派工2、竣工3、结算4)") + private String nodeCode; + @ApiModelProperty("当前环节") + private String nodeName; + @ApiModelProperty("进入当前环节时间") + private String nodeTime; + @ApiModelProperty("出厂状态 (0未出厂，1已出厂)") + private String outDoorState; + @ApiModelProperty("出厂时间") + private String 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("车牌号") + private String vehMark; + @ApiModelProperty("车架号") + private String vinNo; + @ApiModelProperty("车型") + private String vehModel; + @ApiModelProperty("行驶里程") + private String mileage; + @ApiModelProperty("油量(空、小于1/4、1/4、1/2、3/4、满)") + private String oil; + @ApiModelProperty("当前里程（本次里程）") + private String currentMileage; + private InvoiceVo invoiceVo = new InvoiceVo(); //发票信息 + private InsuranceVo insuranceVo = new InsuranceVo();//保险信息 + private OtherVo otherVo = new OtherVo();//送修人信息 + private List sitemVos = new ArrayList<>();// 服务项目 + private List aitemVos = new ArrayList<>();// 附加项目 + private List goodsDetailsVos = new ArrayList<>(); //商品信息 +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillDto.java new file mode 100644 index 0000000000..b8df256388 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillDto.java @@ -0,0 +1,91 @@ +package com.yxt.anrui.as.api.asbusrepairbill; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * @author Fan + * @description + * @date 2024/4/18 8:48 + */ +@Data +public class AsBusrepairBillDto implements Dto { + private String sid; + private String orgPath; + @ApiModelProperty("操作人") + private String operator; + @ApiModelProperty("制单人姓名") + private String createByName; + @ApiModelProperty("单据编号") + private String billNo; + @ApiModelProperty("使用组织sid") + private String useOrgSid; + @ApiModelProperty("创建组织sid") + private String createOrgSid; + @ApiModelProperty("单据类型0正常工单、1保险理赔、2协议单位") + private String billType; + @ApiModelProperty("进厂时间") + private String entryTime; + @ApiModelProperty("预计完工时间-工单") + private String 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 String discountAmount; + @ApiModelProperty("整体优惠券") + private String coupon; + @ApiModelProperty("积分抵扣") + private String scoreDeduct; + @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("车牌号") + private String vehMark; + @ApiModelProperty("车架号") + private String vinNo; + @ApiModelProperty("车型") + private String vehModel; + @ApiModelProperty("行驶里程") + private String mileage; + @ApiModelProperty("油量(空、小于1/4、1/4、1/2、3/4、满)") + private String oil; + @ApiModelProperty("当前里程（本次里程）") + private String currentMileage; + private InvoiceVo invoiceVo = new InvoiceVo(); //发票信息 + private InsuranceVo insuranceVo = new InsuranceVo();//保险信息 + private OtherVo otherVo = new OtherVo();//送修人信息 + private List sitemVos = new ArrayList<>();// 服务项目 + private List aitemVos = new ArrayList<>();// 附加项目 + + +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillQuery.java new file mode 100644 index 0000000000..e88305e93b --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillQuery.java @@ -0,0 +1,29 @@ +package com.yxt.anrui.as.api.asbusrepairbill; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/4/18 13:33 + */ +@Data +public class AsBusrepairBillQuery implements Query { + + private String nodeCode; + private String orgPath; + @ApiModelProperty("单据编号") + private String billNo; + @ApiModelProperty("单据类型0正常工单、1保险理赔、2协议单位") + private String billType; + @ApiModelProperty("客户名称") + private String customerName; + @ApiModelProperty("车牌号") + private String vehMark; + @ApiModelProperty("车架号") + private String vinNo; + private String startTime; + private String endTime; +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillVo.java new file mode 100644 index 0000000000..7d79f76abc --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillVo.java @@ -0,0 +1,40 @@ +package com.yxt.anrui.as.api.asbusrepairbill; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * @author Fan + * @description + * @date 2024/4/18 13:33 + */ +@Data +public class AsBusrepairBillVo implements Vo { + + private String createTime; + @ApiModelProperty("单据编号") + private String billNo; + @ApiModelProperty("单据类型0正常工单、1保险理赔、2协议单位") + private String billType; + @ApiModelProperty("进厂时间") + private String entryTime; + @ApiModelProperty("预计完工时间-工单") + private String estimatedFinishTime; + @ApiModelProperty("科目") + private String subject; + @ApiModelProperty("当前环节") + private String nodeName; + @ApiModelProperty("进入当前环节时间") + private String nodeTime; + @ApiModelProperty("客户名称") + private String customerName; + @ApiModelProperty("车牌号") + private String vehMark; + @ApiModelProperty("车架号") + private String vinNo; + +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/GoodsDetailsVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/GoodsDetailsVo.java new file mode 100644 index 0000000000..203bc28b6c --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/GoodsDetailsVo.java @@ -0,0 +1,53 @@ +package com.yxt.anrui.as.api.asbusrepairbill; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @author Fan + * @description + * @date 2024/4/18 9:12 + */ +@Data +public class GoodsDetailsVo implements Vo { + //商品名称 + private String goodsSpuName; + //商品Sku名称 + private String goodsSkuTitle; + //商品编码（图号） + private String goodsSkuCode; + //规格型号 + private String goodsSkuOwnSpec; + @ApiModelProperty("出库前的库存量") + private String currentCount; + @ApiModelProperty("计量单位") + private String unit; + @ApiModelProperty("仓库sid") + private String warehouseSid; + @ApiModelProperty("仓库名称") + private String warehouseName; + //库位编号 + private String warehouseRackCode; + + @ApiModelProperty("需求数量（维修工单中）") + private String needCount; + @ApiModelProperty("出/退库数量") + private String count; + @ApiModelProperty("销售价（元）") + private String price; + //折扣（0-10，0免费，10不打折） + private String discount; + //优惠金额（=销售价*(1-折扣*0.1）） + private String discountAmount; + //金额（销售价-优惠金额） + private String amount; + @ApiModelProperty("科目") + private String subject; + @ApiModelProperty("领料人姓名") + private String operName; + + +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/InsuranceVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/InsuranceVo.java new file mode 100644 index 0000000000..a020ef6993 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/InsuranceVo.java @@ -0,0 +1,34 @@ +package com.yxt.anrui.as.api.asbusrepairbill; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/4/18 8:59 + */ +@Data +public class InsuranceVo { + + @ApiModelProperty("责任划分") + private String responsibility; + @ApiModelProperty("对方险种") + private String otherInsuranceType; + @ApiModelProperty("保险公司1") + private String insuranceCompany1; + @ApiModelProperty("保险公司2") + private String insuranceCompany2; + @ApiModelProperty("保险人员") + private String insurer; + @ApiModelProperty("保险索赔单号") + private String claimBillNo; + @ApiModelProperty("勘察员") + private String investigator; + @ApiModelProperty("定损员") + private String lossAdjuster; + @ApiModelProperty("特殊标志（1有，0无）") + private String isSpecialSign; + @ApiModelProperty("出险类型") + private String accidentType; +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/InvoiceVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/InvoiceVo.java new file mode 100644 index 0000000000..a1e7100781 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/InvoiceVo.java @@ -0,0 +1,29 @@ +package com.yxt.anrui.as.api.asbusrepairbill; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @author Fan + * @description + * @date 2024/4/18 8:57 + */ +@Data +public class InvoiceVo { + + @ApiModelProperty("是否需要开发票（是1，否0）") + private String isInvoicing; + @ApiModelProperty("发票类型") + private String invoiceType; + @ApiModelProperty("开票名称") + private String invoiceTitle; + @ApiModelProperty("税号") + private String taxpayerNo; + @ApiModelProperty("发票号码") + private String invoiceCode; + @ApiModelProperty("税率") + private String taxRate; + +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/OtherVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/OtherVo.java new file mode 100644 index 0000000000..5bc16796d7 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/OtherVo.java @@ -0,0 +1,20 @@ +package com.yxt.anrui.as.api.asbusrepairbill; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/4/18 9:01 + */ +@Data +public class OtherVo { + + @ApiModelProperty("厂家") + private String manufacturer; + @ApiModelProperty("送修人姓名") + private String senderName; + @ApiModelProperty("送修人电话") + private String senderMobile; +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/SitemVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/SitemVo.java new file mode 100644 index 0000000000..916d65a151 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/SitemVo.java @@ -0,0 +1,52 @@ +package com.yxt.anrui.as.api.asbusrepairbill; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @author Fan + * @description + * @date 2024/4/18 9:02 + */ +@Data +public class SitemVo { + @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 String examineHourPrice; + @ApiModelProperty("工时单价") + private String hourPrice; + @ApiModelProperty("工时数") + private String hours; + @ApiModelProperty("销售价(工时费)=工时单价*工时数") + private String price; + @ApiModelProperty("折扣（0-10，0免费，10不打折）") + private String discount; + @ApiModelProperty("优惠金额（=销售价*(折扣*0.1））") + private String discountAmount; + @ApiModelProperty("金额（销售价-优惠金额）") + private String amount; + //-------------维修人员--------------- + @ApiModelProperty("维修人员sid") + private String repairerSid; + @ApiModelProperty("维修人员姓名") + private String repairerName; + @ApiModelProperty("所在组sid") + private String groupSid; + @ApiModelProperty("所在班组名称") + private String groupName; + + +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillother/AsBusrepairBillOther.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillother/AsBusrepairBillOther.java index 24630f3170..73379f9adf 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillother/AsBusrepairBillOther.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillother/AsBusrepairBillOther.java @@ -16,7 +16,7 @@ import java.math.BigDecimal; @Data @ApiModel(value = "维修工单-其他", description = "维修工单-其他") -@TableName("as_busrepair_bill_invoice") +@TableName("as_busrepair_bill_other") public class AsBusrepairBillOther extends BaseEntity { @ApiModelProperty("工单sid") private String billSid; diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/enums/AsBillTypeEnum.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/enums/AsBillTypeEnum.java new file mode 100644 index 0000000000..bd195db98f --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/enums/AsBillTypeEnum.java @@ -0,0 +1,29 @@ +package com.yxt.anrui.as.api.enums; + +/** + * @Author dimengzhe + * @Date 2022/7/1 9:35 + * @Description 单据类型首字母枚举类 + */ +public enum AsBillTypeEnum { + + WXGD("WXD", "维修工单"); + + + + private String billType; + private String billTypeName; + + public String getBillType() { + return billType; + } + + public String getBillTypeName() { + return billTypeName; + } + + AsBillTypeEnum(String billType, String billTypeName) { + this.billType = billType; + this.billTypeName = billTypeName; + } +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/utils/AsRule.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/utils/AsRule.java new file mode 100644 index 0000000000..79f19fc80d --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/utils/AsRule.java @@ -0,0 +1,45 @@ +package com.yxt.anrui.as.api.utils; + +import cn.hutool.core.date.DateUtil; +import com.yxt.anrui.as.api.utils.domain.AsBillNo; +import org.springframework.util.StringUtils; + +/** + * @Author dimengzhe + * @Date 2022/7/1 9:44 + * @Description 规则 + */ +public class AsRule { + + /** + * 单据编号规则：单据名称大写首字母+分公司编码+年份+月份+4位顺序号 + * 单据名称大写首字母+分公司编码+年份+月份 + * 注意：品牌编码暂不用 + * + * @return + */ + public static String getBill(AsBillNo b) { + String billType = b.getBillType(); + String orgCode = b.getOrgCode(); + String date = DateUtil.format(DateUtil.date(), "yyyyMM"); + String bill = billType; + if (!StringUtils.isEmpty(orgCode)) { + bill = bill + orgCode; + } + bill = bill + date; + return bill; + } + + /** + * 生成单据编号规则 + * + * @param bill 单据名称大写首字母+分公司编码+年份+月份 + * @param i 根据单据编号包含单据名称大写首字母+分公司编码+年份+月份查询出来的单据的个数 + * @return + */ + public static String getBillNo(String bill, int i) { + String num = String.format("%04d", i + 1); // 不足4位补0 + String billNo = bill + num; + return billNo; + } +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/utils/domain/AsBillNo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/utils/domain/AsBillNo.java new file mode 100644 index 0000000000..c689c0a44e --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/utils/domain/AsBillNo.java @@ -0,0 +1,22 @@ +package com.yxt.anrui.as.api.utils.domain; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * @author Fan + * @description + * @date 2024/4/18 9:23 + */ +@Data +public class AsBillNo implements Serializable { + private static final long serialVersionUID = 1598887042562656350L; + @ApiModelProperty(value = "单据名称首字母") + private String billType; + @ApiModelProperty(value = "分公司编码") + private String orgCode; + + +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.java index 9de498cafb..f1ca287a93 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBill; import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBillListVo; +import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBillVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Update; @@ -23,4 +24,10 @@ public interface AsBusrepairBillMapper extends BaseMapper { @Update("update as_busrepair_bill set outDoorState = '1' where sid = #{sid}") void updateOutDoorState(String sid); + + int selectNum(String bill); + + int selectBySid(String join); + + IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml index 42e727e555..ceb435e6b2 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml @@ -9,6 +9,35 @@ + + + \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java index bca6cf2ab8..7f0c350f94 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java @@ -1,8 +1,6 @@ package com.yxt.anrui.as.biz.asbusrepairbill; -import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBill; -import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBillListQuery; -import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBillListVo; +import com.yxt.anrui.as.api.asbusrepairbill.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -22,6 +20,39 @@ public class AsBusrepairBillRest { @Autowired private AsBusrepairBillService asBusrepairBillService; + @PostMapping("/listPage") + @ApiOperation("工单查询列表") + ResultBean> listPage(@RequestBody PagerQuery pagerQuery){ + ResultBean> rb = ResultBean.fireFail(); + PagerVo pv = asBusrepairBillService.listPage(pagerQuery); + return rb.success().setData(pv); + } + + @PostMapping("/saveBill") + @ApiOperation("保存修改") + ResultBean saveBill(@RequestBody AsBusrepairBillDto dto){ + return asBusrepairBillService.saveBill(dto); + } + + @PostMapping("/submitNextNode") + @ApiOperation("提交至下一环节") + ResultBean submitNextNode(@RequestBody AsBusrepairBillDto dto){ + return asBusrepairBillService.submitNextNode(dto); + } + + + @ApiOperation("根据sid批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids) { + return asBusrepairBillService.deleteBySids(sids); + } + + @ApiOperation("详情回显") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid) { + return asBusrepairBillService.fetchDetailsBySid(sid); + } + @PostMapping("getList") @ApiOperation("维修领料获取派工维修单") ResultBean> getList(@RequestBody PagerQuery pagerQuery){ diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java index cca954c370..df46fb2920 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java @@ -1,12 +1,36 @@ package com.yxt.anrui.as.biz.asbusrepairbill; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBill; -import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBillListQuery; -import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBillListVo; +import com.yxt.anrui.as.api.asbusrepairbill.*; +import com.yxt.anrui.as.api.asbusrepairbillaitem.AsBusrepairBillAitem; +import com.yxt.anrui.as.api.asbusrepairbillinsurance.AsBusrepairBillInsurance; +import com.yxt.anrui.as.api.asbusrepairbillinvoice.AsBusrepairBillInvoice; +import com.yxt.anrui.as.api.asbusrepairbillnode.AsBusrepairBillNode; import com.yxt.anrui.as.api.asbusrepairbillnode.AsBusrepairBillNodeDto; +import com.yxt.anrui.as.api.asbusrepairbillother.AsBusrepairBillOther; +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.api.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetail; +import com.yxt.anrui.as.api.enums.AsBillTypeEnum; +import com.yxt.anrui.as.api.utils.AsRule; +import com.yxt.anrui.as.api.utils.domain.AsBillNo; +import com.yxt.anrui.as.biz.asbusrepairbillaitem.AsBusrepairBillAitemService; +import com.yxt.anrui.as.biz.asbusrepairbillinsurance.AsBusrepairBillInsuranceService; +import com.yxt.anrui.as.biz.asbusrepairbillinvoice.AsBusrepairBillInvoiceService; import com.yxt.anrui.as.biz.asbusrepairbillnode.AsBusrepairBillNodeService; +import com.yxt.anrui.as.biz.asbusrepairbillother.AsBusrepairBillOtherService; +import com.yxt.anrui.as.biz.asbusrepairbillsitem.AsBusrepairBillSitemService; +import com.yxt.anrui.as.biz.asbusrepairbillsitemrepairer.AsBusrepairBillSitemRepairerService; +import com.yxt.anrui.as.biz.asbusrepairbillvech.AsBusrepairBillVechService; +import com.yxt.anrui.as.biz.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetailService; +import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationFeign; +import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationVo; +import com.yxt.anrui.as.feign.portal.sysstafforg.SysStaffOrgFeign; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; @@ -15,8 +39,14 @@ import com.yxt.common.core.vo.PagerVo; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import javax.annotation.Resource; +import java.math.BigDecimal; +import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.Collections; +import java.util.List; /** * @description: @@ -28,6 +58,26 @@ public class AsBusrepairBillService extends MybatisBaseService resultBean1 = sysOrganizationFeign.fetchBySid(orgSid); + String orgCode = resultBean1.getData().getOrgCode(); + AsBillNo b = new AsBillNo(); + b.setOrgCode(orgCode); + b.setBillType(AsBillTypeEnum.WXGD.getBillType()); + String bill = AsRule.getBill(b); + int i = baseMapper.selectNum(bill); + String billNo = AsRule.getBillNo(bill, i); + return billNo; + } + + @Transactional(rollbackFor = Exception.class) + public ResultBean saveBill(AsBusrepairBillDto dto) { + ResultBean rb = ResultBean.fireFail(); + String sid = ""; + if (StringUtils.isNotBlank(dto.getSid())) { + sid = dto.getSid(); + AsBusrepairBill asBusrepairBill = fetchBySid(sid); + BeanUtil.copyProperties(dto, asBusrepairBill, "id", "sid"); + baseMapper.updateById(asBusrepairBill); + asBusrepairBillVechService.delByBillSid(sid); + asBusrepairBillInsuranceService.delByBillSid(sid); + asBusrepairBillInvoiceService.delByBillSid(sid); + asBusrepairBillOtherService.delByBillSid(sid); + asBusrepairBillSitemService.delByBillSid(sid); + asBusrepairBillSitemRepairerService.delByBillSid(sid); + asBusrepairBillAitemService.delByBillSid(sid); + } else { + AsBusrepairBill asBusrepairBill = new AsBusrepairBill(); + sid = asBusrepairBill.getSid(); + BeanUtil.copyProperties(dto, asBusrepairBill, "id", "sid"); + String orgPath = dto.getOrgPath(); + ResultBean orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(orgPath); + if (orgSidByPath.getSuccess()) { + asBusrepairBill.setUseOrgSid(orgSidByPath.getData()); + asBusrepairBill.setCreateOrgSid(orgSidByPath.getData()); + String applyCode = getApplyCode(orgSidByPath.getData()); + asBusrepairBill.setBillNo(applyCode); + } + asBusrepairBill.setNodeCode(1); + asBusrepairBill.setNodeName("登记"); + asBusrepairBill.setNodeTime(new DateTime()); + asBusrepairBill.setOutDoorState("0");//设置未出厂 + baseMapper.insert(asBusrepairBill); + //新增工单环节信息 + AsBusrepairBillNode billNode = new AsBusrepairBillNode(); + billNode.setBillSid(sid); + billNode.setCreateByName(dto.getOperator()); + billNode.setNodeName("登记"); + billNode.setNodeCode("1"); + asBusrepairBillNodeService.insert(billNode); + } + if (StringUtils.isNotBlank(sid)) { + //新增车辆信息 + AsBusrepairBillVech vech = new AsBusrepairBillVech(); + vech.setBillSid(sid); + if (StringUtils.isNotBlank(dto.getVehMark())) { + vech.setVehMark(dto.getVehMark()); + } + if (StringUtils.isNotBlank(dto.getVinNo())) { + vech.setVinNo(dto.getVinNo()); + } + if (StringUtils.isNotBlank(dto.getVehModel())) { + vech.setVehModel(dto.getVehModel()); + } + if (StringUtils.isNotBlank(dto.getMileage())) { + vech.setMileage(Integer.parseInt(dto.getMileage())); + } + if (StringUtils.isNotBlank(dto.getOil())) { + vech.setOil(dto.getOil()); + } + if (StringUtils.isNotBlank(dto.getCurrentMileage())) { + vech.setCurrentMileage(Integer.parseInt(dto.getCurrentMileage())); + } + asBusrepairBillVechService.insert(vech); + //发票信息 + if (null != dto.getInvoiceVo()) { + AsBusrepairBillInvoice invoice = new AsBusrepairBillInvoice(); + BeanUtil.copyProperties(dto.getInvoiceVo(), invoice, "id", "sid"); + invoice.setBillSid(sid); + asBusrepairBillInvoiceService.insert(invoice); + } + //保险信息 + if (null != dto.getInsuranceVo()) { + AsBusrepairBillInsurance insurance = new AsBusrepairBillInsurance(); + BeanUtil.copyProperties(dto.getInsuranceVo(), insurance, "id", "sid"); + insurance.setBillSid(sid); + asBusrepairBillInsuranceService.insert(insurance); + } + //送修人信息 + if (null != dto.getOtherVo()) { + AsBusrepairBillOther other = new AsBusrepairBillOther(); + BeanUtil.copyProperties(dto.getOtherVo(), other, "id", "sid"); + other.setBillSid(sid); + asBusrepairBillOtherService.insert(other); + } + //服务项目 + if (!dto.getSitemVos().isEmpty()) { + List sitemVos = dto.getSitemVos(); + for (SitemVo sitemVo : sitemVos) { + AsBusrepairBillSitem sitem = new AsBusrepairBillSitem(); + BeanUtil.copyProperties(sitemVo, sitem, "id", "sid"); + sitem.setBillSid(sid); + asBusrepairBillSitemService.insert(sitem); + AsBusrepairBillSitemRepairer repairer = new AsBusrepairBillSitemRepairer(); + BeanUtil.copyProperties(sitemVo, repairer, "id", "sid"); + repairer.setBillSid(sid); + if (StringUtils.isNotBlank(sitemVo.getServiceItemSid())) { + repairer.setRepairitemSid(sitemVo.getServiceItemSid()); + } + asBusrepairBillSitemRepairerService.insert(repairer); + } + } + //附加项目 + if (!dto.getAitemVos().isEmpty()) { + List aitemVos = dto.getAitemVos(); + for (AitemVo aitemVo : aitemVos) { + AsBusrepairBillAitem aitem = new AsBusrepairBillAitem(); + if (StringUtils.isNotBlank(aitemVo.getAitemsid())) { + aitem.setAttachItemSid(aitemVo.getAitemsid()); + } + if (StringUtils.isNotBlank(aitemVo.getAitemName())) { + aitem.setAttachItem(aitemVo.getAitemName()); + } + if (StringUtils.isNotBlank(aitemVo.getPrice())) { + aitem.setPrice(new BigDecimal(aitemVo.getPrice())); + } + aitem.setBillSid(sid); + asBusrepairBillAitemService.insert(aitem); + } + } + } + return rb.success().setData(sid); + } + + public ResultBean deleteBySids(String[] sids) { + ResultBean rb = ResultBean.fireFail(); + //查询该sid中是否有不是登记状态的 + int count = baseMapper.selectBySid(StringUtils.join(sids, ",")); + if (count > 0) { + return rb.setMsg("删除的数据中包含不是登记状态的数据，删除失败"); + } + delBySids(sids); + for (String sid : sids) { + asBusrepairBillVechService.delByBillSid(sid); + asBusrepairBillInsuranceService.delByBillSid(sid); + asBusrepairBillInvoiceService.delByBillSid(sid); + asBusrepairBillOtherService.delByBillSid(sid); + asBusrepairBillSitemService.delByBillSid(sid); + asBusrepairBillSitemRepairerService.delByBillSid(sid); + asBusrepairBillAitemService.delByBillSid(sid); + asBusrepairBillNodeService.delByBillSid(sid); + } + return rb.success(); + } + + public ResultBean fetchDetailsBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + AsBusrepairBillDetailsVo vo = new AsBusrepairBillDetailsVo(); + AsBusrepairBill asBusrepairBill = fetchBySid(sid); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + if (null != asBusrepairBill) { + BeanUtil.copyProperties(asBusrepairBill, vo); + if (null != asBusrepairBill.getEntryTime()) { + vo.setEntryTime(sdf.format(asBusrepairBill.getEntryTime())); + } + if (null != asBusrepairBill.getEstimatedFinishTime()) { + vo.setEstimatedFinishTime(sdf.format(asBusrepairBill.getEstimatedFinishTime())); + } + if (null != asBusrepairBill.getNodeTime()) { + vo.setNodeTime(sdf.format(asBusrepairBill.getNodeTime())); + } + AsBusrepairBillVech vech = asBusrepairBillVechService.fetchByBillSid(sid); + if (null != vech) { + if (StringUtils.isNotBlank(vech.getVehMark())) { + vo.setVehMark(vech.getVehMark()); + } + if (StringUtils.isNotBlank(vech.getVinNo())) { + vo.setVinNo(vech.getVinNo()); + } + if (StringUtils.isNotBlank(vech.getVehModel())) { + vo.setVehModel(vech.getVehModel()); + } + if (null != vech.getMileage()) { + vo.setMileage(vech.getMileage().toString()); + } + if (StringUtils.isNotBlank(vech.getOil())) { + vo.setOil(vech.getOil()); + } + if (null != vech.getCurrentMileage()) { + vo.setCurrentMileage(vech.getCurrentMileage().toString()); + } + } + InvoiceVo invoiceVo = new InvoiceVo(); //发票信息 + InsuranceVo insuranceVo = new InsuranceVo();//保险信息 + OtherVo otherVo = new OtherVo();//送修人信息 + List sitemVos = new ArrayList<>();// 服务项目 + List aitemVos = new ArrayList<>();// 附加项目 + List goodsDetailsVos = new ArrayList<>(); //商品信息 + AsBusrepairBillInvoice invoice = asBusrepairBillInvoiceService.fetchByBillSid(sid); + if (null != invoice) { + BeanUtil.copyProperties(invoice, invoiceVo); + vo.setInvoiceVo(invoiceVo); + } + AsBusrepairBillInsurance insurance = asBusrepairBillInsuranceService.fetchByBillSid(sid); + if (null != insurance) { + BeanUtil.copyProperties(insurance, insuranceVo); + { + vo.setInsuranceVo(insuranceVo); + } + } + AsBusrepairBillOther other = asBusrepairBillOtherService.fetchByBillSid(sid); + if (null != other) { + BeanUtil.copyProperties(other, otherVo); + vo.setOtherVo(otherVo); + } + List sitems = asBusrepairBillSitemService.fetchByBillSid(sid); + if (!sitems.isEmpty()) { + for (AsBusrepairBillSitem sitem : sitems) { + SitemVo sitemVo = new SitemVo(); + BeanUtil.copyProperties(sitem, sitemVo); + AsBusrepairBillSitemRepairer repairer = asBusrepairBillSitemRepairerService.fetchByBillSid(sid, sitem.getServiceItemSid()); + if (null != repairer) { + BeanUtil.copyProperties(repairer, sitemVo); + } + sitemVos.add(sitemVo); + } + vo.setSitemVos(sitemVos); + } + List aitems = asBusrepairBillAitemService.fetchByBillSid(sid); + if (!sitems.isEmpty()) { + for (AsBusrepairBillAitem aitem : aitems) { + AitemVo aitemVo = new AitemVo(); + if (StringUtils.isNotBlank(aitem.getAttachItemSid())) { + aitemVo.setAitemsid(aitem.getAttachItemSid()); + } + if (StringUtils.isNotBlank(aitem.getAttachItem())) { + aitemVo.setAitemName(aitem.getAttachItem()); + } + if (null != aitem.getPrice()) { + aitemVo.setPrice(aitem.getPrice().toString()); + } + aitemVos.add(aitemVo); + } + vo.setAitemVos(aitemVos); + } + List goodsDetails = asBusrepairInventorybillDetailService.getDetailsByBillSid(sid); + if (!goodsDetails.isEmpty()) { + for (AsBusrepairInventorybillDetail goodsDetail : goodsDetails) { + GoodsDetailsVo goodsDetailsVo = new GoodsDetailsVo(); + BeanUtil.copyProperties(goodsDetail, goodsDetailsVo); + goodsDetailsVos.add(goodsDetailsVo); + } + vo.setGoodsDetailsVos(goodsDetailsVos); + } + } + return rb.success().setData(vo); + } + + public PagerVo listPage(PagerQuery pagerQuery) { + AsBusrepairBillQuery query = pagerQuery.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (query != null) { + String orgPath = query.getOrgPath(); + ResultBean orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(orgPath); + if (orgSidByPath.getSuccess()) { + qw.eq("b.createOrgSid", orgSidByPath.getData()); + } + if (StringUtils.isNotBlank(query.getNodeCode())) { + qw.eq("b.nodeCode", query.getNodeCode()); + } + if (StringUtils.isNotBlank(query.getBillType())) { + qw.eq("b.billType", query.getBillType()); + } + if (StringUtils.isNotBlank(query.getCustomerName())) { + qw.like("b.customerName", query.getCustomerName()); + } + if (StringUtils.isNotBlank(query.getVehMark())) { + qw.like("v.vehMark", query.getVehMark()); + } + if (StringUtils.isNotBlank(query.getVinNo())) { + qw.like("v.vinNo", query.getVinNo()); + } + 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')" + ); + qw.eq("1", "1"); + qw.orderByDesc("b.createTime"); + } + IPage page = PagerUtil.queryToPage(pagerQuery); + IPage pagging = baseMapper.listPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public ResultBean submitNextNode(AsBusrepairBillDto dto) { + ResultBean rb = ResultBean.fireFail(); + if (StringUtils.isNotBlank(dto.getSid())) { + AsBusrepairBill asBusrepairBill = fetchBySid(dto.getSid()); + if (asBusrepairBill.getNodeCode() > 4) { + return rb.setMsg("当前已完成竣工环节，无需提交"); + } + } + ResultBean resultBean = saveBill(dto); + if (resultBean.getSuccess()) { + String sid = resultBean.getData(); + AsBusrepairBill asBusrepairBill = fetchBySid(sid); + Integer nodeCode = null; + String nodeName = ""; + if (asBusrepairBill.getNodeCode() == 1) { + nodeCode = 2; + nodeName = "派工"; + } else if (asBusrepairBill.getNodeCode() == 2) { + nodeCode = 3; + nodeName = "维修"; + } else if (asBusrepairBill.getNodeCode() == 3) { + nodeCode = 4; + nodeName = "竣工"; + } else if (asBusrepairBill.getNodeCode() == 4) { + nodeCode = 5; + nodeName = "结算"; + } + asBusrepairBill.setNodeCode(nodeCode); + asBusrepairBill.setNodeName(nodeName); + asBusrepairBill.setNodeTime(new DateTime()); + baseMapper.updateById(asBusrepairBill); + //新增工单环节信息 + AsBusrepairBillNode billNode = new AsBusrepairBillNode(); + billNode.setBillSid(sid); + billNode.setCreateByName(dto.getOperator()); + billNode.setNodeName(nodeName); + billNode.setNodeCode(nodeCode.toString()); + asBusrepairBillNodeService.insert(billNode); + } + return rb.success(); + } } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillaitem/AsBusrepairBillAitemMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillaitem/AsBusrepairBillAitemMapper.java index 3acd56dcf5..e8889f0322 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillaitem/AsBusrepairBillAitemMapper.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillaitem/AsBusrepairBillAitemMapper.java @@ -27,7 +27,12 @@ package com.yxt.anrui.as.biz.asbusrepairbillaitem; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.yxt.anrui.as.api.asbusrepairbillaitem.AsBusrepairBillAitem; +import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; /** * @author liupopo @@ -37,4 +42,9 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface AsBusrepairBillAitemMapper extends BaseMapper { + @Select("select * from as_busrepair_bill_aitem where billSid = #{billSid}") + List fetchByBillSid(@Param("billSid") String billSid); + + @Delete("delete from as_busrepair_bill_aitem where billSid = #{sid}") + void delByBillSid(String billSid); } \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillaitem/AsBusrepairBillAitemService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillaitem/AsBusrepairBillAitemService.java index ac334f90b2..cb91b62356 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillaitem/AsBusrepairBillAitemService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillaitem/AsBusrepairBillAitemService.java @@ -29,6 +29,8 @@ import com.yxt.anrui.as.api.asbusrepairbillaitem.AsBusrepairBillAitem; import com.yxt.common.base.service.MybatisBaseService; import org.springframework.stereotype.Service; +import java.util.List; + /** * @author liupopo * @version 1.0 @@ -36,6 +38,13 @@ import org.springframework.stereotype.Service; */ @Service public class AsBusrepairBillAitemService extends MybatisBaseService { - + + public List fetchByBillSid(String billSid) { + return baseMapper.fetchByBillSid(billSid); + } + + public void delByBillSid(String billSid) { + baseMapper.delByBillSid(billSid); + } } \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillinsurance/AsBusrepairBillInsuranceMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillinsurance/AsBusrepairBillInsuranceMapper.java index 2adbeba429..74bbf2ad39 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillinsurance/AsBusrepairBillInsuranceMapper.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillinsurance/AsBusrepairBillInsuranceMapper.java @@ -27,7 +27,10 @@ package com.yxt.anrui.as.biz.asbusrepairbillinsurance; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.yxt.anrui.as.api.asbusrepairbillinsurance.AsBusrepairBillInsurance; +import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; /** * @author liupopo @@ -36,5 +39,9 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface AsBusrepairBillInsuranceMapper extends BaseMapper { + @Select("select * from as_busrepair_bill_insurance where billSid = #{billSid}") + AsBusrepairBillInsurance fetchByBillSid(@Param("billSid") String billSid); + @Delete("delete from as_busrepair_bill_insurance where billSid = #{sid}") + void delByBillSid(String billSid); } \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillinsurance/AsBusrepairBillInsuranceService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillinsurance/AsBusrepairBillInsuranceService.java index 594accd950..de7780ba3c 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillinsurance/AsBusrepairBillInsuranceService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillinsurance/AsBusrepairBillInsuranceService.java @@ -36,6 +36,12 @@ import org.springframework.stereotype.Service; */ @Service public class AsBusrepairBillInsuranceService extends MybatisBaseService { - + public AsBusrepairBillInsurance fetchByBillSid(String billSid) { + return baseMapper.fetchByBillSid(billSid); + } + + public void delByBillSid(String billSid) { + baseMapper.delByBillSid(billSid); + } } \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillinvoice/AsBusrepairBillInvoiceMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillinvoice/AsBusrepairBillInvoiceMapper.java index 8df238233f..cb4bbe2676 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillinvoice/AsBusrepairBillInvoiceMapper.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillinvoice/AsBusrepairBillInvoiceMapper.java @@ -27,7 +27,10 @@ package com.yxt.anrui.as.biz.asbusrepairbillinvoice; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.yxt.anrui.as.api.asbusrepairbillinvoice.AsBusrepairBillInvoice; +import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; /** * @author liupopo @@ -36,5 +39,9 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface AsBusrepairBillInvoiceMapper extends BaseMapper { + @Select("select * from as_busrepair_bill_invoice where billSid = #{billSid}") + AsBusrepairBillInvoice fetchByBillSid(@Param("billSid") String billSid); + @Delete("delete from as_busrepair_bill_invoice where billSid = #{sid}") + void delByBillSid(String billSid); } \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillinvoice/AsBusrepairBillInvoiceService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillinvoice/AsBusrepairBillInvoiceService.java index 0bafe4846f..f96bab985a 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillinvoice/AsBusrepairBillInvoiceService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillinvoice/AsBusrepairBillInvoiceService.java @@ -25,6 +25,7 @@ *********************************************************/ package com.yxt.anrui.as.biz.asbusrepairbillinvoice; + import com.yxt.anrui.as.api.asbusrepairbillinvoice.AsBusrepairBillInvoice; import com.yxt.common.base.service.MybatisBaseService; import org.springframework.stereotype.Service; @@ -36,6 +37,12 @@ import org.springframework.stereotype.Service; */ @Service public class AsBusrepairBillInvoiceService extends MybatisBaseService { - + public AsBusrepairBillInvoice fetchByBillSid(String billSid) { + return baseMapper.fetchByBillSid(billSid); + } + + public void delByBillSid(String billSid) { + baseMapper.delByBillSid(billSid); + } } \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillnode/AsBusrepairBillNodeMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillnode/AsBusrepairBillNodeMapper.java index b4f95e2033..e3cbd4d7c3 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillnode/AsBusrepairBillNodeMapper.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillnode/AsBusrepairBillNodeMapper.java @@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; +import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -59,4 +60,7 @@ public interface AsBusrepairBillNodeMapper extends BaseMapper selectListVo(); + + @Delete("delete from as_busrepair_bill_node where billSid = #{sid}") + void delByBillSid(String billSid); } \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillnode/AsBusrepairBillNodeService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillnode/AsBusrepairBillNodeService.java index e00a0f01cf..f12c4dbd0a 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillnode/AsBusrepairBillNodeService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillnode/AsBusrepairBillNodeService.java @@ -56,7 +56,12 @@ import org.springframework.stereotype.Service; */ @Service public class AsBusrepairBillNodeService extends MybatisBaseService { - + + + public void delByBillSid(String billSid) { + baseMapper.delByBillSid(billSid); + } + public PagerVo listPageVo(PagerQuery pq) { AsBusrepairBillNodeQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillother/AsBusrepairBillOtherMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillother/AsBusrepairBillOtherMapper.java index 8f93afc1a2..4aa5fffbb3 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillother/AsBusrepairBillOtherMapper.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillother/AsBusrepairBillOtherMapper.java @@ -27,7 +27,13 @@ package com.yxt.anrui.as.biz.asbusrepairbillother; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.yxt.anrui.as.api.asbusrepairbillother.AsBusrepairBillOther; + +import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; /** * @author liupopo @@ -36,5 +42,9 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface AsBusrepairBillOtherMapper extends BaseMapper { + @Select("select * from as_busrepair_bill_other where billSid = #{billSid}") + AsBusrepairBillOther fetchByBillSid(@Param("billSid") String billSid); + @Delete("delete from as_busrepair_bill_other where billSid = #{sid}") + void delByBillSid(String billSid); } \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillother/AsBusrepairBillOtherService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillother/AsBusrepairBillOtherService.java index cdc8473cff..8ce76bc6f5 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillother/AsBusrepairBillOtherService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillother/AsBusrepairBillOtherService.java @@ -25,6 +25,7 @@ *********************************************************/ package com.yxt.anrui.as.biz.asbusrepairbillother; + import com.yxt.anrui.as.api.asbusrepairbillother.AsBusrepairBillOther; import com.yxt.common.base.service.MybatisBaseService; import org.springframework.stereotype.Service; @@ -36,6 +37,12 @@ import org.springframework.stereotype.Service; */ @Service public class AsBusrepairBillOtherService extends MybatisBaseService { - + public AsBusrepairBillOther fetchByBillSid(String billSid) { + return baseMapper.fetchByBillSid(billSid); + } + + public void delByBillSid(String billSid) { + baseMapper.delByBillSid(billSid); + } } \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillsitem/AsBusrepairBillSitemMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillsitem/AsBusrepairBillSitemMapper.java index 05a9875c4e..cb0f74d78b 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillsitem/AsBusrepairBillSitemMapper.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillsitem/AsBusrepairBillSitemMapper.java @@ -27,8 +27,14 @@ package com.yxt.anrui.as.biz.asbusrepairbillsitem; import com.baomidou.mybatisplus.core.mapper.BaseMapper; + import com.yxt.anrui.as.api.asbusrepairbillsitem.AsBusrepairBillSitem; +import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; /** * @author liupopo @@ -37,5 +43,9 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface AsBusrepairBillSitemMapper extends BaseMapper { + @Select("select * from as_busrepair_bill_sitem where billSid = #{billSid}") + List fetchByBillSid(@Param("billSid") String billSid); + @Delete("delete from as_busrepair_bill_sitem where billSid = #{sid}") + void delByBillSid(String billSid); } \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillsitem/AsBusrepairBillSitemService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillsitem/AsBusrepairBillSitemService.java index f73ecfcf2b..28a30a5cce 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillsitem/AsBusrepairBillSitemService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillsitem/AsBusrepairBillSitemService.java @@ -29,6 +29,8 @@ import com.yxt.anrui.as.api.asbusrepairbillsitem.AsBusrepairBillSitem; import com.yxt.common.base.service.MybatisBaseService; import org.springframework.stereotype.Service; +import java.util.List; + /** * @author liupopo * @version 1.0 @@ -36,6 +38,12 @@ import org.springframework.stereotype.Service; */ @Service public class AsBusrepairBillSitemService extends MybatisBaseService { - + public List fetchByBillSid(String billSid) { + return baseMapper.fetchByBillSid(billSid); + } + + public void delByBillSid(String billSid) { + baseMapper.delByBillSid(billSid); + } } \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillsitemrepairer/AsBusrepairBillSitemRepairerMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillsitemrepairer/AsBusrepairBillSitemRepairerMapper.java index 5de22a071c..5619e56cce 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillsitemrepairer/AsBusrepairBillSitemRepairerMapper.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillsitemrepairer/AsBusrepairBillSitemRepairerMapper.java @@ -28,7 +28,10 @@ package com.yxt.anrui.as.biz.asbusrepairbillsitemrepairer; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.yxt.anrui.as.api.asbusrepairbillsitemrepairer.AsBusrepairBillSitemRepairer; +import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; /** * @author liupopo @@ -38,4 +41,10 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface AsBusrepairBillSitemRepairerMapper extends BaseMapper { + + @Select("select * from as_busrepair_bill_sitem_repairer where billSid = #{billSid} and repairitemSid =#{itemSid}") + AsBusrepairBillSitemRepairer fetchByBillSidAndItemSid(@Param("billSid") String billSid, @Param("itemSid")String itemSid); + + @Delete("delete from as_busrepair_bill_sitem_repairer where billSid = #{sid}") + void delByBillSid(String billSid); } \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillsitemrepairer/AsBusrepairBillSitemRepairerService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillsitemrepairer/AsBusrepairBillSitemRepairerService.java index 96e69ba910..d36a134056 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillsitemrepairer/AsBusrepairBillSitemRepairerService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillsitemrepairer/AsBusrepairBillSitemRepairerService.java @@ -37,6 +37,12 @@ import org.springframework.stereotype.Service; */ @Service public class AsBusrepairBillSitemRepairerService extends MybatisBaseService { - + public AsBusrepairBillSitemRepairer fetchByBillSid(String billSid,String itemSid) { + return baseMapper.fetchByBillSidAndItemSid(billSid,itemSid); + } + + public void delByBillSid(String billSid) { + baseMapper.delByBillSid(billSid); + } } \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillvech/AsBusrepairBillVechMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillvech/AsBusrepairBillVechMapper.java index 8f6741596d..65328f6f7c 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillvech/AsBusrepairBillVechMapper.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillvech/AsBusrepairBillVechMapper.java @@ -30,6 +30,7 @@ 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.asbusrepairbillvech.AsBusrepairBillVech; +import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -51,5 +52,9 @@ import java.util.List; */ @Mapper public interface AsBusrepairBillVechMapper extends BaseMapper { + @Select("select * from as_busrepair_bill_vech where billSid = #{billSid}") + AsBusrepairBillVech fetchByBillSid(@Param("billSid") String billSid); + @Delete("delete from as_busrepair_bill_vech where billSid = #{sid}") + void delByBillSid(String billSid); } \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillvech/AsBusrepairBillVechService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillvech/AsBusrepairBillVechService.java index e960f4f492..820711e493 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillvech/AsBusrepairBillVechService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillvech/AsBusrepairBillVechService.java @@ -44,6 +44,13 @@ import org.springframework.stereotype.Service; */ @Service public class AsBusrepairBillVechService extends MybatisBaseService { - + + public AsBusrepairBillVech fetchByBillSid(String billSid) { + return baseMapper.fetchByBillSid(billSid); + } + + public void delByBillSid(String billSid) { + baseMapper.delByBillSid(billSid); + } } \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailMapper.java index b1284fd633..0b9fbeec71 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailMapper.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailMapper.java @@ -3,6 +3,7 @@ package com.yxt.anrui.as.biz.asbusrepairinventorybilldetail; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetail; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -16,4 +17,6 @@ public interface AsBusrepairInventorybillDetailMapper extends BaseMapper selectByMainSid(String sid); + + List getDetailsByBillSid(@Param("busRepairBillSid") String busRepairBillSid); } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailMapper.xml index e7f793abd9..5b8b9288ed 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailMapper.xml +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailMapper.xml @@ -13,4 +13,14 @@ from as_busrepair_inventorybill_detail where billSid = #{sid} + \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailRest.java index cd84ebf393..f75c5f8527 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailRest.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailRest.java @@ -1,7 +1,13 @@ package com.yxt.anrui.as.biz.asbusrepairinventorybilldetail; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import com.yxt.anrui.as.api.asbusrepairinventorybill.AsBusrepairInventorybillDto; +import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetail; +import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * @description: 维修出/退库单据明细 @@ -11,4 +17,15 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("v1/AsBusrepairInventorybillDetail") public class AsBusrepairInventorybillDetailRest { + + @Autowired + private AsBusrepairInventorybillDetailService asBusrepairInventorybillDetailService; + + @PostMapping("getDetailsByBillSid") + @ApiOperation("根据工单sid查询商品明细") + ResultBean> getDetailsByBillSid(@RequestParam("busRepairBillSid") String busRepairBillSid) { + ResultBean rb = ResultBean.fireFail(); + List list = asBusrepairInventorybillDetailService.getDetailsByBillSid(busRepairBillSid); + return rb.success().setData(list); + } } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailService.java index d2e3413627..51f77023ce 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailService.java @@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil; import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetail; import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetailDto; import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.core.result.ResultBean; import org.springframework.stereotype.Service; import java.util.List; @@ -28,4 +29,9 @@ public class AsBusrepairInventorybillDetailService extends MybatisBaseService selectByMainSid(String sid) { return baseMapper.selectByMainSid(sid); } + + + public List getDetailsByBillSid(String busRepairBillSid) { + return baseMapper.getDetailsByBillSid(busRepairBillSid); + } }