diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsShelfController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsShelfController.java index b781401c2..e64c5d8d8 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsShelfController.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsShelfController.java @@ -245,16 +245,15 @@ public class BasicdataGoodsShelfController extends BladeController { ExcelUtil.export(response, "货架数据" + DateUtil.time(), "货架数据表", list, BasicdataGoodsShelfExcel.class); } - /** - * 导入货架前置条件 - */ - @GetMapping("/preImport") - @ApiOperationSupport(order = 12) - @ApiOperation(value = "导入货架", notes = "传入ids") - public R preImport(Long ids) { - basicdataGoodsShelfService.saveIds(ids); - return R.success("操作成功"); - } +// /** +// * 导入货架前置条件 +// */ +// @GetMapping("/preImport") +// @ApiOperationSupport(order = 12) +// @ApiOperation(value = "导入货架", notes = "传入ids") +// public R preImport(Long ids) { +// return R.success("操作成功"); +// } /** * 导入货架 diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataGoodsShelfService.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataGoodsShelfService.java index b7e133446..0e9bc1d01 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataGoodsShelfService.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataGoodsShelfService.java @@ -137,8 +137,5 @@ public interface IBasicdataGoodsShelfService extends BaseService data); - /** - * 货架 ids - */ - void saveIds(Long ids); + } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsShelfServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsShelfServiceImpl.java index 39ed8e8e1..04fa58f0f 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsShelfServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsShelfServiceImpl.java @@ -94,7 +94,6 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl basicdataGoodsShelfEntities = baseMapper.selectList(new QueryWrapper().lambda() .eq(BasicdataGoodsShelfEntity::getGoodsShelfName, datum.getGoodsShelfName()) .eq(BasicdataGoodsShelfEntity::getWarehouseId, myCurrentWarehouse.getId()) - .eq(BasicdataGoodsShelfEntity::getGoodsAreaId, Long.valueOf(ids)) .eq(BasicdataGoodsShelfEntity::getIsDeleted, 0) ); if (!basicdataGoodsShelfEntities.isEmpty()) { @@ -894,7 +892,6 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl>>>>>>>>>>>{}", copy); assert copy != null; copy.setWarehouseId(myCurrentWarehouse.getId()); - copy.setGoodsAreaId(Long.valueOf(ids)); arrayList.add(copy); } // 根据对象的value属性进行去重 @@ -902,10 +899,7 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl products, String ColumnNum) {