diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/controller/AcsToWmsController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/controller/AcsToWmsController.java index d686676..c0fa19d 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/controller/AcsToWmsController.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/controller/AcsToWmsController.java @@ -24,6 +24,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("/api/wms") @Slf4j +@SaIgnore public class AcsToWmsController { @Autowired private AcsToWmsService acsToWmsService; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java index 358ea1b..acc28a0 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java @@ -277,7 +277,9 @@ public class PdaIosInServiceImpl implements PdaIosInService { @Override public List getSect(JSONObject whereJson) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(Sectattr.class) - .ne(Sectattr::getSect_type_attr,"09"); + .ne(Sectattr::getSect_type_attr,"09") + .eq(Sectattr::getIs_delete,"0") + .eq(Sectattr::getIs_used,"1"); List sectList = iSectattrService.list(queryWrapper); List selectList = new ArrayList<>(); sectList.forEach(r -> diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/StIvtMoveinvServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/StIvtMoveinvServiceImpl.java index 5621668..1f1be56 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/StIvtMoveinvServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/StIvtMoveinvServiceImpl.java @@ -301,8 +301,19 @@ public class StIvtMoveinvServiceImpl extends ServiceImpl