|
|
@ -144,8 +144,8 @@ public class MJXLTask extends AbstractTask { |
|
|
|
if ((ObjectUtil.isEmpty(schBasePoint.getVehicle_type()) || |
|
|
|
materialType.equals(schBasePoint.getVehicle_type())) |
|
|
|
&& "2".equals(schBasePoint.getPoint_status()) |
|
|
|
&& schBasePoint.getVehicle_qty() < 3) { |
|
|
|
// && (device_code.equals(schBasePoint.getExt_point_code())||ObjectUtil.isEmpty(schBasePoint.getExt_point_code()))) {
|
|
|
|
&& schBasePoint.getVehicle_qty() < 3 |
|
|
|
&& (device_code.equals(schBasePoint.getExt_point_code())||ObjectUtil.isEmpty(schBasePoint.getExt_point_code()))) { |
|
|
|
//新增逻辑,同一列只能放相同物料
|
|
|
|
boolean flag=true; |
|
|
|
List<String> list=new ArrayList<>(); |
|
|
|