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

下推销售退货单添加挂车和上装的逻辑

master
dimengzhe 1 week ago
parent
8cf9ea7fa1
commit
36159ff518
4 changed files with 125 additions and 7 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-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyMapper.java
  2. 7
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyMapper.xml
  3. 7
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyRest.java
  4. 116
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java

2
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyMapper.java
View File

@ -92,4 +92,6 @@ public interface BusSalesOrderReturnVehApplyMapper extends BaseMapper<BusSalesOr
ReturnPushVo selectByVinSid(String vehSid);
List<ReturnPushVo> selectByBillNo(String billNo);
List<ReturnPushVo> selectGcSzByVinSid(String vehSid);
}

7
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyMapper.xml
View File

@ -91,4 +91,11 @@
left join anrui_base.base_vehicle_out_apply ba on ba.sid = bo.mainSid
where bo.materialTypeKey = '001' and ba.billNo = #{billNo} order by bo.id asc
</select>
<select id="selectGcSzByVinSid" resultType="com.yxt.anrui.buscenter.api.bussalesorderreturnveh.ReturnPushVo">
SELECT ba.billNo,bo.materialCode,bo.typeKey
FROM anrui_base.base_vehicle_out bo
left join anrui_base.base_vehicle_out_apply ba on ba.sid = bo.mainSid
where bo.materialTypeKey != '001' and bo.vinSid = #{vehSid} order by bo.id asc
</select>
</mapper>

7
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyRest.java
View File

@ -28,6 +28,7 @@ package com.yxt.anrui.buscenter.biz.bussalesorderreturnvehapply;
import cn.hutool.core.bean.BeanUtil;
import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.*;
import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.flow.*;
import com.yxt.anrui.fin.api.kingdee.push.SalOutStockPushSalReturnStock;
import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
import com.yxt.common.core.query.PagerQuery;
@ -143,5 +144,11 @@ public class BusSalesOrderReturnVehApplyRest implements BusSalesOrderReturnVehAp
return busSalesOrderReturnVehApplyService.listPageByOrderSid(orderSid);
}
@GetMapping("/getPush")
@ResponseBody
public SalOutStockPushSalReturnStock getPush(){
return busSalesOrderReturnVehApplyService.getPush();
}
}

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

