diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/dto/mes/MesBackMaterialRequestDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/dto/mes/MesBackMaterialRequestDto.java index 998fd6f..cc63d31 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/dto/mes/MesBackMaterialRequestDto.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/dto/mes/MesBackMaterialRequestDto.java @@ -13,7 +13,6 @@ public class MesBackMaterialRequestDto { private String qty_unit_name; - @NotBlank(message = "数量不可为空") private String qty; private String remark; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java index 26b58e4..61098d7 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.nl.common.base.TableDataInfo; @@ -83,6 +84,7 @@ import static org.nl.wms.warehouse_manage.enums.IOSEnum.GROUP_PLATE_STATUS; * @author Liuxy * @since 2025-06-05 */ +@Slf4j @Service public class PdaIosInServiceImpl implements PdaIosInService { @@ -649,6 +651,7 @@ public class PdaIosInServiceImpl implements PdaIosInService { @Override @Transactional public PdaResponse vehicleInConfirm(JSONObject whereJson) { + log.info("vehicleInConfirm - {}", whereJson); //空载具入库 Sectattr sectattr = sectattrService.findById(whereJson.getString("sect_code")); if (sectattr == null) { diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/dao/mapper/SchBaseTaskMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/dao/mapper/SchBaseTaskMapper.xml index c80bafe..bc16889 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/dao/mapper/SchBaseTaskMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/dao/mapper/SchBaseTaskMapper.xml @@ -81,6 +81,8 @@ vehicle_code, point_code1, point_code2, + point_code3, + point_code4, (CASE task_status WHEN '0' THEN '生成' WHEN '1' THEN '申请' diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/impl/SchBasePointServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/impl/SchBasePointServiceImpl.java index 1dfc6cb..2c0cf5f 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/impl/SchBasePointServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/impl/SchBasePointServiceImpl.java @@ -373,7 +373,7 @@ public class SchBasePointServiceImpl extends ServiceImpl schBasePointList = pointMapper.selectList(new LambdaQueryWrapper() - .eq(SchBasePoint::getExt_point_code, deviceCode)); + .eq(SchBasePoint::getExt_point_code, deviceCode).or().eq(SchBasePoint::getPoint_code, deviceCode)); if(schBasePointList.isEmpty()){ return null; }