Merge remote-tracking branch 'origin/master'

1 year ago · 391ba62544
13 changed files with 126 additions and 56 deletions
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml
@ -115,6 +115,7 @@
        FROM base_manufacturer_bank
        WHERE manufacturerSid = #{manufacturerSid}
          AND actualPay = #{manufSaleAccessName}
+          AND isDelete = '0'
    </select>

    <select id="details" resultType="com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankVo">
--- 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 @@
                                    <w:u w:val="none"/>
                                </w:rPr>
                            </w:pPr>
-                            <w:r>
-                                <w:rPr>
-                                    <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:fareast="宋体" w:cs="宋体" w:hint="fareast"/>
-                                    <w:i w:val="off"/>
-                                    <w:i-cs w:val="off"/>
-                                    <w:color w:val="000000"/>
-                                    <w:sz w:val="22"/>
-                                    <w:sz-cs w:val="22"/>
-                                    <w:u w:val="none"/>
-                                    <w:lang w:val="EN-US" w:fareast="ZH-CN"/>
-                                </w:rPr>
-                                <w:t>$</w:t>
-                            </w:r>
+<#--                            <w:r>-->
+<#--                                <w:rPr>-->
+<#--                                    <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:fareast="宋体" w:cs="宋体" w:hint="fareast"/>-->
+<#--                                    <w:i w:val="off"/>-->
+<#--                                    <w:i-cs w:val="off"/>-->
+<#--                                    <w:color w:val="000000"/>-->
+<#--                                    <w:sz w:val="22"/>-->
+<#--                                    <w:sz-cs w:val="22"/>-->
+<#--                                    <w:u w:val="none"/>-->
+<#--                                    <w:lang w:val="EN-US" w:fareast="ZH-CN"/>-->
+<#--                                </w:rPr>-->
+<#--                                <w:t>$</w:t>-->
+<#--                            </w:r>-->
                            <w:r>
                                <w:rPr>
                                    <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:fareast="宋体" w:cs="宋体" w:hint="fareast"/>
@ -4894,7 +4894,7 @@
                                    <w:u w:val="none"/>
                                    <w:lang w:val="EN-US" w:fareast="ZH-CN"/>
                                </w:rPr>
-                                <w:t>{fMoney2!}</w:t>
+                                <w:t>${fMoney2!}</w:t>
                            </w:r>
                        </w:p>
                    </w:tc>
@ -5785,4 +5785,4 @@
                <w:docGrid w:type="lines" w:line-pitch="312"/>
            </w:sectPr>
        </wx:sect>
-    </w:body></w:wordDocument>
+    </w:body></w:wordDocument>
--- 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;

 }
--- 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<SitemVo> sitemVos = new ArrayList<>();// 服务项目
    private List<AitemVo> aitemVos = new ArrayList<>();// 附加项目
    private SettleVo settleVo = new SettleVo(); //结算信息
+    private List<GoodsDetailsVo> goodsDetailsVos = new ArrayList<>(); //商品信息

 }
--- 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;

 }
--- 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
@ -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;
+}
--- 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<ReparirerStaffVo> staffList = new ArrayList<>(); //维修人员信息

 }
--- 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<AsBusrepairBillMa
                    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());
+                    List<ReparirerStaffVo> 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<AsBusrepairBillMa
                    if (StringUtils.isNotBlank(aitemVo.getPrice())) {
                        aitem.setPrice(new BigDecimal(aitemVo.getPrice()));
                    }
+                    if (StringUtils.isNotBlank(aitemVo.getRemarks())) {
+                        aitem.setRemarks(aitemVo.getRemarks());
+                    }
                    aitem.setBillSid(sid);
                    asBusrepairBillAitemService.insert(aitem);
                }
            }
+            //商品信息
+            if (!dto.getGoodsDetailsVos().isEmpty() && dto.getGoodsDetailsVos().size() > 0) {
+                List<GoodsDetailsVo> 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<AsBusrepairBillMa
                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);
+                    List<AsBusrepairBillSitemRepairer> repairers = asBusrepairBillSitemRepairerService.fetchByBillSid(sid, sitem.getServiceItemSid());
+                    if (!repairers.isEmpty()) {
+                        List<ReparirerStaffVo> 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<AsBusrepairBillMa
                }
                vo.setAitemVos(aitemVos);
            }
-            List<AsBusrepairInventorybillDetail> goodsDetails = asBusrepairInventorybillDetailService.getDetailsByBillSid(sid);
+            List<AsBusrepairInventorybillDetail> goodsDetails = asBusrepairInventorybillDetailService.getDetailsByBillSid(sid, "0");
            if (!goodsDetails.isEmpty()) {
                for (AsBusrepairInventorybillDetail goodsDetail : goodsDetails) {
                    GoodsDetailsVo goodsDetailsVo = new GoodsDetailsVo();
--- 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<AsBusrepa


    @Select("select * from as_busrepair_bill_sitem_repairer where billSid = #{billSid} and repairitemSid =#{itemSid}")
-    AsBusrepairBillSitemRepairer fetchByBillSidAndItemSid(@Param("billSid") String billSid, @Param("itemSid")String itemSid);
+    List<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);
-}
+}
--- 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<AsBusrepairBillSitemRepairerMapper, AsBusrepairBillSitemRepairer> {

-    public AsBusrepairBillSitemRepairer fetchByBillSid(String billSid,String itemSid) {
+    public List<AsBusrepairBillSitemRepairer> fetchByBillSid(String billSid, String itemSid) {
        return baseMapper.fetchByBillSidAndItemSid(billSid,itemSid);
    }

    public void delByBillSid(String billSid) {
        baseMapper.delByBillSid(billSid);
    }
-}
+}
--- 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<AsBusre

    List<AsBusrepairInventorybillDetail> selectByMainSid(String sid);

-    List<AsBusrepairInventorybillDetail> getDetailsByBillSid(@Param("busRepairBillSid") String busRepairBillSid);
+    List<AsBusrepairInventorybillDetail> getDetailsByBillSid(@Param("busRepairBillSid") String busRepairBillSid,@Param("busTypeKey")String busTypeKey);
 }
--- 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}
    </select>
-</mapper>
+</mapper>
--- 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<As
    }


-    public List<AsBusrepairInventorybillDetail> getDetailsByBillSid(String busRepairBillSid) {
-        return baseMapper.getDetailsByBillSid(busRepairBillSid);
+    public List<AsBusrepairInventorybillDetail> getDetailsByBillSid(String busRepairBillSid,String busTypeKey) {
+        return baseMapper.getDetailsByBillSid(busRepairBillSid,busTypeKey);
    }
 }