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

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

master
dimengzhe 1 week ago
parent
36159ff518
commit
b415abef95
3 changed files with 14 additions and 12 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified 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. 4
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyMapper.xml
  3. 20
      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

@ -93,5 +93,5 @@ public interface BusSalesOrderReturnVehApplyMapper extends BaseMapper<BusSalesOr
List<ReturnPushVo> selectByBillNo(String billNo); List<ReturnPushVo> selectByBillNo(String billNo);
List<ReturnPushVo> selectGcSzByVinSid(String vehSid); List<ReturnPushVo> selectGcSzByBillNo(String billNo);
} }

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

@ -92,10 +92,10 @@
where bo.materialTypeKey = '001' and ba.billNo = #{billNo} order by bo.id asc where bo.materialTypeKey = '001' and ba.billNo = #{billNo} order by bo.id asc
</select> </select>
<select id="selectGcSzByVinSid" resultType="com.yxt.anrui.buscenter.api.bussalesorderreturnveh.ReturnPushVo"> <select id="selectGcSzByBillNo" resultType="com.yxt.anrui.buscenter.api.bussalesorderreturnveh.ReturnPushVo">
SELECT ba.billNo,bo.materialCode,bo.typeKey SELECT ba.billNo,bo.materialCode,bo.typeKey
FROM anrui_base.base_vehicle_out bo FROM anrui_base.base_vehicle_out bo
left join anrui_base.base_vehicle_out_apply ba on ba.sid = bo.mainSid 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 where bo.materialTypeKey != '001' and ba.billNo = #{billNo} order by bo.id asc
</select> </select>
</mapper> </mapper>

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

