单据删除问题,批次号大小写不匹配问题

fengcang
anthonyywj2 3 years ago
parent f097bd9674
commit 628f3bccee

@ -63,10 +63,7 @@ import org.springframework.web.context.request.ServletRequestAttributes;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.validation.Valid;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;
@RestController
@ -893,7 +890,7 @@ public class WareHouseController {
if (!StrUtil.emptyIfNull(originUdiEntity.getUdi()).equals(StrUtil.emptyIfNull(udiEntity.getUdi()))) {
continue;
}
if (!StrUtil.emptyIfNull(originUdiEntity.getBatchNo()).equals(StrUtil.emptyIfNull(udiEntity.getBatchNo()))) {
if (!StrUtil.emptyIfNull(originUdiEntity.getBatchNo()).toUpperCase(Locale.ROOT).equals(StrUtil.emptyIfNull(udiEntity.getBatchNo()).toUpperCase(Locale.ROOT))) {
continue;
}
if (!StrUtil.emptyIfNull(originUdiEntity.getProduceDate()).equals(StrUtil.emptyIfNull(udiEntity.getProduceDate()))) {

@ -44,5 +44,5 @@ public interface BussinessLocalTypeDao {
*
* @param action
*/
boolean selectPreInByOrderType(String action);
Boolean selectPreInByOrderType(String action);
}

@ -671,7 +671,10 @@ public class OrderServiceImpl implements OrderService {
* @return
*/
private boolean isPreInOrder(OrderEntity orderEntity) {
return bussinessLocalTypeDao.selectPreInByOrderType(orderEntity.getAction());
Boolean isTrue = bussinessLocalTypeDao.selectPreInByOrderType(orderEntity.getAction());
if (isTrue == null)
return false;
return isTrue;
}
@Override

@ -1,4 +1,4 @@
spring.profiles.active=dev
spring.profiles.active=pro
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver

Loading…
Cancel
Save