diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseUpdownGoodsClient.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseUpdownGoodsClient.java index e329787a8..32309c6de 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseUpdownGoodsClient.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseUpdownGoodsClient.java @@ -51,9 +51,20 @@ public interface IWarehouseUpdownGoodsClient { @GetMapping(TOP + "/selectCountByAllo") Integer selectCountByAllo(@RequestParam Long alloId); + /** + *货架有无物品 + */ + @GetMapping(TOP + "/selectCountByshelf") + Integer selectCountByshelf(@RequestParam List shelfId); + /** *查询货物所在货位信息 */ @GetMapping(TOP + "/selectMsgBywrap") String selectMsgBywrap(@RequestParam Long wrapId); + /** + *货区有无物品 + */ + @GetMapping(TOP + "/selectCountByArea") + Integer selectCountByArea(@RequestParam List ids); } diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseUpdownGoodsLogVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseUpdownGoodsLogVO.java index fa51c4f1a..f43fa8137 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseUpdownGoodsLogVO.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseUpdownGoodsLogVO.java @@ -37,6 +37,12 @@ public class WarehouseUpdownGoodsLogVO extends WarehouseUpdownGoodsLogEntity { * */ @ApiModelProperty(name = "操作员",notes = "") private String createUserName; + + /** + * 上架类型 + * */ + @ApiModelProperty(name = "上架类型",notes = "1-上架，2-下架") + private String bindingTypeName; /** * 物料编码 * */ diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAreaController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAreaController.java index caa6175e1..fd0a2dd7c 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAreaController.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAreaController.java @@ -132,9 +132,10 @@ public class BasicdataGoodsAreaController extends BladeController { @PostMapping("/remove") @ApiOperationSupport(order = 7) @ApiOperation(value = "逻辑删除", notes = "传入ids") - public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam List ids) { - boolean result = basicdataGoodsAreaService.removeGoodsArea(ids); - return R.status(result); + public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { + List longs = Func.toLongList(ids); + R msg = basicdataGoodsAreaService.removeGoodsArea(longs); + return msg; } /** 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 0abafa9bb..0f8af634f 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 @@ -33,6 +33,7 @@ import org.springblade.core.secure.BladeUser; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.Func; import org.springframework.web.bind.annotation.*; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -140,10 +141,11 @@ public class BasicdataGoodsShelfController extends BladeController { @PostMapping("/remove") @ApiOperationSupport(order = 7) @ApiOperation(value = "逻辑删除", notes = "传入ids") - public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam List ids) { + public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { + List longs = Func.toLongList(ids); // return R.status(basicdataGoodsShelfService.deleteLogic(Func.toLongList(ids))); - boolean result = basicdataGoodsShelfService.removeGoodsShelf(ids); - return R.status(result); + R msg = basicdataGoodsShelfService.removeGoodsShelf(longs); + return msg; } @@ -153,7 +155,7 @@ public class BasicdataGoodsShelfController extends BladeController { @GetMapping("/export-BasicdataGoodsShelf") @ApiOperationSupport(order = 9) @ApiOperation(value = "导出数据", notes = "传入BasicdataGoodsShelf") - public void exportBasicdataGoodsShelf(@ApiIgnore @RequestParam Map BasicdataGoodsShelf, BladeUser bladeUser, HttpServletResponse response) { + public void exportBasicdataGoodsShelf(@ApiIgnore @RequestParam Map BasicdataGoodsShelf, HttpServletResponse response) { QueryWrapper queryWrapper = Condition.getQueryWrapper(BasicdataGoodsShelf, BasicdataGoodsShelfEntity.class); //if (!AuthUtil.isAdministrator()) { // queryWrapper.lambda().eq(BasicdataGoodsShelf::getTenantId, bladeUser.getTenantId()); diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataGoodsAreaService.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataGoodsAreaService.java index 184fbcaed..261d99c0f 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataGoodsAreaService.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataGoodsAreaService.java @@ -26,6 +26,7 @@ import com.logpm.basicdata.vo.BasicdataNodeVO; import com.logpm.basicdata.vo.BasicdataWarehouseVO; import org.springblade.core.mp.base.BaseService; import org.springblade.core.mp.support.Query; +import org.springblade.core.tool.api.R; import java.util.List; import java.util.Map; @@ -81,7 +82,7 @@ public interface IBasicdataGoodsAreaService extends BaseService ids); + R removeGoodsArea(List ids); List stockUp(BasicdataGoodsAreaEntity warehouseWarehouse); 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 c570ce88c..b5b42f54f 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 @@ -90,7 +90,7 @@ public interface IBasicdataGoodsShelfService extends BaseService ids); + R removeGoodsShelf(List ids); // boolean getTemplate(Map params,HttpServletResponse response); diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java index c99469435..40f67e903 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java @@ -17,15 +17,22 @@ package com.logpm.basicdata.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; +import com.logpm.basicdata.entity.BasicdataGoodsAllocationEntity; import com.logpm.basicdata.entity.BasicdataGoodsAreaEntity; +import com.logpm.basicdata.entity.BasicdataGoodsShelfEntity; import com.logpm.basicdata.excel.BasicdataGoodsAreaExcel; +import com.logpm.basicdata.mapper.BasicdataGoodsAllocationMapper; import com.logpm.basicdata.mapper.BasicdataGoodsAreaMapper; +import com.logpm.basicdata.mapper.BasicdataGoodsShelfMapper; import com.logpm.basicdata.service.IBasicdataGoodsAreaService; import com.logpm.basicdata.vo.BasicdataGoodsAreaVO; import com.logpm.basicdata.vo.BasicdataNodeVO; import com.logpm.basicdata.vo.BasicdataWarehouseVO; +import com.logpm.warehouse.feign.IWarehouseUpdownGoodsClient; import lombok.AllArgsConstructor; +import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.Wrapper; @@ -50,6 +57,11 @@ public class BasicdataGoodsAreaServiceImpl extends BaseServiceImpl selectWarehouseGoodsAreaPage(IPage page, BasicdataGoodsAreaVO basicdataGoodsAreaVO) { @@ -99,21 +111,33 @@ public class BasicdataGoodsAreaServiceImpl extends BaseServiceImpl ids) { + public R removeGoodsArea(List ids) { //删除货区，查看货区下是否存在货架信息 - if (Func.isEmpty(ids)){ - log.error("参数错误：{}"+ids); - return false; - } - boolean result = false; - for (String id : ids) { - result = SqlHelper.retBool(basicdataGoodsAreaMapper.removeGoodsArea(id)); - if (!result){ - TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); - return false; - } +// if (Func.isEmpty(ids)){ +// log.error("参数错误：{}"+ids); +// return false; +// } +// boolean result = false; +// for (String id : ids) { +// result = SqlHelper.retBool(basicdataGoodsAreaMapper.removeGoodsArea(id)); +// if (!result){ +// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); +// return false; +// } +// } + //查询该货区有无货物 + Integer integer = warehouseUpdownGoodsClient.selectCountByArea(ids); + if (integer>0){ + return R.fail("有货物,无法删除"); } - return result; + //删除对应下面的货架货位 + basicdataGoodsShelfMapper.delete(new QueryWrapper().lambda() + .in(BasicdataGoodsShelfEntity::getGoodsAreaId,ids) + ); + basicdataGoodsAllocationMapper.delete(new QueryWrapper().lambda() + .in(BasicdataGoodsAllocationEntity::getGoodsAreaId,ids) + ); + return R.status(this.deleteLogic(ids)); } @Override 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 6847d4edb..b4dbcc6be 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 @@ -205,20 +205,30 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl ids) { - if (Func.isEmpty(ids)) { - log.error("参数错误:{}" + ids); - return false; - } - boolean result = false; - for (String id : ids) { - result = SqlHelper.retBool(basicdataGoodsShelfMapper.removeGoodsShelf(id)); - if (!result) { - TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); - return false; - } + public R removeGoodsShelf(List ids) { +// if (Func.isEmpty(ids)) { +// log.error("参数错误:{}" + ids); +// return false; +// } +// boolean result = false; +// for (String id : ids) { +// result = SqlHelper.retBool(basicdataGoodsShelfMapper.removeGoodsShelf(id)); +// if (!result) { +// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); +// return false; +// } +// } + //查询该货架有无货物 + Integer integer = warehouseUpdownGoodsClient.selectCountByshelf(ids); + if (integer>0){ + return R.fail("有货物,无法删除"); } - return result; + //删除对应下面的货位 + basicdataGoodsAllocationMapper.delete(new QueryWrapper().lambda() + .in(BasicdataGoodsAllocationEntity::getGoodsShelfId,ids) + ); + int i = basicdataGoodsShelfMapper.deleteBatchIds(ids); + return i>0?R.success("删除成功"):R.fail("删除失败"); } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseGoodsAllocationController.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseGoodsAllocationController.java index 3ec79cbca..ece6571d3 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseGoodsAllocationController.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseGoodsAllocationController.java @@ -185,6 +185,27 @@ public class WarehouseGoodsAllocationController extends BladeController { return warehouseUpdownTypeService.upShelfOrder(upShelfOrderList,allocationCode); } + /** + * 货位上架 包条上架 + */ + @PostMapping("/upPackage") + @ApiOperationSupport(order = 3) + @ApiOperation(value = "货位上架 包条上架", notes = "传入warehouseGoodsAllocation") + public R upPackage(@RequestBody UpdownTypeDTO updownTypeDTO) { + //取出服务号 + List upShelfOrderList = updownTypeDTO.getUpShelfOrderList(); + String allocationCode = updownTypeDTO.getTargetAllocation(); + if (upShelfOrderList.size()==0 || StringUtil.isBlank(allocationCode)){ + return R.fail("参数不全"); + }else { + List ServiceNumberList = upShelfOrderList.stream().map(UpShelfOrderDTO::getServiceNumber).collect(Collectors.toList()); + //将改服务号的所有订单查出 + upShelfOrderList = warehouseGoodsAllocationService.selectorderByServiceNumber(ServiceNumberList); + + } + return warehouseUpdownTypeService.upShelfOrder(upShelfOrderList,allocationCode); + } + /** * 货位 可视化查询 */ diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseUpdownGoodsClient.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseUpdownGoodsClient.java index ee64331f1..b609e1879 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseUpdownGoodsClient.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseUpdownGoodsClient.java @@ -34,9 +34,21 @@ public class WarehouseUpdownGoodsClient implements IWarehouseUpdownGoodsClient { return warehouseUpdownGoodsService.selectCountByAllo(alloId); } + @Override + @GetMapping(TOP + "/selectCountByshelf") + public Integer selectCountByshelf(List shelfId) { + return warehouseUpdownGoodsService.selectCountByshelf(shelfId); + } + @Override @GetMapping(TOP + "/selectMsgBywrap") public String selectMsgBywrap(Long wrapId) { return warehouseUpdownGoodsService.selectMsgBywrap(wrapId); } + + @Override + @GetMapping(TOP + "/selectCountByArea") + public Integer selectCountByArea(List ids) { + return warehouseUpdownGoodsService.selectCountByArea(ids); + } } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsLogMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsLogMapper.xml index 161fcec6c..3916a4ce3 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsLogMapper.xml +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsLogMapper.xml @@ -76,7 +76,16 @@ and ldpl.order_package_code like concat('%',#{param.orderPackageCode},'%') - lwup.is_deleted = 0 + + and lbm.material_name like concat('%',#{param.materialName},'%') + + + and lbm.sku like concat('%',#{param.sku},'%') + + + and binding_type.bindingType = #{param.bindingType} + + and lwup.is_deleted = 0 diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownGoodsService.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownGoodsService.java index 0645f531c..c427bf48b 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownGoodsService.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownGoodsService.java @@ -89,4 +89,18 @@ public interface IWarehouseUpdownGoodsService extends BaseService shelfId); + /** + * 查询改货区有无货物 + * + * @param ids + * @return + */ + Integer selectCountByArea(List ids); } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsServiceImpl.java index 34eb007e3..fc597a04d 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsServiceImpl.java @@ -137,4 +137,20 @@ public class WarehouseUpdownGoodsServiceImpl extends BaseServiceImpl shelfId) { + return baseMapper.selectCount(new QueryWrapper().lambda() + .eq(WarehouseUpdownGoodsEntity::getIsDeleted,0) + .in(WarehouseUpdownGoodsEntity::getShelfId,shelfId) + ).intValue(); + } + + @Override + public Integer selectCountByArea(List ids) { + return baseMapper.selectCount(new QueryWrapper().lambda() + .eq(WarehouseUpdownGoodsEntity::getIsDeleted,0) + .in(WarehouseUpdownGoodsEntity::getAreaId,ids) + ).intValue(); + } + } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/wrapper/WarehouseUpdownGoodsLogWrapper.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/wrapper/WarehouseUpdownGoodsLogWrapper.java index e12d26e32..c23a8566d 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/wrapper/WarehouseUpdownGoodsLogWrapper.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/wrapper/WarehouseUpdownGoodsLogWrapper.java @@ -40,6 +40,9 @@ public class WarehouseUpdownGoodsLogWrapper extends BaseEntityWrapper