@ -721,7 +721,7 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
if (l.getMaterialCode().equals(returnPushVo.getMaterialCode())) { if (l.getMaterialCode().equals(returnPushVo.getMaterialCode())) {
String temporaryNumZc = String.format("%02d", j); String temporaryNumZc = String.format("%02d", j);
salesReturnDetailDto.setBillNo(returnPushVo.getBillNo() + "-" + temporaryNumZc); salesReturnDetailDto.setBillNo(returnPushVo.getBillNo() + "-" + temporaryNumZc);
List<ReturnPushVo> returnPushVos = baseMapper.selectGcSzByVinSid(vehSid); List<ReturnPushVo> returnPushVos = baseMapper.selectGcSzByBillNo(returnPushVo.getBillNo());
returnPushVos.removeAll(Collections.singleton(null)); returnPushVos.removeAll(Collections.singleton(null));
for (int m = 0; m < returnPushVos.size(); m++) { for (int m = 0; m < returnPushVos.size(); m++) {
if (m == 0) { if (m == 0) {
@ -736,7 +736,7 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
} }
break; break;
} else { } else {
List<ReturnPushVo> returnPushVos = baseMapper.selectGcSzByVinSid(vehSid); List<ReturnPushVo> returnPushVos = baseMapper.selectGcSzByBillNo(returnPushVo.getBillNo());
returnPushVos.removeAll(Collections.singleton(null)); returnPushVos.removeAll(Collections.singleton(null));
for (int m = 0; m < returnPushVos.size(); m++) { for (int m = 0; m < returnPushVos.size(); m++) {
if (m == 0) { if (m == 0) {
@ -754,7 +754,7 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
}else{ }else{
int x = 1; int x = 1;
String temporaryNumGcOrSz = String.format("%02d", x); String temporaryNumGcOrSz = String.format("%02d", x);
List<ReturnPushVo> returnPushVos = baseMapper.selectGcSzByVinSid(vehSid); List<ReturnPushVo> returnPushVos = baseMapper.selectGcSzByBillNo(returnPushVo.getBillNo());
returnPushVos.removeAll(Collections.singleton(null)); returnPushVos.removeAll(Collections.singleton(null));
for (int m = 0; m < returnPushVos.size(); m++) { for (int m = 0; m < returnPushVos.size(); m++) {
ReturnPushVo returnPushVo1 = returnPushVos.get(m); ReturnPushVo returnPushVo1 = returnPushVos.get(m);
@ -1506,7 +1506,7 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
public SalOutStockPushSalReturnStock getPush() { public SalOutStockPushSalReturnStock getPush() {
String vehSid = "04d23e1c-0b61-4213-8bac-d78984017791"; String vehSid = "59598466-eee6-4b42-ada7-97406a236286";
SalOutStockPushSalReturnStock salOutStockPushSalReturnStock = new SalOutStockPushSalReturnStock(); SalOutStockPushSalReturnStock salOutStockPushSalReturnStock = new SalOutStockPushSalReturnStock();
List<SalOutStockPushSalReturnStock.SalesReturnDetailDto> salesReturnDetailDtoList = new ArrayList<>(); List<SalOutStockPushSalReturnStock.SalesReturnDetailDto> salesReturnDetailDtoList = new ArrayList<>();
//对已经出库的车推送销售退货单----------2025-04-03 //对已经出库的车推送销售退货单----------2025-04-03
@ -1525,7 +1525,7 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
if (l.getMaterialCode().equals(returnPushVo.getMaterialCode())) { if (l.getMaterialCode().equals(returnPushVo.getMaterialCode())) {
String temporaryNumZc = String.format("%02d", j); String temporaryNumZc = String.format("%02d", j);
salesReturnDetailDto.setBillNo(returnPushVo.getBillNo() + "-" + temporaryNumZc); salesReturnDetailDto.setBillNo(returnPushVo.getBillNo() + "-" + temporaryNumZc);
List<ReturnPushVo> returnPushVos = baseMapper.selectGcSzByVinSid(vehSid); List<ReturnPushVo> returnPushVos =baseMapper.selectGcSzByBillNo(returnPushVo.getBillNo());
returnPushVos.removeAll(Collections.singleton(null)); returnPushVos.removeAll(Collections.singleton(null));
for (int m = 0; m < returnPushVos.size(); m++) { for (int m = 0; m < returnPushVos.size(); m++) {
if (m == 0) { if (m == 0) {
@ -1535,11 +1535,12 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
SalOutStockPushSalReturnStock.SalesReturnDetailDto salesReturnDetailDto1 = new SalOutStockPushSalReturnStock.SalesReturnDetailDto(); SalOutStockPushSalReturnStock.SalesReturnDetailDto salesReturnDetailDto1 = new SalOutStockPushSalReturnStock.SalesReturnDetailDto();
salesReturnDetailDto1.setFMaterialId(returnPushVo1.getMaterialCode()); salesReturnDetailDto1.setFMaterialId(returnPushVo1.getMaterialCode());
String temporaryNumGcOrSz = String.format("%02d", j); String temporaryNumGcOrSz = String.format("%02d", j);
salesReturnDetailDto.setBillNo(returnPushVo1.getBillNo() + "-" + temporaryNumGcOrSz); salesReturnDetailDto1.setBillNo(returnPushVo.getBillNo() + "-" + temporaryNumGcOrSz);
salesReturnDetailDtoList.add(salesReturnDetailDto1);
} }
break; break;
} else { } else {
List<ReturnPushVo> returnPushVos = baseMapper.selectGcSzByVinSid(vehSid); List<ReturnPushVo> returnPushVos = baseMapper.selectGcSzByBillNo(returnPushVo.getBillNo());
returnPushVos.removeAll(Collections.singleton(null)); returnPushVos.removeAll(Collections.singleton(null));
for (int m = 0; m < returnPushVos.size(); m++) { for (int m = 0; m < returnPushVos.size(); m++) {
if (m == 0) { if (m == 0) {
@ -1557,13 +1558,14 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
}else{ }else{
int x = 1; int x = 1;
String temporaryNumGcOrSz = String.format("%02d", x); String temporaryNumGcOrSz = String.format("%02d", x);
List<ReturnPushVo> returnPushVos = baseMapper.selectGcSzByVinSid(vehSid); List<ReturnPushVo> returnPushVos =baseMapper.selectGcSzByBillNo(returnPushVo.getBillNo());
returnPushVos.removeAll(Collections.singleton(null)); returnPushVos.removeAll(Collections.singleton(null));
for (int m = 0; m < returnPushVos.size(); m++) { for (int m = 0; m < returnPushVos.size(); m++) {
ReturnPushVo returnPushVo1 = returnPushVos.get(m); ReturnPushVo returnPushVo1 = returnPushVos.get(m);
SalOutStockPushSalReturnStock.SalesReturnDetailDto salesReturnDetailDto1 = new SalOutStockPushSalReturnStock.SalesReturnDetailDto(); SalOutStockPushSalReturnStock.SalesReturnDetailDto salesReturnDetailDto1 = new SalOutStockPushSalReturnStock.SalesReturnDetailDto();
salesReturnDetailDto1.setFMaterialId(returnPushVo1.getMaterialCode()); salesReturnDetailDto1.setFMaterialId(returnPushVo1.getMaterialCode());
salesReturnDetailDto.setBillNo(returnPushVo1.getBillNo() + "-" + temporaryNumGcOrSz); salesReturnDetailDto1.setBillNo(returnPushVo1.getBillNo() + "-" + temporaryNumGcOrSz);
salesReturnDetailDtoList.add(salesReturnDetailDto1);
} }
} }
salesReturnDetailDtoList.add(salesReturnDetailDto); salesReturnDetailDtoList.add(salesReturnDetailDto);

Write Preview
Loading…
Cancel
Save