diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/ftl/vouchers/returnMoney2.ftl b/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/ftl/vouchers/returnMoney2.ftl index bea4a58091..5db2b5b8f1 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/ftl/vouchers/returnMoney2.ftl +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/ftl/vouchers/returnMoney2.ftl @@ -4870,19 +4870,19 @@ - - - - - - - - - - - - $ - +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- $--> +<#-- --> @@ -4894,7 +4894,7 @@ - {fMoney2!} + ${fMoney2!} @@ -5785,4 +5785,4 @@ - \ No newline at end of file + 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 index e6e24c9f96..2a29dc525a 100644 --- 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 @@ -19,5 +19,7 @@ public class AitemVo { private String aitemName; @ApiModelProperty("销售价") private String price; + @ApiModelProperty("备注") + private String remarks; } 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 index d552b70a8b..279a9db5aa 100644 --- 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 @@ -100,5 +100,6 @@ public class AsBusrepairBillDto implements Dto { private List sitemVos = new ArrayList<>();// 服务项目 private List aitemVos = new ArrayList<>();// 附加项目 private SettleVo settleVo = new SettleVo(); //结算信息 + private List goodsDetailsVos = new ArrayList<>(); //商品信息 } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairPageVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairPageVo.java index e9cce1c149..debac70157 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairPageVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairPageVo.java @@ -2,6 +2,9 @@ package com.yxt.anrui.as.api.asbusrepairbill; import lombok.Data; +import java.util.ArrayList; +import java.util.List; + /** * @description: 旧件回收登记 * @author: dimengzhe @@ -10,6 +13,8 @@ import lombok.Data; @Data public class AsBusrepairPageVo { + private String sid; + //维修工单编号 private String billNo; //工单创建日期 @@ -22,10 +27,12 @@ public class AsBusrepairPageVo { private String vehMark; //车架号 private String vinNo; + + //旧件回收说明 private String shortss; //旧件照片 - private String photos; + private List photos = new ArrayList<>(); } 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 index 203bc28b6c..a052cac46f 100644 --- 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 @@ -13,27 +13,28 @@ import java.math.BigDecimal; */ @Data public class GoodsDetailsVo implements Vo { + private String sid; //商品名称 private String goodsSpuName; - //商品Sku名称 - private String goodsSkuTitle; +// //商品Sku名称 +// private String goodsSkuTitle; //商品编码（图号） private String goodsSkuCode; //规格型号 private String goodsSkuOwnSpec; - @ApiModelProperty("出库前的库存量") - private String currentCount; +// @ApiModelProperty("出库前的库存量") +// private String currentCount; @ApiModelProperty("计量单位") private String unit; - @ApiModelProperty("仓库sid") - private String warehouseSid; +// @ApiModelProperty("仓库sid") +// private String warehouseSid; @ApiModelProperty("仓库名称") private String warehouseName; //库位编号 private String warehouseRackCode; - - @ApiModelProperty("需求数量（维修工单中）") - private String needCount; +// +// @ApiModelProperty("需求数量（维修工单中）") +// private String needCount; @ApiModelProperty("出/退库数量") private String count; @ApiModelProperty("销售价（元）") @@ -44,10 +45,11 @@ public class GoodsDetailsVo implements Vo { private String discountAmount; //金额（销售价-优惠金额） private String amount; - @ApiModelProperty("科目") - private String subject; - @ApiModelProperty("领料人姓名") - private String operName; - +// @ApiModelProperty("科目") +// private String subject; +// @ApiModelProperty("领料人姓名") +// private String operName; + @ApiModelProperty("备注") + private String remarks; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/ReparirerStaffVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/ReparirerStaffVo.java new file mode 100644 index 0000000000..a89a9df061 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/ReparirerStaffVo.java @@ -0,0 +1,18 @@ +package com.yxt.anrui.as.api.asbusrepairbill; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/4/29 10:50 + */ +@Data +public class ReparirerStaffVo { + + @ApiModelProperty("维修人员sid") + private String repairerSid; + @ApiModelProperty("维修人员姓名") + private String repairerName; +} 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 index 916d65a151..50035aa7b5 100644 --- 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 @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; /** * @author Fan @@ -38,15 +40,17 @@ public class SitemVo { private String discountAmount; @ApiModelProperty("金额（销售价-优惠金额）") private String amount; + @ApiModelProperty("备注") + private String remarks; //-------------维修人员--------------- - @ApiModelProperty("维修人员sid") - private String repairerSid; - @ApiModelProperty("维修人员姓名") - private String repairerName; - @ApiModelProperty("所在组sid") - private String groupSid; - @ApiModelProperty("所在班组名称") - private String groupName; - +// @ApiModelProperty("维修人员sid") +// private String repairerSid; +// @ApiModelProperty("维修人员姓名") +// private String repairerName; +// @ApiModelProperty("所在组sid") +// private String groupSid; +// @ApiModelProperty("所在班组名称") +// private String groupName; + private List staffList = new ArrayList<>(); //维修人员信息 } 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 f1ca287a93..213837e8b0 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 @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBill; import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBillListVo; import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBillVo; +import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairPageVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Update; @@ -30,4 +31,8 @@ public interface AsBusrepairBillMapper extends BaseMapper { int selectBySid(String join); IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage pageBillList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + AsBusrepairPageVo selectByBillNo(String sid); } 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 6ac088de1f..fecd8d1a79 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,15 +9,18 @@ a.mobile, b.vinNo, b.vehMark, - DATE_FORMAT(a.entryTime,'%Y-%m-%d') as entryTime + DATE_FORMAT(a.entryTime, '%Y-%m-%d') as entryTime from as_busrepair_bill a LEFT JOIN as_busrepair_bill_vech AS b on a.sid = b.billSid where nodeCode = 3 SELECT COUNT(*) FROM as_busrepair_bill - WHERE nodeCode != '1' and find_in_set(sid, #{join}) + WHERE nodeCode != '1' + and find_in_set(sid, #{join}) + + + + 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 004dff9562..f4db6fe89f 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 @@ -108,8 +108,8 @@ public class AsBusrepairBillRest { @GetMapping("/getOneByBillNo") @ApiOperation("旧件回收登记初始化") - ResultBean getOneByBillNo(@RequestParam("billNo") String billNo) { - return asBusrepairBillService.getOneByBillNo(billNo); + ResultBean getOneByBillNo(@RequestParam("sid") String sid) { + return asBusrepairBillService.getOneByBillNo(sid); } @GetMapping("/detailsInit") 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 8fb21e25e4..59367ed58f 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 @@ -265,13 +265,18 @@ public class AsBusrepairBillService extends MybatisBaseService staffList = sitemVo.getStaffList(); + if (!staffList.isEmpty()) { + for (ReparirerStaffVo staffVo : staffList) { + AsBusrepairBillSitemRepairer repairer = new AsBusrepairBillSitemRepairer(); + BeanUtil.copyProperties(staffVo, repairer, "id", "sid"); + repairer.setBillSid(sid); + if (StringUtils.isNotBlank(sitemVo.getServiceItemSid())) { + repairer.setRepairitemSid(sitemVo.getServiceItemSid()); + } + asBusrepairBillSitemRepairerService.insert(repairer); + } } - asBusrepairBillSitemRepairerService.insert(repairer); } } //附加项目 @@ -288,10 +293,36 @@ public class AsBusrepairBillService extends MybatisBaseService 0) { + List goodsDetailsVos = dto.getGoodsDetailsVos(); + for (GoodsDetailsVo goodsVo : goodsDetailsVos) { + AsBusrepairInventorybillDetail goods = asBusrepairInventorybillDetailService.fetchBySid(goodsVo.getSid()); + if (StringUtils.isNotBlank(goodsVo.getPrice())) { + goods.setPrice(new BigDecimal(goodsVo.getPrice())); + } + if (StringUtils.isNotBlank(goodsVo.getDiscount())) { + goods.setDiscount(new Integer(goodsVo.getDiscount())); + } + if (StringUtils.isNotBlank(goodsVo.getDiscountAmount())) { + goods.setDiscountAmount(new BigDecimal(goodsVo.getDiscountAmount())); + } + if (StringUtils.isNotBlank(goodsVo.getAmount())) { + goods.setAmount(new BigDecimal(goodsVo.getAmount())); + } + if (StringUtils.isNotBlank(goodsVo.getRemarks())) { + goods.setRemarks(goodsVo.getRemarks()); + } + asBusrepairInventorybillDetailService.updateById(goods); + } + } } return rb.success().setData(sid); } @@ -383,9 +414,15 @@ public class AsBusrepairBillService extends MybatisBaseService repairers = asBusrepairBillSitemRepairerService.fetchByBillSid(sid, sitem.getServiceItemSid()); + if (!repairers.isEmpty()) { + List staffList = new ArrayList<>(); //维修人员信息 + for (AsBusrepairBillSitemRepairer repairer : repairers) { + ReparirerStaffVo staffVo = new ReparirerStaffVo(); + BeanUtil.copyProperties(repairer, staffVo); + staffList.add(staffVo); + } + sitemVo.setStaffList(staffList); } sitemVos.add(sitemVo); } @@ -408,7 +445,7 @@ public class AsBusrepairBillService extends MybatisBaseService goodsDetails = asBusrepairInventorybillDetailService.getDetailsByBillSid(sid); + List goodsDetails = asBusrepairInventorybillDetailService.getDetailsByBillSid(sid, "0"); if (!goodsDetails.isEmpty()) { for (AsBusrepairInventorybillDetail goodsDetail : goodsDetails) { GoodsDetailsVo goodsDetailsVo = new GoodsDetailsVo(); @@ -585,12 +622,32 @@ public class AsBusrepairBillService extends MybatisBaseService pageBillList(PagerQuery pagerQuery) { - - return null; + AsBusrepairPageQuery query = pagerQuery.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + //ToDo:添加查询条件 + //维修工单编号 + if (StringUtils.isNotBlank(query.getBillNo())) { + qw.like("a.billNo", query.getBillNo()); + } + //单据日期开始时间-单据日期结束时间 + qw.apply(StringUtils.isNotBlank(query.getCreateTimeStart()), "date_format (a.createTime,'%Y-%m-%d') >= date_format('" + query.getCreateTimeStart() + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(query.getCreateTimeEnd()), "date_format (a.createTime,'%Y-%m-%d') <= date_format('" + query.getCreateTimeEnd() + "','%Y-%m-%d')" + ); + //车牌号 + if (StringUtils.isNotBlank(query.getVehMark())) { + qw.like("b.vehMark", query.getVehMark()); + } + qw.eq("a.nodeCode", 3); + IPage page = PagerUtil.queryToPage(pagerQuery); + IPage pagging = baseMapper.pageBillList(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; } - public ResultBean getOneByBillNo(String billNo) { - return null; + public ResultBean getOneByBillNo(String sid) { + ResultBean rb = ResultBean.fireFail(); + AsBusrepairPageVo asBusrepairPageVo = baseMapper.selectByBillNo(sid); + return rb.success().setData(asBusrepairPageVo); } public ResultBean sureMaterialFee(AsBusrepairBillDto dto) { 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 5619e56cce..9f344f25f4 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 @@ -33,6 +33,8 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; +import java.util.List; + /** * @author liupopo * @version 1.0 @@ -43,8 +45,8 @@ public interface AsBusrepairBillSitemRepairerMapper extends BaseMapper 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 d36a134056..d1d0491548 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 @@ -30,6 +30,8 @@ import com.yxt.anrui.as.api.asbusrepairbillsitemrepairer.AsBusrepairBillSitemRep import com.yxt.common.base.service.MybatisBaseService; import org.springframework.stereotype.Service; +import java.util.List; + /** * @author liupopo * @version 1.0 @@ -38,11 +40,11 @@ import org.springframework.stereotype.Service; @Service public class AsBusrepairBillSitemRepairerService extends MybatisBaseService { - public AsBusrepairBillSitemRepairer fetchByBillSid(String billSid,String itemSid) { + public List 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/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailMapper.java index 0b9fbeec71..a567fe478d 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 @@ -18,5 +18,5 @@ public interface AsBusrepairInventorybillDetailMapper extends BaseMapper selectByMainSid(String sid); - List getDetailsByBillSid(@Param("busRepairBillSid") String busRepairBillSid); + List getDetailsByBillSid(@Param("busRepairBillSid") String busRepairBillSid,@Param("busTypeKey")String busTypeKey); } 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 5b8b9288ed..56041858e4 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 @@ -22,5 +22,6 @@ LEFT JOIN as_busrepair_inventorybill_detail AS d ON b.sid = d.billSid WHERE b.sourceBillSid = #{busRepairBillSid} + and b.busTypeKey = #{busTypeKey} - \ No newline at end of file + 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 51f77023ce..c65d4ad091 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 @@ -31,7 +31,7 @@ public class AsBusrepairInventorybillDetailService extends MybatisBaseService getDetailsByBillSid(String busRepairBillSid) { - return baseMapper.getDetailsByBillSid(busRepairBillSid); + public List getDetailsByBillSid(String busRepairBillSid,String busTypeKey) { + return baseMapper.getDetailsByBillSid(busRepairBillSid,busTypeKey); } }