suojin
/
jonhon-mes-svr
22
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

物流更新

Browse Source
liweidong
liweidong-hj 2 weeks ago
parent cca0fbdf4c
commit 0cee5eef70
1 changed files with 3 additions and 3 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. 6
      blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/IOrderBoxServiceImpl.java

6
blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/IOrderBoxServiceImpl.java
Unescape View File

@ -947,7 +947,7 @@ public class IOrderBoxServiceImpl implements IOrderBoxService {
* 校验订单是否已绑定 * 校验订单是否已绑定
* <p>避免同一订单被重复绑定到不同箱条码</p> * <p>避免同一订单被重复绑定到不同箱条码</p>
* *
* @param cardNo 订单ID列表 * @param cardNoList 订单ID列表
* @return R<?> 校验结果 * @return R<?> 校验结果
*/ */
private R<?> checkOrderIdBoundStatus(List<String> cardNoList) { private R<?> checkOrderIdBoundStatus(List<String> cardNoList) {
@ -1452,7 +1452,7 @@ public class IOrderBoxServiceImpl implements IOrderBoxService {
List<CenterTeam> list = iCenterTeamService.list(new LambdaQueryWrapper<CenterTeam>() List<CenterTeam> list = iCenterTeamService.list(new LambdaQueryWrapper<CenterTeam>()
.select(CenterTeam::getWcId, CenterTeam::getTsId) .select(CenterTeam::getWcId, CenterTeam::getTsId)
.eq(workPlan.getSubsidiaryTeam()!=null&&!workPlan.getSubsidiaryTeam().equals(""),CenterTeam::getTsId, (workPlan.getMakeTeam())) .eq(workPlan.getSubsidiaryTeam()!=null&&!workPlan.getSubsidiaryTeam().equals(""),CenterTeam::getTsId, (workPlan.getMakeTeam()))
.eq(workPlan==null||workPlan.getSubsidiaryTeam().equals(""),CenterTeam::getTsId, (workPlan.getMakeTeam()))); .eq(workPlan.getSubsidiaryTeam()==null||workPlan.getSubsidiaryTeam().equals(""),CenterTeam::getTsId, (workPlan.getMakeTeam())));
if (list == null || list.size() == 0) { if (list == null || list.size() == 0) {
return R.fail(orderCardNo + "车间订单班次查询作业中心异常"); return R.fail(orderCardNo + "车间订单班次查询作业中心异常");
} else { } else {
@ -1475,7 +1475,7 @@ public class IOrderBoxServiceImpl implements IOrderBoxService {
List<CenterTeam> list = iCenterTeamService.list(new LambdaQueryWrapper<CenterTeam>() List<CenterTeam> list = iCenterTeamService.list(new LambdaQueryWrapper<CenterTeam>()
.select(CenterTeam::getWcId, CenterTeam::getTsId) .select(CenterTeam::getWcId, CenterTeam::getTsId)
.eq(workPlan.getSubsidiaryTeam()!=null&&!workPlan.getSubsidiaryTeam().equals(""),CenterTeam::getTsId, (workPlan.getMakeTeam())) .eq(workPlan.getSubsidiaryTeam()!=null&&!workPlan.getSubsidiaryTeam().equals(""),CenterTeam::getTsId, (workPlan.getMakeTeam()))
.eq(workPlan==null||workPlan.getSubsidiaryTeam().equals(""),CenterTeam::getTsId, (workPlan.getMakeTeam()))); .eq(workPlan.getSubsidiaryTeam()==null||workPlan.getSubsidiaryTeam().equals(""),CenterTeam::getTsId, (workPlan.getMakeTeam())));
if (list == null || list.size() == 0) { if (list == null || list.size() == 0) {
return R.fail(orderCardNo + "车间订单班次查询作业中心异常"); return R.fail(orderCardNo + "车间订单班次查询作业中心异常");
} else { } else {

Write Preview
Loading…
Cancel
Save