Merge branch 'dev' into pre-production

add:修复入库的时候查询非包码数据
1 changed files with 1 additions and 0 deletions
--- a/blade-service/logpm-business/src/main/java/com/logpm/business/service/impl/BusinessPreOrderServiceImpl.java
+++ b/blade-service/logpm-business/src/main/java/com/logpm/business/service/impl/BusinessPreOrderServiceImpl.java
@ -222,6 +222,7 @@ public class BusinessPreOrderServiceImpl extends BaseServiceImpl<BusinessPreOrde
 				// 查询配送车次下面所有的包件
 				LambdaQueryWrapper<BusinessPreOrderEntity> queryWrapper = new LambdaQueryWrapper<>();
 				queryWrapper.eq(BusinessPreOrderEntity::getDistrCarNumber, distrCarNumber);
+				queryWrapper.ne(BusinessPreOrderEntity::getConditions, 3);
 				queryWrapper.eq(BusinessPreOrderEntity::getIsDeleted, 0);
 				List<BusinessPreOrderEntity> list = baseMapper.selectList(queryWrapper);
 				if (list.isEmpty()) {
Author	SHA1	Message	Date
pref_mail@163.com	651c7fb912	Merge branch 'dev' into pre-production	12 hours ago
pref_mail@163.com	0105a5d496	add:修复入库的时候查询非包码数据	12 hours ago