aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'demand: tms-运单管理-转件管理-校验逻辑修改' (#321) from aike into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/321
This commit is contained in:
heyu 2026-03-04 17:51:55 +08:00
commit 3fafb4ffa2
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillTransferController.java
View File

@ -169,7 +169,7 @@ public class EmisWaybillTransferController extends EmisBaseController
if(!CollectionUtils.isEmpty(problemList)){
for(EmisWaybillProblemInfo problemInfo : problemList){
Integer problemType = problemInfo.getProblemType();
if(problemType != null && (problemType == 151 || problemType == 170 || problemType == 173)){
if (problemType != null && (problemType == 151 || problemType == 170 || problemType == 173) && mainBillCode.equals(problemInfo.getBillCode())) {
String problemTypeName = "";
if(problemType == 151){
problemTypeName = "面单删除";
@ -191,7 +191,7 @@ public class EmisWaybillTransferController extends EmisBaseController
if(!CollectionUtils.isEmpty(subProblemList)){
for(EmisWaybillProblemInfo problemInfo : subProblemList){
Integer problemType = problemInfo.getProblemType();
if(problemType != null && (problemType == 151 || problemType == 170 || problemType == 173)){
if (problemType != null && (problemType == 151 || problemType == 170 || problemType == 173) && billCode.equals(problemInfo.getBillCode())) {
String problemTypeName = "";
if(problemType == 151){
problemTypeName = "面单删除";