Browse Source

优化

zhanglei
God 2 years ago
parent
commit
0a650ef9fc
  1. 12
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
  2. 6
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillapplication/BusBillApplicationDto.java
  3. 3
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyDto.java
  4. 3
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationMapper.java
  5. 14
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationService.java
  6. 3
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillfile/BusBillFileMapper.java
  7. 4
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillfile/BusBillFileService.java
  8. 11
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java

12
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java

@ -1834,11 +1834,19 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
//单价 //单价
fEntity.setFPrice(dto.getPrice()); fEntity.setFPrice(dto.getPrice());
if ("002".equals(dto.getMaterialTypeKey())) { if ("002".equals(dto.getMaterialTypeKey())) {
//物料编码 //挂车物料编码
if ("G".equals(dto.getMaterialCode().substring(dto.getMaterialCode().length() - 1))) {
fEntity.setFMaterialID(dto.getMaterialCode()); fEntity.setFMaterialID(dto.getMaterialCode());
} else {
fEntity.setFMaterialID(dto.getMaterialCode() + "G");
}
} else if ("003".equals(dto.getMaterialTypeKey())) { } else if ("003".equals(dto.getMaterialTypeKey())) {
//物料编码 //上装物料编码
if ("SZ".equals(dto.getMaterialCode().substring(dto.getMaterialCode().length() - 2))) {
fEntity.setFMaterialID(dto.getMaterialCode()); fEntity.setFMaterialID(dto.getMaterialCode());
} else {
fEntity.setFMaterialID(dto.getMaterialCode() + "SZ");
}
} }
//仓库id //仓库id
fEntity.setFStockID("ARZSCK"); fEntity.setFStockID("ARZSCK");

6
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillapplication/BusBillApplicationDto.java

@ -65,12 +65,6 @@ public class BusBillApplicationDto implements Dto {
private String applyDate; private String applyDate;
@ApiModelProperty("流程状态") @ApiModelProperty("流程状态")
private String nodeState; private String nodeState;
/* @ApiModelProperty("流程定义的id")
private String procDefId;
@ApiModelProperty("环节定义的sid")
private String nodeSid;
@ApiModelProperty("流程实例的sid")
private String procInstSid;*/
@ApiModelProperty(value = "是否延迟开票") @ApiModelProperty(value = "是否延迟开票")
private String isDelayBill; private String isDelayBill;
@ApiModelProperty(value = "是否高低开") @ApiModelProperty(value = "是否高低开")

3
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyDto.java

@ -26,6 +26,7 @@
package com.yxt.anrui.buscenter.api.busdeliveredapply; package com.yxt.anrui.buscenter.api.busdeliveredapply;
import com.yxt.anrui.buscenter.api.busbillapplication.BusBillApplicationDto;
import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.BusDeliveredApplyDetailsDto; import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.BusDeliveredApplyDetailsDto;
import com.yxt.common.core.dto.Dto; import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
@ -104,4 +105,6 @@ public class BusDeliveredApplyDto implements Dto {
private String distributorPriceTwo; private String distributorPriceTwo;
@ApiModelProperty("是否开票(0开票,1不开票)") @ApiModelProperty("是否开票(0开票,1不开票)")
private String isInvoicing; private String isInvoicing;
@ApiModelProperty("开票信息")
private BusBillApplicationDto busBillApplicationDto;
} }

3
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationMapper.java

@ -69,4 +69,7 @@ public interface BusBillApplicationMapper extends BaseMapper<BusBillApplication>
@Update("update bus_bill_application set nodeState = '终止' where sid = #{businessSid}") @Update("update bus_bill_application set nodeState = '终止' where sid = #{businessSid}")
void updateZZ(String businessSid); void updateZZ(String businessSid);
@Select("select * from bus_bill_application where cksqSid = #{ckSid}")
BusBillApplicationVo selectByCkSid(String ckSid);
} }

14
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationService.java

@ -382,4 +382,18 @@ public class BusBillApplicationService extends MybatisBaseService<BusBillApplica
} }
return vo; return vo;
} }
public ResultBean delAllByCkSid(String ckSid) {
ResultBean rb = ResultBean.fireFail();
BusBillApplicationVo busBillApplicationVo = baseMapper.selectByCkSid(ckSid);
if (busBillApplicationVo == null){
return rb.success();
}
//查询该sid中是否有流程不是待提交的
deleteBySid(busBillApplicationVo.getSid());
busBillVehicleService.delByBillAppSid(busBillApplicationVo.getSid());
busBillTrailerService.delByBillAppSid(busBillApplicationVo.getSid());
busBillFileService.deleteByFinAppSid(busBillApplicationVo.getSid());
return rb.success();
}
} }

3
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillfile/BusBillFileMapper.java