@ -711,22 +711,58 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
if (returnPushVo != null) {
salesReturnDetailDto.setFMaterialId(returnPushVo.getMaterialCode());
salesReturnDetailDto.setBillNo(returnPushVo.getBillNo());
if("002".equals(returnPushVo.getTypeKey())){//贷款车
if ("002".equals(returnPushVo.getTypeKey())) {//贷款车
int j = 1;
List<ReturnPushVo> returnPushVoList = baseMapper.selectByBillNo(returnPushVo.getBillNo());
returnPushVoList.removeAll(Collections.singleton(null));
if(!returnPushVoList.isEmpty()){
if (!returnPushVoList.isEmpty()) {
for (int k = 0; k < returnPushVoList.size(); k++) {
ReturnPushVo l = returnPushVoList.get(k);
if(l.getMaterialCode().equals(returnPushVo.getMaterialCode())){
if (l.getMaterialCode().equals(returnPushVo.getMaterialCode())) {
String temporaryNumZc = String.format("%02d", j);
salesReturnDetailDto.setBillNo(returnPushVo.getBillNo()+ "-"+temporaryNumZc);
j++;
salesReturnDetailDto.setBillNo(returnPushVo.getBillNo() + "-" + temporaryNumZc);
List<ReturnPushVo> returnPushVos = baseMapper.selectGcSzByVinSid(vehSid);
returnPushVos.removeAll(Collections.singleton(null));
for (int m = 0; m < returnPushVos.size(); m++) {
if (m == 0) {
j++;
}
ReturnPushVo returnPushVo1 = returnPushVos.get(m);
SalOutStockPushSalReturnStock.SalesReturnDetailDto salesReturnDetailDto1 = new SalOutStockPushSalReturnStock.SalesReturnDetailDto();
salesReturnDetailDto1.setFMaterialId(returnPushVo1.getMaterialCode());
String temporaryNumGcOrSz = String.format("%02d", j);
salesReturnDetailDto1.setBillNo(returnPushVo1.getBillNo() + "-" + temporaryNumGcOrSz);
salesReturnDetailDtoList.add(salesReturnDetailDto1);
}
break;
} else {
List<ReturnPushVo> returnPushVos = baseMapper.selectGcSzByVinSid(vehSid);
returnPushVos.removeAll(Collections.singleton(null));
for (int m = 0; m < returnPushVos.size(); m++) {
if (m == 0) {
j++;
}
}
}
j++;
}
}
}else{
int x = 1;
String temporaryNumGcOrSz = String.format("%02d", x);
List<ReturnPushVo> returnPushVos = baseMapper.selectGcSzByVinSid(vehSid);
returnPushVos.removeAll(Collections.singleton(null));
for (int m = 0; m < returnPushVos.size(); m++) {
ReturnPushVo returnPushVo1 = returnPushVos.get(m);
SalOutStockPushSalReturnStock.SalesReturnDetailDto salesReturnDetailDto1 = new SalOutStockPushSalReturnStock.SalesReturnDetailDto();
salesReturnDetailDto1.setFMaterialId(returnPushVo1.getMaterialCode());
salesReturnDetailDto1.setBillNo(returnPushVo1.getBillNo() + "-" + temporaryNumGcOrSz);
salesReturnDetailDtoList.add(salesReturnDetailDto1);
}
}
salesReturnDetailDtoList.add(salesReturnDetailDto);
}
@ -778,8 +814,6 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
scmVehRebateFeign.delByVehSid2(vehSid, busSalesOrderReturnVehApply.getUseOrgSid(), "029");
}
//------------------------修改车辆持久状态--------------------------
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.fetchBySid(busSalesOrderReturnVehDetailsVo.getBusVinSid());
@ -1469,4 +1503,72 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
WordUtils.doc2pdf(wordPath, targetPath, pdfName, userName);
return "/template/" + dateStr + "/" + pdfName;
}
public SalOutStockPushSalReturnStock getPush() {
String vehSid = "04d23e1c-0b61-4213-8bac-d78984017791";
SalOutStockPushSalReturnStock salOutStockPushSalReturnStock = new SalOutStockPushSalReturnStock();
List<SalOutStockPushSalReturnStock.SalesReturnDetailDto> salesReturnDetailDtoList = new ArrayList<>();
//对已经出库的车推送销售退货单----------2025-04-03
SalOutStockPushSalReturnStock.SalesReturnDetailDto salesReturnDetailDto = new SalOutStockPushSalReturnStock.SalesReturnDetailDto();
ReturnPushVo returnPushVo = baseMapper.selectByVinSid(vehSid);
if (returnPushVo != null) {
salesReturnDetailDto.setFMaterialId(returnPushVo.getMaterialCode());
salesReturnDetailDto.setBillNo(returnPushVo.getBillNo());
if ("002".equals(returnPushVo.getTypeKey())) {//贷款车
int j = 1;
List<ReturnPushVo> returnPushVoList = baseMapper.selectByBillNo(returnPushVo.getBillNo());
returnPushVoList.removeAll(Collections.singleton(null));
if (!returnPushVoList.isEmpty()) {
for (int k = 0; k < returnPushVoList.size(); k++) {
ReturnPushVo l = returnPushVoList.get(k);
if (l.getMaterialCode().equals(returnPushVo.getMaterialCode())) {
String temporaryNumZc = String.format("%02d", j);
salesReturnDetailDto.setBillNo(returnPushVo.getBillNo() + "-" + temporaryNumZc);
List<ReturnPushVo> returnPushVos = baseMapper.selectGcSzByVinSid(vehSid);
returnPushVos.removeAll(Collections.singleton(null));
for (int m = 0; m < returnPushVos.size(); m++) {
if (m == 0) {
j++;
}
ReturnPushVo returnPushVo1 = returnPushVos.get(m);
SalOutStockPushSalReturnStock.SalesReturnDetailDto salesReturnDetailDto1 = new SalOutStockPushSalReturnStock.SalesReturnDetailDto();
salesReturnDetailDto1.setFMaterialId(returnPushVo1.getMaterialCode());
String temporaryNumGcOrSz = String.format("%02d", j);
salesReturnDetailDto.setBillNo(returnPushVo1.getBillNo() + "-" + temporaryNumGcOrSz);
}
break;
} else {
List<ReturnPushVo> returnPushVos = baseMapper.selectGcSzByVinSid(vehSid);
returnPushVos.removeAll(Collections.singleton(null));
for (int m = 0; m < returnPushVos.size(); m++) {
if (m == 0) {
j++;
}
}
}
j++;
}
}
}else{
int x = 1;
String temporaryNumGcOrSz = String.format("%02d", x);
List<ReturnPushVo> returnPushVos = baseMapper.selectGcSzByVinSid(vehSid);
returnPushVos.removeAll(Collections.singleton(null));
for (int m = 0; m < returnPushVos.size(); m++) {
ReturnPushVo returnPushVo1 = returnPushVos.get(m);
SalOutStockPushSalReturnStock.SalesReturnDetailDto salesReturnDetailDto1 = new SalOutStockPushSalReturnStock.SalesReturnDetailDto();
salesReturnDetailDto1.setFMaterialId(returnPushVo1.getMaterialCode());
salesReturnDetailDto.setBillNo(returnPushVo1.getBillNo() + "-" + temporaryNumGcOrSz);
}
}
salesReturnDetailDtoList.add(salesReturnDetailDto);
}
salOutStockPushSalReturnStock.setStockDtoList(salesReturnDetailDtoList);
return salOutStockPushSalReturnStock;
}
}

Write Preview
Loading…
Cancel
Save