yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

优化退车申请

master
fanzongzhe 6 months ago
parent
3dcea4ca6b
commit
202a6d9cd6
6 changed files with 53 additions and 41 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java
  2. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.java
  3. 3
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml
  4. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutRest.java
  5. 6
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
  6. 79
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java
View File

@ -91,7 +91,7 @@ public interface BaseVehicleOutFeign {
@ApiOperation("退车成功后查询出库记录")
@PostMapping("/selectByVehReturn")
@ResponseBody
public ResultBean<BaseSalesReturnVo> selectByVehReturn(@RequestParam("vinSid") String vinSid, @RequestParam("contractNo") String contractNo);
public ResultBean<List<BaseSalesReturnVo>> selectByVehReturn(@RequestParam("vinSid") String vinSid, @RequestParam("contractNo") String contractNo);
@ApiOperation("退车成功后删除出库记录")
@PostMapping("/deleteByVehReturn")

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.java
View File

@ -48,7 +48,7 @@ public interface BaseVehicleOutMapper extends BaseMapper<BaseVehicleOut> {
List<BaseVehicleOutVoExeclNew> listExcelNew(@Param(Constants.WRAPPER) QueryWrapper<BaseVehicleOutVoExeclNew> qw);
BaseSalesReturnVo selectByVehReturn(@Param("vinSid") String vinSid, @Param("contractNo") String contractNo);
List<BaseSalesReturnVo> selectByVehReturn(@Param("vinSid") String vinSid, @Param("contractNo") String contractNo);
void deleteByVehReturn(@Param("vinSid") String vinSid, @Param("mainSid") String mainSid);
}

3
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml
View File

@ -246,6 +246,7 @@
AND ba.contractNo = #{contractNo}
</select>
<update id="deleteByVehReturn">
UPDATE base_vehicle_out
SET isDelete = 1,
@ -253,4 +254,4 @@
WHERE vinSid = #{vinSid}
AND mainSid = #{mainSid}
</update>
</mapper>
</mapper>

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutRest.java
View File

@ -126,7 +126,7 @@ public class BaseVehicleOutRest implements BaseVehicleOutFeign {
}
@Override
public ResultBean<BaseSalesReturnVo> selectByVehReturn(String vinSid, String contractNo) {
public ResultBean<List<BaseSalesReturnVo>> selectByVehReturn(String vinSid, String contractNo) {
return baseVehicleOutService.selectByVehReturn(vinSid,contractNo);
}

6
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
View File

@ -2408,9 +2408,9 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
return rb.success();
}
public ResultBean<BaseSalesReturnVo> selectByVehReturn(String vinSid, String contractNo) {
ResultBean<BaseSalesReturnVo> rb = ResultBean.fireFail();
BaseSalesReturnVo vo = baseMapper.selectByVehReturn(vinSid, contractNo);
public ResultBean<List<BaseSalesReturnVo>> selectByVehReturn(String vinSid, String contractNo) {
ResultBean<List<BaseSalesReturnVo>> rb = ResultBean.fireFail();
List<BaseSalesReturnVo> vo = baseMapper.selectByVehReturn(vinSid, contractNo);
return rb.success().setData(vo);
}

79
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java
View File

@ -698,34 +698,39 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
salesReturnDetailDto.setFOwnerId(vehicleSelectVo.getOrgCode());
busSalesReturnOrdersDto.setSaleOrgId(vehicleSelectVo.getOrgCode());
}
BaseSalesReturnVo returnVo = baseVehicleOutFeign.selectByVehReturn(vehSid, busSalesOrderReturnVehApply.getContractNo()).getData();
if (null != returnVo) {
if (StringUtils.isNotBlank(returnVo.getMainSid())) {
baseVehicleOutFeign.deleteByVehReturn(vehSid, returnVo.getMainSid());
List<BaseSalesReturnVo> returnVos = baseVehicleOutFeign.selectByVehReturn(vehSid, busSalesOrderReturnVehApply.getContractNo()).getData();
if (null != returnVos) {
if (!returnVos.isEmpty()) {
for (BaseSalesReturnVo returnVo : returnVos) {
if (StringUtils.isNotBlank(returnVo.getMainSid())) {
baseVehicleOutFeign.deleteByVehReturn(vehSid, returnVo.getMainSid());
}
if (StringUtils.isNotBlank(returnVo.getMaterialCode())) {
String realQty = "1";
busSalesReturnOrdersDto.setMaterialCode(returnVo.getMaterialCode());
busSalesReturnOrdersDto.setIsFree("0");
busSalesReturnOrdersDto.setRealQty(realQty);
salesReturnDetailDto.setFMaterialId(returnVo.getMaterialCode());
salesReturnDetailDto.setFIsFree("false");
salesReturnDetailDto.setFRealQty(realQty);
salesReturnDetailDto.setFUnitID("liang");
salesReturnDetailDto.setFDeliveryDate(sdf.format(new Date()));
salesReturn.setFDate(sdf.format(new Date()));
}
if (StringUtils.isNotBlank(returnVo.getCustomerNo())) {
salesReturn.setCustomerNo(returnVo.getCustomerNo());
busSalesReturnOrdersDto.setCustomerNo(returnVo.getCustomerNo());
}
if (StringUtils.isNotBlank(billNo)) {
salesReturn.setBillNo(billNo);
busSalesReturnOrdersDto.setBillNo(billNo);
}
busSalesReturnOrdersService.saveReturnOrders(busSalesReturnOrdersDto);
salesReturnDetailDto.setFOwnerTypeId("业务组织");
salesReturnDetails.add(salesReturnDetailDto);
}
}
if (StringUtils.isNotBlank(returnVo.getMaterialCode())) {
String realQty = "1";
busSalesReturnOrdersDto.setMaterialCode(returnVo.getMaterialCode());
busSalesReturnOrdersDto.setIsFree("0");
busSalesReturnOrdersDto.setRealQty(realQty);
salesReturnDetailDto.setFMaterialId(returnVo.getMaterialCode());
salesReturnDetailDto.setFIsFree("false");
salesReturnDetailDto.setFRealQty(realQty);
salesReturnDetailDto.setFUnitID("liang");
salesReturnDetailDto.setFDeliveryDate(sdf.format(new Date()));
salesReturn.setFDate(sdf.format(new Date()));
}
if (StringUtils.isNotBlank(returnVo.getCustomerNo())) {
salesReturn.setCustomerNo(returnVo.getCustomerNo());
busSalesReturnOrdersDto.setCustomerNo(returnVo.getCustomerNo());
}
if (StringUtils.isNotBlank(billNo)) {
salesReturn.setBillNo(billNo);
busSalesReturnOrdersDto.setBillNo(billNo);
}
busSalesReturnOrdersService.saveReturnOrders(busSalesReturnOrdersDto);
salesReturnDetailDto.setFOwnerTypeId("业务组织");
salesReturnDetails.add(salesReturnDetailDto);
}
}
}
@ -742,12 +747,7 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.fetchBySid(busSalesOrderReturnVehDetailsVo.getBusVinSid());
vehicleList.add(busSalesOrderVehicle);
}
//----------------------------推送金蝶销售退货单---------------------------------
salesReturnDetails.removeAll(Collections.singleton(null));
if (!salesReturnDetails.isEmpty()) {
salesReturn.setSalesReturnDetails(salesReturnDetails);
finKingDeeFeign.draftSalesReturnOrders(salesReturn);
}
//------------------------修改车辆持久状态--------------------------
vehicleList.removeAll(Collections.singleton(null));
if (!vehicleList.isEmpty()) {
@ -801,6 +801,17 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
stateQuery.setBusVinSid(busVinSidListState);
ResultBean updateStateResultBean = finUncollectedReceivablesDetailedFeign.updateKxState(stateQuery);
}
try {
//----------------------------推送金蝶销售退货单---------------------------------
salesReturnDetails.removeAll(Collections.singleton(null));
if (!salesReturnDetails.isEmpty()) {
salesReturn.setSalesReturnDetails(salesReturnDetails);
finKingDeeFeign.draftSalesReturnOrders(salesReturn);
}
} catch (Exception e) {
e.printStackTrace();
}
}
return rb.success().setData(resultBean.getData());
} else {
@ -1299,4 +1310,4 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
vo.setBusSalesOrderReturnVehs(busSalesOrderReturnVehDetailsVos);
return rb.success().setData(vo);
}
}
}

Write Preview
Loading…
Cancel
Save