@ -80,4 +80,7 @@ public interface BusBillFileMapper extends BaseMapper<BusBillFile> {
List<BusBillFileVo> fetchclmmhtBySid(String sid); List<BusBillFileVo> fetchclmmhtBySid(String sid);
List<BusBillFileVo> fetchFileByBillSid(@Param("sid") String sid); List<BusBillFileVo> fetchFileByBillSid(@Param("sid") String sid);
@Delete("delete from bus_bill_file where billAppSid = #{dtoSid}")
void deleteByFinAppSid(String dtoSid);
} }

4
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillfile/BusBillFileService.java

@ -163,4 +163,8 @@ public class BusBillFileService extends MybatisBaseService<BusBillFileMapper, Bu
public List<BusBillFileVo> fetchclmmhtBySid(String sid) { public List<BusBillFileVo> fetchclmmhtBySid(String sid) {
return baseMapper.fetchclmmhtBySid(sid); return baseMapper.fetchclmmhtBySid(sid);
} }
public void deleteByFinAppSid(String dtoSid) {
baseMapper.deleteByFinAppSid(dtoSid);
}
} }

11
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java

@ -52,6 +52,7 @@ import com.yxt.anrui.base.api.commoncontract.CommonContractFeign;
import com.yxt.anrui.base.common.enums.CertificState; import com.yxt.anrui.base.common.enums.CertificState;
import com.yxt.anrui.base.common.utils.Rule; import com.yxt.anrui.base.common.utils.Rule;
import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.BusArrearsCarryVehicleApply; import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.BusArrearsCarryVehicleApply;
import com.yxt.anrui.buscenter.api.busbillapplication.BusBillApplicationDto;
import com.yxt.anrui.buscenter.api.busdelivered.AppDeliveredDetailsVo; import com.yxt.anrui.buscenter.api.busdelivered.AppDeliveredDetailsVo;
import com.yxt.anrui.buscenter.api.busdelivered.BusDelivered; import com.yxt.anrui.buscenter.api.busdelivered.BusDelivered;
import com.yxt.anrui.buscenter.api.busdelivered.DeliveredDictVo; import com.yxt.anrui.buscenter.api.busdelivered.DeliveredDictVo;
@ -76,6 +77,7 @@ import com.yxt.anrui.buscenter.api.bussalesordersubmit.SubmitVo;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDetailsVo; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDetailsVo;
import com.yxt.anrui.buscenter.api.busvehicleinformationhandover.BusVehicleInformationHandoverDto; import com.yxt.anrui.buscenter.api.busvehicleinformationhandover.BusVehicleInformationHandoverDto;
import com.yxt.anrui.buscenter.biz.busbillapplication.BusBillApplicationService;
import com.yxt.anrui.buscenter.biz.busdelivered.BusDeliveredService; import com.yxt.anrui.buscenter.biz.busdelivered.BusDeliveredService;
import com.yxt.anrui.buscenter.biz.busdeliveredapplydetails.BusDeliveredApplyDetailsService; import com.yxt.anrui.buscenter.biz.busdeliveredapplydetails.BusDeliveredApplyDetailsService;
import com.yxt.anrui.buscenter.biz.busdelivereddetailsdiscount.BusDeliveredDetailsDiscountService; import com.yxt.anrui.buscenter.biz.busdelivereddetailsdiscount.BusDeliveredDetailsDiscountService;
@ -226,6 +228,8 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
private FinCollectionConfirmationFeign finCollectionConfirmationFeign; private FinCollectionConfirmationFeign finCollectionConfirmationFeign;
@Autowired @Autowired
private BaseVehicleStateFeign baseVehicleStateFeign; private BaseVehicleStateFeign baseVehicleStateFeign;
@Autowired
private BusBillApplicationService busBillApplicationService;
/** /**
@ -369,6 +373,9 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
} }
save(busDeliveredApply); save(busDeliveredApply);
dtoSid = busDeliveredApply.getSid(); dtoSid = busDeliveredApply.getSid();
if ("0".equals(dto.getIsInvoicing())){//开票
busBillApplicationService.saveOrUpdateDto(dto.getBusBillApplicationDto());
}
} else { } else {
BusDeliveredApply busDeliveredApply = fetchBySid(dtoSid); BusDeliveredApply busDeliveredApply = fetchBySid(dtoSid);
if (busDeliveredApply == null) { if (busDeliveredApply == null) {
@ -390,6 +397,10 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
if (dtoList.size() > 0) { if (dtoList.size() > 0) {
busDeliveredApplyDetailsService.saveList(dtoList, busDeliveredApply.getSid()); busDeliveredApplyDetailsService.saveList(dtoList, busDeliveredApply.getSid());
} }
busBillApplicationService.delAllByCkSid(dtoSid);
if ("0".equals(dto.getIsInvoicing())){//开票
busBillApplicationService.saveOrUpdateDto(dto.getBusBillApplicationDto());
}
} }
return rb.success().setData(dtoSid); return rb.success().setData(dtoSid);
} }

Loading…
Cancel
Save