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

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

master
dimengzhe 1 week ago
parent
b415abef95
commit
369450e081
3 changed files with 8 additions and 8 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. 2
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyMapper.xml
  3. 12
      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> selectGcSzByBillNo(String billNo);
List<ReturnPushVo> selectGcSzByBillNo(@Param("billNo") String billNo,@Param("vinSid") String vinSid);
}

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

@ -96,6 +96,6 @@
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 ba.billNo = #{billNo} order by bo.id asc
where bo.materialTypeKey != '001' and ba.billNo = #{billNo} and bo.vinSid = #{vinSid} order by bo.id asc
</select>
</mapper>

12
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())) {
String temporaryNumZc = String.format("%02d", j);
salesReturnDetailDto.setBillNo(returnPushVo.getBillNo() + "-" + temporaryNumZc);
List<ReturnPushVo> returnPushVos = baseMapper.selectGcSzByBillNo(returnPushVo.getBillNo());
List<ReturnPushVo> returnPushVos = baseMapper.selectGcSzByBillNo(returnPushVo.getBillNo(),vehSid);
returnPushVos.removeAll(Collections.singleton(null));
for (int m = 0; m < returnPushVos.size(); m++) {
if (m == 0) {
@ -736,7 +736,7 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
}
break;
} else {
List<ReturnPushVo> returnPushVos = baseMapper.selectGcSzByBillNo(returnPushVo.getBillNo());
List<ReturnPushVo> returnPushVos = baseMapper.selectGcSzByBillNo(returnPushVo.getBillNo(),vehSid);
returnPushVos.removeAll(Collections.singleton(null));
for (int m = 0; m < returnPushVos.size(); m++) {
if (m == 0) {
@ -754,7 +754,7 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
}else{
int x = 1;
String temporaryNumGcOrSz = String.format("%02d", x);
List<ReturnPushVo> returnPushVos = baseMapper.selectGcSzByBillNo(returnPushVo.getBillNo());
List<ReturnPushVo> returnPushVos = baseMapper.selectGcSzByBillNo(returnPushVo.getBillNo(),vehSid);
returnPushVos.removeAll(Collections.singleton(null));
for (int m = 0; m < returnPushVos.size(); m++) {
ReturnPushVo returnPushVo1 = returnPushVos.get(m);
@ -1525,7 +1525,7 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
if (l.getMaterialCode().equals(returnPushVo.getMaterialCode())) {
String temporaryNumZc = String.format("%02d", j);
salesReturnDetailDto.setBillNo(returnPushVo.getBillNo() + "-" + temporaryNumZc);
List<ReturnPushVo> returnPushVos =baseMapper.selectGcSzByBillNo(returnPushVo.getBillNo());
List<ReturnPushVo> returnPushVos =baseMapper.selectGcSzByBillNo(returnPushVo.getBillNo(),vehSid);
returnPushVos.removeAll(Collections.singleton(null));
for (int m = 0; m < returnPushVos.size(); m++) {
if (m == 0) {
@ -1540,7 +1540,7 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
}
break;
} else {
List<ReturnPushVo> returnPushVos = baseMapper.selectGcSzByBillNo(returnPushVo.getBillNo());
List<ReturnPushVo> returnPushVos = baseMapper.selectGcSzByBillNo(returnPushVo.getBillNo(),vehSid);
returnPushVos.removeAll(Collections.singleton(null));
for (int m = 0; m < returnPushVos.size(); m++) {
if (m == 0) {
@ -1558,7 +1558,7 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
}else{
int x = 1;
String temporaryNumGcOrSz = String.format("%02d", x);
List<ReturnPushVo> returnPushVos =baseMapper.selectGcSzByBillNo(returnPushVo.getBillNo());
List<ReturnPushVo> returnPushVos =baseMapper.selectGcSzByBillNo(returnPushVo.getBillNo(),vehSid);
returnPushVos.removeAll(Collections.singleton(null));
for (int m = 0; m < returnPushVos.size(); m++) {
ReturnPushVo returnPushVo1 = returnPushVos.get(m);

Write Preview
Loading…
Cancel
Save