1.货架删除bug

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<Long> shelfId);
+
 	/**
 	 *查询货物所在货位信息
 	 */
 	@GetMapping(TOP + "/selectMsgBywrap")
 	String selectMsgBywrap(@RequestParam Long wrapId);
+	/**
+	 *货区有无物品
+	 */
+	@GetMapping(TOP + "/selectCountByArea")
+	Integer selectCountByArea(@RequestParam List<Long> ids);
 }

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;
 	/**
 	 * 物料编码
 	 * */

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<String> ids) {
-		boolean result = basicdataGoodsAreaService.removeGoodsArea(ids);
-		return R.status(result);
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		List<Long> longs = Func.toLongList(ids);
+		R msg = basicdataGoodsAreaService.removeGoodsArea(longs);
+		return msg;
 	}
 
 	/**

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<String> ids) {
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		List<Long> 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<String, Object> BasicdataGoodsShelf, BladeUser bladeUser, HttpServletResponse response) {
+	public void exportBasicdataGoodsShelf(@ApiIgnore @RequestParam Map<String, Object> BasicdataGoodsShelf,  HttpServletResponse response) {
 		QueryWrapper<BasicdataGoodsShelfEntity> queryWrapper = Condition.getQueryWrapper(BasicdataGoodsShelf, BasicdataGoodsShelfEntity.class);
 		//if (!AuthUtil.isAdministrator()) {
 		//	queryWrapper.lambda().eq(BasicdataGoodsShelf::getTenantId, bladeUser.getTenantId());

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<BasicdataGoodsAr
 	 * @param ids
 	 * @return
 	 */
-    boolean removeGoodsArea(List<String> ids);
+    R removeGoodsArea(List<Long> ids);
 
     List<BasicdataGoodsAreaVO> stockUp(BasicdataGoodsAreaEntity warehouseWarehouse);
 

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataGoodsShelfService.java

@@ -90,7 +90,7 @@ public interface IBasicdataGoodsShelfService extends BaseService<BasicdataGoodsS
 	 * @param ids
 	 * @return
 	 */
-	boolean removeGoodsShelf(List<String> ids);
+	R removeGoodsShelf(List<Long> ids);
 
 
 //	boolean getTemplate(Map<String,Object> params,HttpServletResponse response);

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<BasicdataGood
 
 	private BasicdataGoodsAreaMapper basicdataGoodsAreaMapper;
 
+	private BasicdataGoodsShelfMapper basicdataGoodsShelfMapper;
+
+	private BasicdataGoodsAllocationMapper basicdataGoodsAllocationMapper;
+
+	private IWarehouseUpdownGoodsClient warehouseUpdownGoodsClient;
 
 	@Override
 	public IPage<BasicdataGoodsAreaVO> selectWarehouseGoodsAreaPage(IPage<BasicdataGoodsAreaVO> page, BasicdataGoodsAreaVO basicdataGoodsAreaVO) {
@@ -99,21 +111,33 @@ public class BasicdataGoodsAreaServiceImpl extends BaseServiceImpl<BasicdataGood
 
 	@Override
 	@Transactional
-	public boolean removeGoodsArea(List<String> ids) {
+	public R removeGoodsArea(List<Long> 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<BasicdataGoodsShelfEntity>().lambda()
+			.in(BasicdataGoodsShelfEntity::getGoodsAreaId,ids)
+		);
+		basicdataGoodsAllocationMapper.delete(new QueryWrapper<BasicdataGoodsAllocationEntity>().lambda()
+			.in(BasicdataGoodsAllocationEntity::getGoodsAreaId,ids)
+		);
+		return R.status(this.deleteLogic(ids));
 	}
 
 	@Override

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsShelfServiceImpl.java

@@ -205,20 +205,30 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
 	}
 
 	@Override
