Merge remote-tracking branch 'origin/master'

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeign.java

@@ -33,19 +33,6 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
-/**
- * Project: anrui-fin(财务) <br/>
- * File: FinPaymentrecordFeign.java <br/>
- * Class: com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordFeign <br/>
- * Description: fin_paymentrecord. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2022-06-23 13:45:10 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Api(tags = "fin_paymentrecord")
 @FeignClient(
         contextId = "anrui-fin-FinPaymentrecord",
@@ -104,4 +91,9 @@ public interface FinPaymentrecordFeign {
     @GetMapping("/fetchBySid")
     @ResponseBody
     ResultBean<FinPaymentrecord> fetchBySid(@RequestParam("sid") String sid);
+
+    @ApiOperation("出纳付款列表推送财务凭证")
+    @PostMapping("/pushVoucher")
+    @ResponseBody
+    public ResultBean pushVoucher(@RequestParam("sid") String sid);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordRest.java

@@ -34,21 +34,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-/**
- * Project: anrui-fin(财务) <br/>
- * File: FinPaymentrecordFeignFallback.java <br/>
- * Class: com.yxt.anrui.fin.biz.finpaymentrecord.FinPaymentrecordRest <br/>
- * Description: fin_paymentrecord. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2022-06-23 13:45:10 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Api(tags = "出纳付款列表")
-@RestController("com.yxt.anrui.fin.biz.finpaymentrecord.FinPaymentrecordRest")
+@RestController
 @RequestMapping("v1/finpaymentrecord")
 public class FinPaymentrecordRest implements FinPaymentrecordFeign {
 
@@ -110,4 +97,11 @@ public class FinPaymentrecordRest implements FinPaymentrecordFeign {
         FinPaymentrecord finPaymentrecord = finPaymentrecordService.fetchBySid(sid);
         return rb.success().setData(finPaymentrecord);
     }
+
+    @Override
+    public ResultBean pushVoucher(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        finPaymentrecordService.pushVoucher(sid);
+        return rb.success();
+    }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java

@@ -52,18 +52,22 @@ import com.yxt.anrui.base.common.enums.DictCommonEnum;
 import com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerBank;
 import com.yxt.anrui.fin.api.finpaymentapply.FinPaymentapply;
 import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetails;
+import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEve;
 import com.yxt.anrui.fin.api.finpaymentapplyvehicle.FinPaymentapplyVehicleVo;
 import com.yxt.anrui.fin.api.finpaymentrecord.*;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJR;
+import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
 import com.yxt.anrui.fin.api.kingdee.appaybill.ApPayBill;
 import com.yxt.anrui.fin.api.kingdee.voucher.Voucher;
 import com.yxt.anrui.fin.biz.finmanufacturerbank.FinManufacturerBankService;
 import com.yxt.anrui.fin.biz.finpaymentapply.FinPaymentapplyService;
 import com.yxt.anrui.fin.biz.finpaymentapplydetails.FinPaymentapplyDetailsService;
+import com.yxt.anrui.fin.biz.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveService;
 import com.yxt.anrui.fin.biz.finpaymentapplyvehicle.FinPaymentapplyVehicleService;
 import com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJRService;
 import com.yxt.anrui.fin.biz.kingdee.appaybill.ApPayBillService;
 import com.yxt.anrui.fin.biz.kingdee.voucher.VoucherService;
+import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign;
 import com.yxt.anrui.portal.api.flow.FlowableFeign;
 import com.yxt.anrui.portal.api.flow.PCHistTaskListAndCommentList;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganization;
@@ -105,6 +109,7 @@ import org.apache.tomcat.util.threads.ThreadPoolExecutor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -117,19 +122,6 @@ import java.util.stream.Collectors;
 
 import static java.util.Comparator.comparing;
 
-/**
- * Project: anrui-fin(财务) <br/>
- * File: FinPaymentrecordService.java <br/>
- * Class: com.yxt.anrui.fin.biz.finpaymentrecord.FinPaymentrecordService <br/>
- * Description: fin_paymentrecord 业务逻辑. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2022-06-23 13:45:10 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Slf4j
 @Service
 public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecordMapper, FinPaymentrecord> {
@@ -192,6 +184,12 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
     private LoanSettleApplyFeign loanSettleApplyFeign;
     @Autowired
     private VoucherService voucherService;
+    @Resource
+    private FinKingDeeFeign finKingDeeFeign;
+    @Autowired
+    private DictCommonFeign dictCommonFeign;
+    @Autowired
+    private FinPaymentapplyDetailsBelowEveService finPaymentapplyDetailsBelowEveService;
 
     public PagerVo<FinPaymentrecordVo> listPageVo(PagerQuery<FinPaymentrecordQuery> pq) {
         FinPaymentrecordQuery query = pq.getParams();
@@ -1627,4 +1625,75 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
     }
 
 
+    public void pushVoucher(String sid) {
+        Voucher voucher = new Voucher();
+        FinPaymentrecord finPaymentrecord = fetchBySid(sid);
+        SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(finPaymentrecord.getUseOrgSid()).getData();
+        if (null != organizationVo) {
+            voucher.setAccountBook(organizationVo.getOrgCode());
+            voucher.setVoucherNo(organizationVo.getOrgCode());
+        }
+        List<Voucher.VoucherResultDetailDto> voucherResultDetailDtos = new ArrayList<>();
+        Voucher.VoucherResultDetailDto voucherResultDetailDto = new Voucher.VoucherResultDetailDto();
+        if ("015".equals(finPaymentrecord.getCostTitleKey())) {//银行保证金
+            //借方
+            voucherResultDetailDto.setSummary("付" + finPaymentrecord.getCostTitleValue() + finPaymentrecord.getCost());
+            voucherResultDetailDto.setSubjectNo("1009.03");
+            SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(finPaymentrecord.getPurchaseSystemSid()).getData();
+            voucherResultDetailDto.setDimensionDept(deptVo.getOrgCode());
+            String key = dictCommonFeign.selectByValue(finPaymentrecord.getReceiveBank()).getData();
+            voucherResultDetailDto.setBank(key);
+            voucherResultDetailDto.setDebit(finPaymentrecord.getCost().toString());
+            voucherResultDetailDtos.add(voucherResultDetailDto);
+            //贷方
+            voucherResultDetailDto.setSummary("付" + finPaymentrecord.getCostTitleValue() + finPaymentrecord.getCost());
+            voucherResultDetailDto.setSubjectNo("1002.01.00");
+            voucherResultDetailDto.setBankAccount(finPaymentrecord.getPayBankAccount());
+            voucherResultDetailDto.setCredit(finPaymentrecord.getCost().toString());
+            voucherResultDetailDtos.add(voucherResultDetailDto);
+        } else if ("016".equals(finPaymentrecord.getCostTitleKey())) {//银行手续费
+            //借方
+            voucherResultDetailDto.setSummary("付" + finPaymentrecord.getCostTitleValue() + finPaymentrecord.getCost());
+            voucherResultDetailDto.setSubjectNo("6603.03.00");
+            voucherResultDetailDto.setDebit(finPaymentrecord.getCost().toString());
+            voucherResultDetailDtos.add(voucherResultDetailDto);
+            //贷方
+            voucherResultDetailDto.setSummary("付" + finPaymentrecord.getCostTitleValue());
+            voucherResultDetailDto.setSubjectNo("1002.01.00");
+            voucherResultDetailDto.setBankAccount(finPaymentrecord.getPayBankAccount());
+            voucherResultDetailDto.setCredit(finPaymentrecord.getCost().toString());
+            voucherResultDetailDtos.add(voucherResultDetailDto);
+        } else if ("017".equals(finPaymentrecord.getCostTitleKey())) {//金融服务费
+            //借方
+            voucherResultDetailDto.setSummary("付" + finPaymentrecord.getCostTitleValue() + finPaymentrecord.getCost());
+            voucherResultDetailDto.setSubjectNo("6603.03.00");
+            voucherResultDetailDto.setDebit(finPaymentrecord.getCost().toString());
+            voucherResultDetailDtos.add(voucherResultDetailDto);
+            //贷方
+            voucherResultDetailDto.setSummary("付" + finPaymentrecord.getCostTitleValue());
+            voucherResultDetailDto.setSubjectNo("1002.01.00");
+            voucherResultDetailDto.setBankAccount(finPaymentrecord.getPayBankAccount());
+            voucherResultDetailDto.setCredit(finPaymentrecord.getCost().toString());
+            voucherResultDetailDtos.add(voucherResultDetailDto);
+        }else if (StringUtils.isBlank(finPaymentrecord.getCostTitleKey())){//平仓款
+            //借方
+            FinPaymentapplyDetailsBelowEve finPaymentapplyDetailsBelowEve = finPaymentapplyDetailsBelowEveService.fetchBySid(finPaymentrecord.getBusSid());
+            voucherResultDetailDto.setSummary("还" + finPaymentrecord.getCostTitleValue() + finPaymentapplyDetailsBelowEve.getExePayDate());
+            voucherResultDetailDto.setSubjectNo("1009.03");
+            SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(finPaymentrecord.getPurchaseSystemSid()).getData();
+            voucherResultDetailDto.setDimensionDept(deptVo.getOrgCode());
+            String key = dictCommonFeign.selectByValue(finPaymentrecord.getReceiveBank()).getData();
+            voucherResultDetailDto.setBank(key);
+            voucherResultDetailDto.setDebit(finPaymentrecord.getCost().toString());
+            voucherResultDetailDtos.add(voucherResultDetailDto);
+            //贷方
+            voucherResultDetailDto.setSummary("还" + finPaymentrecord.getCostTitleValue() + finPaymentapplyDetailsBelowEve.getExePayDate());
+            voucherResultDetailDto.setSubjectNo("1002.01.00");
+            voucherResultDetailDto.setBankAccount(finPaymentrecord.getPayBankAccount());
+            voucherResultDetailDto.setCredit(finPaymentrecord.getCost().toString());
+            voucherResultDetailDtos.add(voucherResultDetailDto);
+        }
+        voucher.setResultDetails(voucherResultDetailDtos);
+        finKingDeeFeign.saveVoucher(voucher);
+    }
 }

yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillMapper.xml

@@ -121,7 +121,8 @@
         i.warehouseRackCode,
         IF( IFNULL(i.taxRate,0) > 0, '0', '1' ) AS isTaxRate,
         i.manufacturerSid,
-        i.manufacturerName
+        i.manufacturerName,
+        i.cost
         FROM
         yxt_wms.wms_inventory as i
         LEFT JOIN yxt_wms.wms_warehouse_area as wa ON wa.warehouseSid = i.warehouseSid

yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsWmsInventorySalesVo.java

@@ -40,6 +40,7 @@ public class SmsWmsInventorySalesVo implements Vo {
     private String discountAmount;
     //金额（销售价-优惠金额）
     private String amount;
+    private String cost; //入库价
 //    @ApiModelProperty("备注")
 //    private String remarks;
     /**