欠款开票

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseDistributorsListVo.java

@@ -25,4 +25,12 @@ public class BaseDistributorsListVo implements Vo {
     private String contract;
     @ApiModelProperty(value = "联系电话")
     private String mobile;
+
+    @ApiModelProperty(value = "开票信息")
+    private String billInfo;
+
+    private String registDetailAddress;//地址
+    private String invoPhone;//开票联系电话
+    private String invoBank;//开票开户行
+    private String invoBankNum;//开票银行账号
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailer.java

@@ -87,4 +87,6 @@ public class BaseTrailer extends BaseEntity {
     private String useOrgName;
     @ApiModelProperty("单据编号")
     private String billNo;
+    @ApiModelProperty("单台开票金额")
+    private BigDecimal oneBillMoney; // 单台开票金额
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerDetailsVo.java

@@ -34,6 +34,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -102,6 +103,8 @@ public class BaseTrailerDetailsVo implements Vo {
 	private String useOrgSid;
 	@ApiModelProperty("分公司名称")
 	private String useOrgName;
+	@ApiModelProperty("单台开票金额")
+	private String oneBillMoney; // 单台开票金额
 	@ApiModelProperty("发票照片")
 	private List<CommonAppendixVo> invoicePic;
 	@ApiModelProperty("合格证照片")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerDto.java

@@ -92,6 +92,8 @@ public class BaseTrailerDto implements Dto {
 	private String billNo;
 	@ApiModelProperty("部门sid")
 	private String departmentSid;
+	@ApiModelProperty("单台开票金额")
+	private String oneBillMoney; // 单台开票金额
 	@ApiModelProperty("发票照片")
 	private List<CommonAppendixDto> invoicePic;
 	@ApiModelProperty("合格证照片")

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml

@@ -112,7 +112,16 @@
     </select>
 
     <select id="getDistributorList" resultType="com.yxt.anrui.base.api.basedistributor.app.BaseDistributorsListVo">
-        select sid, disName, pDistributorName, registNum, contract, mobile
+        select sid,
+               disName,
+               pDistributorName,
+               registNum,
+               contract,
+               mobile,
+               registDetailAddress,
+               invoPhone,
+               invoBank,
+               invoBankNum
         from base_distributor ${ew.customSqlSegment}
     </select>
 
@@ -217,8 +226,7 @@
 
     <select id="selectAllDisList" resultType="com.yxt.anrui.base.api.basedistributor.BaseDistributorListVo">
         SELECT sid,
-               disName AS 'name',
-                registNum,
+               disName AS 'name', registNum,
                registDetailAddress,
                invoPhone,
                invoBank,

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java

@@ -537,6 +537,26 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
             }
         }
         IPage<BaseDistributorsListVo> pagging = baseMapper.getDistributorList(page, qw);
+        List<BaseDistributorsListVo> baseDistributorListVos = pagging.getRecords();
+        for (BaseDistributorsListVo baseDistributorListVo : baseDistributorListVos) {
+            String openTickRemarks = "";
+            if (StringUtils.isNotBlank(openTickRemarks + baseDistributorListVo.getRegistNum())){
+                openTickRemarks = openTickRemarks + baseDistributorListVo.getRegistNum() + "；";
+            }
+            if (StringUtils.isNotBlank(baseDistributorListVo.getRegistDetailAddress())){
+                openTickRemarks = baseDistributorListVo.getRegistDetailAddress() + "；";
+            }
+            if (StringUtils.isNotBlank(baseDistributorListVo.getInvoPhone())){
+                openTickRemarks = baseDistributorListVo.getInvoPhone() + "；";
+            }
+            if (StringUtils.isNotBlank(baseDistributorListVo.getInvoBank())){
+                openTickRemarks = baseDistributorListVo.getInvoBank() + "；";
+            }
+            if (StringUtils.isNotBlank(baseDistributorListVo.getInvoBankNum())){
+                openTickRemarks = baseDistributorListVo.getInvoBankNum() + "；";
+            }
+            baseDistributorListVo.setBillInfo(openTickRemarks);
+        }
         PagerVo<BaseDistributorsListVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java

@@ -67,6 +67,10 @@ import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
+import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationDetailsVo;
+import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationFeign;
+import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDetailsVo;
+import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleFeign;
 import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
 import com.yxt.anrui.fin.api.kingdee.bdmaterial.BdMaterial;
 import com.yxt.anrui.fin.api.kingdee.saloutstock.SalOutStock;
@@ -146,6 +150,10 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
     private SysUserFeign sysUserFeign;
     @Autowired
     private ScmApplyInboundQueryFeign scmApplyInboundQueryFeign;
+    @Autowired
+    private FinBillVehicleFeign finBillVehicleFeign;
+    @Autowired
+    private FinBillApplicationFeign finBillApplicationFeign;
 
     private QueryWrapper<BaseTrailer> createQueryWrapper(BaseTrailerQuery query) {
         // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
@@ -510,9 +518,19 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
         }
         String vehSid = baseTrailer.getVehSid();
         BaseVehicle baseVehicle = baseVehicleService.fetchBySid(vehSid);
-        String vehicleState = baseVehicle.getVehicleState();
+        /*String vehicleState = baseVehicle.getVehicleState();
         if (!vehicleState.equals("0002")) {
             return rb.setMsg("此主车车辆库存状态不是出库，请重新选择");
+        }*/
+        FinBillVehicleDetailsVo finBillVehicleDetailsVo = finBillVehicleFeign.fetchByVehSid(vehSid).getData();
+        if (finBillVehicleDetailsVo == null){
+            return rb.setMsg("关联的主车未开票，不可出库");
+        }else {
+            String billAppSid = finBillVehicleDetailsVo.getBillAppSid();
+            FinBillApplicationDetailsVo finBillApplicationDetailsVo = finBillApplicationFeign.fetchDetailsBySid(billAppSid).getData();
+            if (!finBillApplicationDetailsVo.getNodeState().equals("已办结")){
+                return rb.setMsg("关联的主车未开票，不可出库");
+            }
         }
         BaseVehicleOutDetailsVo baseVehicleOutDetailsVo = baseVehicleOutService.selByOrgSidAndVehSid(baseTrailer.getUseOrgSid(), vehSid);
         BaseVehicleOut baseVehicleOut = new BaseVehicleOut();

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@@ -50,6 +50,7 @@ import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeig
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempDto;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
 import com.yxt.anrui.fin.api.finbillvehicle.AppInvoicingInfoVinNoVo;
+import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDetailsVo;
 import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleFeign;
 import com.yxt.anrui.portal.api.appsubsetversion.AppSubVersionVo;
 import com.yxt.anrui.portal.api.appsubsetversion.AppSubsetVersionFeign;
@@ -3842,8 +3843,8 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         List<BaseVehicleQKKPVo> records = page.getRecords();
         List<BaseVehicleQKKPVo> recordsNew = new ArrayList<>();
         for (BaseVehicleQKKPVo record : records) {
-            Integer count = finBillVehicleFeign.fetchByVehSid(record.getVehSid()).getData();
-            if (count == 0){
+            FinBillVehicleDetailsVo finBillVehicleDetailsVo = finBillVehicleFeign.fetchByVehSid(record.getVehSid()).getData();
+            if (finBillVehicleDetailsVo == null){
                 recordsNew.add(record);
             }
         }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/AppBillApplicationIInfoDto.java

@@ -67,5 +67,4 @@ public class AppBillApplicationIInfoDto implements Dto {
 
     @ApiModelProperty("用户部门路径")
     private String orgSidPath;
-
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/AppVinListDto.java

@@ -33,11 +33,8 @@ public class AppVinListDto implements Dto {
     private String openTickSid; // 开票名称sid
     @ApiModelProperty("开票名称")
     private String openTickName; // 开票名称
-    @ApiModelProperty("合格证状态key")
-    private String certificateStateKey; // 合格证状态key
-    @ApiModelProperty("合格证状态value")
-    private String certificateStateValue; // 合格证状态value
+    @ApiModelProperty("合格证")
+    private String certificateState; // 合格证
     @ApiModelProperty("开票信息")
-    private String openTickRemarks; // 开票信息
-
+    private String invoiceInfo; // 开票信息
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/AppVinListVo.java

@@ -24,4 +24,10 @@ public class AppVinListVo implements Vo {
 
     @ApiModelProperty("开票类型")
     private String billTypeKey;
+
+    @ApiModelProperty("开票信息")
+    private Boolean invoiceInfo;
+
+    @ApiModelProperty("合格证")
+    private Boolean certificateState;
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicleFeign.java

@@ -84,5 +84,5 @@ public interface FinBillVehicleFeign {
     @ApiOperation("根据车辆sid查询开票车辆")
     @GetMapping("/fetchByVehSid/{vehSid}")
     @ResponseBody
-    ResultBean<Integer> fetchByVehSid(@PathVariable("vehSid") String vehSid);
+    ResultBean<FinBillVehicleDetailsVo> fetchByVehSid(@PathVariable("vehSid") String vehSid);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleMapper.java

@@ -30,6 +30,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.fin.api.finbillvehicle.AppInvoicingInfoVinNoVo;
+import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDetailsVo;
 import org.apache.ibatis.annotations.*;
 import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicle;
 import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleVo;
@@ -70,8 +71,8 @@ public interface FinBillVehicleMapper extends BaseMapper<FinBillVehicle> {
 
     AppInvoicingInfoVinNoVo selDetailsByVinNo(@Param("vinNo") String vinNo);
 
-	@Select("select count(*) from fin_bill_vehicle where vehSid = #{vehSid} and state = '1'")
-	Integer fetchByVehSid(String vehSid);
+	@Select("select * from fin_bill_vehicle where vehSid = #{vehSid} and state = '1'")
+	FinBillVehicleDetailsVo fetchByVehSid(String vehSid);
 
 	@Update("UPDATE fin_bill_vehicle SET state = 0 WHERE billAppSid = #{sid}")
 	void updateByMainSid(String sid);

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleRest.java

@@ -101,9 +101,9 @@ public class FinBillVehicleRest implements FinBillVehicleFeign {
 	}
 
 	@Override
-	public ResultBean<Integer> fetchByVehSid(String vehSid) {
+	public ResultBean<FinBillVehicleDetailsVo> fetchByVehSid(String vehSid) {
 		ResultBean rb = ResultBean.fireFail();
-		Integer i = finBillVehicleService.fetchByVehSid(vehSid);
-		return rb.success().setData(i);
+		FinBillVehicleDetailsVo finBillVehicleDetailsVo = finBillVehicleService.fetchByVehSid(vehSid);
+		return rb.success().setData(finBillVehicleDetailsVo);
 	}
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleService.java

@@ -134,7 +134,7 @@ public class FinBillVehicleService extends MybatisBaseService<FinBillVehicleMapp
         return vo;
     }
 
-    public Integer fetchByVehSid(String vehSid) {
+    public FinBillVehicleDetailsVo fetchByVehSid(String vehSid) {
         return baseMapper.fetchByVehSid(vehSid);
     }
 

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java

@@ -215,12 +215,16 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
         if (StringUtils.isNotBlank(dto.getOrgPath())) {
             orgPath = dto.getOrgPath();
         } else {
-            //根据用户sid获取staffSid
+            SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(dto.getOrgSid()).getData();
+            if (sysOrganizationVo != null){
+                orgPath = sysOrganizationVo.getOrgSidPath();
+            }
+            /*//根据用户sid获取staffSid
             ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid());
             //根据staffSid获取用户的组织全路径
             ResultBean<SysStaffOrg> orgByStaffSid = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
             //用户的组织全路径
-            orgPath = orgByStaffSid.getData().getOrgSidPath();
+            orgPath = orgByStaffSid.getData().getOrgSidPath();*/
         }
         if (StringUtils.isBlank(dto.getSid())) { // 新增
             ScmApplyInbound inboundVehicle = new ScmApplyInbound();
@@ -282,6 +286,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
             }
             ScmApplyInbound scmApplyInbound = fetchBySid(dto.getSid());
             BeanUtil.copyProperties(dto, scmApplyInbound);
+            scmApplyInbound.setOrgSidPath(dto.getOrgPath());
             updateById(scmApplyInbound);
             scmFileService.delByMainSid(dto.getSid());
             if (scmFiles.size() > 0) {