-	public boolean removeGoodsShelf(List<String> 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<Long> 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<BasicdataGoodsAllocationEntity>().lambda()
+			.in(BasicdataGoodsAllocationEntity::getGoodsShelfId,ids)
+		);
+		int i = basicdataGoodsShelfMapper.deleteBatchIds(ids);
+		return i>0?R.success("删除成功"):R.fail("删除失败");
 	}
 
 

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<UpShelfOrderDTO> upShelfOrderList = updownTypeDTO.getUpShelfOrderList();
+		String allocationCode = updownTypeDTO.getTargetAllocation();
+		if (upShelfOrderList.size()==0 || StringUtil.isBlank(allocationCode)){
+			return R.fail("参数不全");
+		}else {
+			List<String> ServiceNumberList = upShelfOrderList.stream().map(UpShelfOrderDTO::getServiceNumber).collect(Collectors.toList());
+			//将改服务号的所有订单查出
+			upShelfOrderList = warehouseGoodsAllocationService.selectorderByServiceNumber(ServiceNumberList);
+
+		}
+		return  warehouseUpdownTypeService.upShelfOrder(upShelfOrderList,allocationCode);
+	}
+
 	/**
 	 * 货位 可视化查询
 	 */

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<Long> 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<Long> ids) {
+		return warehouseUpdownGoodsService.selectCountByArea(ids);
+	}
 }

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsLogMapper.xml

@@ -76,7 +76,16 @@
             <if test="param.orderPackageCode!=null and param.orderPackageCode!=''">
                 and ldpl.order_package_code like concat('%',#{param.orderPackageCode},'%')
             </if>
-            lwup.is_deleted = 0
+            <if test="param.materialName!=null and param.materialName!=''">
+                and lbm.material_name like concat('%',#{param.materialName},'%')
+            </if>
+            <if test="param.sku!=null and param.sku!=''">
+                and lbm.sku like concat('%',#{param.sku},'%')
+            </if>
+            <if test="param.bindingType!=null and param.bindingType!=''">
+                and binding_type.bindingType = #{param.bindingType}
+            </if>
+            and lwup.is_deleted = 0
         </where>
 
     </select>

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownGoodsService.java

@@ -89,4 +89,18 @@ public interface IWarehouseUpdownGoodsService extends BaseService<WarehouseUpdow
 	 * @return
 	 */
     String selectMsgBywrap(Long wrapId);
+	/**
+	 * 查询改货架有无货物
+	 *
+	 * @param shelfId
+	 * @return
+	 */
+	Integer selectCountByshelf(List<Long> shelfId);
+	/**
+	 * 查询改货区有无货物
+	 *
+	 * @param ids
+	 * @return
+	 */
+	Integer selectCountByArea(List<Long> ids);
 }

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsServiceImpl.java

@@ -137,4 +137,20 @@ public class WarehouseUpdownGoodsServiceImpl extends BaseServiceImpl<WarehouseUp
 		return baseMapper.selectMsgBywrap(wrapId);
 	}
 
+	@Override
+	public Integer selectCountByshelf(List<Long> shelfId) {
+		return baseMapper.selectCount(new QueryWrapper<WarehouseUpdownGoodsEntity>().lambda()
+			.eq(WarehouseUpdownGoodsEntity::getIsDeleted,0)
+			.in(WarehouseUpdownGoodsEntity::getShelfId,shelfId)
+		).intValue();
+	}
+
+	@Override
+	public Integer selectCountByArea(List<Long> ids) {
+		return baseMapper.selectCount(new QueryWrapper<WarehouseUpdownGoodsEntity>().lambda()
+			.eq(WarehouseUpdownGoodsEntity::getIsDeleted,0)
+			.in(WarehouseUpdownGoodsEntity::getAreaId,ids)
+		).intValue();
+	}
+
 }

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/wrapper/WarehouseUpdownGoodsLogWrapper.java

@@ -40,6 +40,9 @@ public class WarehouseUpdownGoodsLogWrapper extends BaseEntityWrapper<WarehouseU
 	@Override
 	public WarehouseUpdownGoodsLogVO entityVO(WarehouseUpdownGoodsLogVO warehouseUpdownGoodsLogVO) {
 		warehouseUpdownGoodsLogVO.setCreateUserName(userCliient.userInfoById(warehouseUpdownGoodsLogVO.getCreateUser()).getData().getName());
+		warehouseUpdownGoodsLogVO.setBindingTypeName("上架");
+		if (warehouseUpdownGoodsLogVO.getBindingType().equals("2")){warehouseUpdownGoodsLogVO.setBindingTypeName("下架");}
+
 		return warehouseUpdownGoodsLogVO;
 	}