1.选择查询

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataNodeVO.java

@@ -19,5 +19,5 @@ public class BasicdataNodeVO {
 	private Boolean leaf ;
 
 	@ApiModelProperty(value = "仓库货区")
-	List<BasicdataNodeVO> children;
+	private List<BasicdataNodeVO> children;
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAllocationController.java

@@ -33,6 +33,7 @@ import javax.imageio.ImageIO;
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 
+import lombok.extern.log4j.Log4j2;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
@@ -64,6 +65,7 @@ import javax.servlet.http.HttpServletResponse;
 @AllArgsConstructor
 @RequestMapping("/goodsAllocation")
 @Api(value = "货位", tags = "货位接口")
+@Log4j2
 public class BasicdataGoodsAllocationController extends BladeController {
 
 	private final IBasicdataGoodsAllocationService basicdataGoodsAllocationService;

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAreaController.java

@@ -30,6 +30,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
 import javax.validation.Valid;
 
+import lombok.extern.log4j.Log4j2;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
@@ -57,6 +58,7 @@ import javax.servlet.http.HttpServletResponse;
 @AllArgsConstructor
 @RequestMapping("/goodsArea")
 @Api(value = "货区", tags = "货区接口")
+@Log4j2
 public class BasicdataGoodsAreaController extends BladeController {
 
 	private final IBasicdataGoodsAreaService basicdataGoodsAreaService;
@@ -84,6 +86,16 @@ public class BasicdataGoodsAreaController extends BladeController {
 		return R.data(WarehouseGoodsAreaWrapper.build().pageVO(list));
 	}
 
+	/**
+	 * 货区 获取货区
+	 */
+	@GetMapping("/getNode")
+	public R<List<BasicdataNodeVO>> getNode() {
+		List<BasicdataNodeVO> pages = basicdataGoodsAreaService.getNode();
+		log.info("pages>>>>>>>>>>>>>>{}",pages);
+		return R.data(pages);
+	}
+
 
 	/**
 	 * 货区 自定义分页
@@ -156,13 +168,10 @@ public class BasicdataGoodsAreaController extends BladeController {
 	@GetMapping("/export-warehouseGoodsArea")
 	@ApiOperationSupport(order = 9)
 	@ApiOperation(value = "导出数据", notes = "传入warehouseGoodsArea")
-	public void exportWarehouseGoodsArea(@ApiIgnore @RequestParam Map<String, Object> basicdataGoodsArea, BladeUser bladeUser, HttpServletResponse response) {
-		QueryWrapper<BasicdataGoodsAreaEntity> queryWrapper = Condition.getQueryWrapper(basicdataGoodsArea, BasicdataGoodsAreaEntity.class);
-		//if (!AuthUtil.isAdministrator()) {
-		//	queryWrapper.lambda().eq(WarehouseGoodsArea::getTenantId, bladeUser.getTenantId());
-		//}
-		queryWrapper.lambda().eq(BasicdataGoodsAreaEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
-		List<BasicdataGoodsAreaExcel> list = basicdataGoodsAreaService.exportWarehouseGoodsArea(queryWrapper);
+	public void exportWarehouseGoodsArea(@ApiIgnore @RequestParam Map<String, Object> basicdataGoodsArea, HttpServletResponse response) {
+		Long id =Long.valueOf((String)basicdataGoodsArea.get("id"));
+		log.info("basicdataGoodsArea>>>>>>>>>>>>>{}",id);
+		List<BasicdataGoodsAreaExcel> list = basicdataGoodsAreaService.exportWarehouseGoodsArea(id);
 		ExcelUtil.export(response, "货区数据" + DateUtil.time(), "货区数据表", list, BasicdataGoodsAreaExcel.class);
 	}
 

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataGoodsAreaExcel.java

@@ -41,71 +41,68 @@ public class BasicdataGoodsAreaExcel implements Serializable {
 
 	private static final long serialVersionUID = 1L;
 
+
 	/**
-	 * 租户号
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("租户号")
-	private String tenantId;
-	/**
-	 * 是否已删除
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("是否已删除")
-	private Integer isDeleted;
-	/**
-	 * 预留1
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("预留1")
-	private String reserve1;
-	/**
-	 * 预留2
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("预留2")
-	private String reserve2;
-	/**
-	 * 预留3
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("预留3")
-	private String reserve3;
-	/**
-	 * 预留4
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("预留4")
-	private String reserve4;
-	/**
-	 * 预留5
+	 * 货区名称
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("预留5")
-	private String reserve5;
+	@ExcelProperty("货区")
+	private String areaName;
+
 	/**
-	 * 仓库id
+	 * 货架
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("仓库id")
-	private String warehouseId;
+	@ExcelProperty("货架")
+	private String shelfName;
+
 	/**
-	 * 标题
+	 * 货位名称
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("标题")
-	private String headline;
+	@ExcelProperty("货位名称")
+	private String allocationName;
+
+
 	/**
-	 * 货区状态；1-启用，2-禁用
+	 * 货位总件数
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("货区状态；1-启用，2-禁用")
-	private String areaStatus;
+	@ExcelProperty("货位总件数")
+	private Integer allocationNub;
+
+//
+//	/**
+//	 * 合同号
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("合同号")
+//	private String orderCode;
+//
+//	/**
+//	 * 品牌
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("品牌")
+//	private String brand;
+//
 	/**
-	 * 是否备货区
+	 * 客户姓名
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("是否备货区")
-	private Integer isStrageArea;
+	@ExcelProperty("客户姓名")
+	private String customerName;
+//	/**
+//	 * 物料名称
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("物料名称")
+//	private String materialName;
+//	/**
+//	 * 物料编号
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("物料编号")
+//	private String materialCode;
 
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.java

@@ -49,10 +49,10 @@ public interface BasicdataGoodsAreaMapper extends BaseMapper<BasicdataGoodsAreaE
 	/**
 	 * 获取导出数据
 	 *
-	 * @param queryWrapper
+	 * @param id
 	 * @return
 	 */
-	List<BasicdataGoodsAreaExcel> exportWarehouseGoodsArea(@Param("ew") Wrapper<BasicdataGoodsAreaEntity> queryWrapper);
+	List<BasicdataGoodsAreaExcel> exportWarehouseGoodsArea(@Param("id") Long id);
 
 	IPage<BasicdataGoodsAreaVO> getBasicdataGoodsAreaList(IPage<Object> page,@Param("po") Map<String, Object> basicdataGoodsArea);
 

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.xml

@@ -44,9 +44,7 @@
     </select>
 
 
-    <select id="exportWarehouseGoodsArea" resultType="com.logpm.basicdata.excel.BasicdataGoodsAreaExcel">
-        SELECT * FROM logpm_warehouse_goods_area ${ew.customSqlSegment}
-    </select>
+
 
     <select id="getBasicdataGoodsAreaList" resultType="com.logpm.basicdata.vo.BasicdataGoodsAreaVO">
         SELECT
@@ -122,4 +120,20 @@
             </if>
         </where>
     </select>
+    <select id="exportWarehouseGoodsArea" resultType="com.logpm.basicdata.excel.BasicdataGoodsAreaExcel">
+        SELECT
+            lwga2.headline areaName,
+            lwgs.goods_shelf_name shelfName,
+            lwga.goods_allocation_name allocationName,
+            COALESCE(sum(lwug.num), 0)	 allocationNub
+        FROM
+            logpm_warehouse_goods_allocation lwga
+                JOIN logpm_warehouse_goods_shelf lwgs ON lwga.goods_shelf_id = lwgs.id
+                JOIN logpm_warehouse_goods_area lwga2 on lwga2.id = lwga.goods_area_id
+                LEFT JOIN logpm_warehouse_updown_goods lwug  on lwug.allocation_id =  lwga.id
+        <where>
+            lwga.is_deleted =0 and lwga2.id = #{id}
+        </where>
+        GROUP BY lwga.id
+    </select>
 </mapper>

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsShelfMapper.xml

@@ -92,6 +92,9 @@
             <if test="po.enableStatus != null and po.enableStatus!= ''">
                 and goods_shelf.enable_status = #{po.enableStatus}
             </if>
+            <if test="po.goodsShelfName != null and po.goodsShelfName!= ''">
+                and goods_shelf.goods_shelf_name  like concat('%',#{po.goodsShelfName},'%')
+            </if>
         </where>
     </select>
     <select id="getGoodsShelfDetail" resultType="com.logpm.basicdata.vo.BasicdataGoodsShelfVO">

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml

@@ -75,6 +75,9 @@
             <if test="po.type !=null and po.type != ''">
                 and tray.type = #{po.type}
             </if>
+            <if test="po.palletCode !=null and po.palletCode != ''">
+               and tray.pallet_code like concat('%',#{po.palletCode},'%')
+            </if>
         </where>
     </select>
     <select id="selectPackageList" resultType="com.logpm.basicdata.vo.WarehouseParcelListVO">

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

@@ -51,10 +51,10 @@ public interface IBasicdataGoodsAreaService extends BaseService<BasicdataGoodsAr
 	/**
 	 * 导出数据
 	 *
-	 * @param queryWrapper
+	 * @param Id
 	 * @return
 	 */
-	List<BasicdataGoodsAreaExcel> exportWarehouseGoodsArea(Wrapper<BasicdataGoodsAreaEntity> queryWrapper);
+	List<BasicdataGoodsAreaExcel> exportWarehouseGoodsArea(Long Id);
 
 	/**
 	 *
@@ -87,4 +87,8 @@ public interface IBasicdataGoodsAreaService extends BaseService<BasicdataGoodsAr
     List<BasicdataGoodsAreaVO> stockUp(BasicdataGoodsAreaEntity warehouseWarehouse);
 
 	List<BasicdataGoodsAreaVO> getStockUpInfo(String params);
+	/**
+	 * 货区 获取货区
+	 */
+	List<BasicdataNodeVO> getNode();
 }

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

@@ -55,13 +55,16 @@ import java.util.Map;
 @AllArgsConstructor
 public class BasicdataGoodsAreaServiceImpl extends BaseServiceImpl<BasicdataGoodsAreaMapper, BasicdataGoodsAreaEntity> implements IBasicdataGoodsAreaService {
 
-	private BasicdataGoodsAreaMapper basicdataGoodsAreaMapper;
+	private final BasicdataGoodsAreaMapper basicdataGoodsAreaMapper;
 
-	private BasicdataGoodsShelfMapper basicdataGoodsShelfMapper;
+	private final BasicdataGoodsShelfMapper basicdataGoodsShelfMapper;
 
-	private BasicdataGoodsAllocationMapper basicdataGoodsAllocationMapper;
+	private final BasicdataGoodsAllocationMapper basicdataGoodsAllocationMapper;
 
-	private IWarehouseUpdownGoodsClient warehouseUpdownGoodsClient;
+	private final IWarehouseUpdownGoodsClient warehouseUpdownGoodsClient;
+
+
+	private final BasicdataGoodsAllocationMapper goodsAllocationMapper;
 
 	@Override
 	public IPage<BasicdataGoodsAreaVO> selectWarehouseGoodsAreaPage(IPage<BasicdataGoodsAreaVO> page, BasicdataGoodsAreaVO basicdataGoodsAreaVO) {
@@ -70,8 +73,8 @@ public class BasicdataGoodsAreaServiceImpl extends BaseServiceImpl<BasicdataGood
 
 
 	@Override
-	public List<BasicdataGoodsAreaExcel> exportWarehouseGoodsArea(Wrapper<BasicdataGoodsAreaEntity> queryWrapper) {
-		List<BasicdataGoodsAreaExcel> warehouseGoodsAreaList = baseMapper.exportWarehouseGoodsArea(queryWrapper);
+	public List<BasicdataGoodsAreaExcel> exportWarehouseGoodsArea(Long id) {
+		List<BasicdataGoodsAreaExcel> warehouseGoodsAreaList = baseMapper.exportWarehouseGoodsArea(id);
 		//warehouseGoodsAreaList.forEach(warehouseGoodsArea -> {
 		//	warehouseGoodsArea.setTypeName(DictCache.getValue(DictEnum.YES_NO, WarehouseGoodsArea.getType()));
 		//});
@@ -150,4 +153,16 @@ public class BasicdataGoodsAreaServiceImpl extends BaseServiceImpl<BasicdataGood
 		return basicdataGoodsAreaMapper.getStockUpInfo(params);
 	}
 
+	@Override
+	public List<BasicdataNodeVO> getNode() {
+		//查询一级仓库节点信息
+		List<BasicdataNodeVO> basicdataWarehouseVOList = baseMapper.selectFirstNode();
+		//获取二节点的货区
+		for (BasicdataNodeVO basicdataNodeVO : basicdataWarehouseVOList) {
+			List<BasicdataNodeVO> goodeAreaNodes = goodsAllocationMapper.selectSecondNode(basicdataNodeVO.getValue());
+			basicdataNodeVO.setChildren(goodeAreaNodes);
+		}
+		return basicdataWarehouseVOList;
+	}
+
 }

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

@@ -39,6 +39,7 @@ import com.logpm.warehouse.feign.IWarehouseUpdownGoodsClient;
 import lombok.AllArgsConstructor;
 import lombok.extern.log4j.Log4j;
 import lombok.extern.log4j.Log4j2;
+import org.jetbrains.annotations.NotNull;
 import org.springblade.common.utils.FileUtil;
 import org.springblade.common.utils.QRCodeUtil;
 import org.springblade.common.utils.TemplateUtil;
@@ -154,6 +155,7 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
 		log.info("当前登陆人>>>>>>>>>>>>{}",user);
 		String shelfCode =basicdataGoodsShelfDTO.getGoodsAreaName();
 		basicdataGoodsShelfEntity.setQrCode(shelfCode);
+		basicdataGoodsShelfEntity.setWarehouseId(1687637854291722242L);
 		result = this.save(basicdataGoodsShelfEntity);
 		//这里需要根据货架的列数和层数进行货位信息的生成
 //		Integer rowNum = basicdataGoodsShelfEntity.getRowNum();
@@ -320,6 +322,7 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
 		log.info("列>>>>>>>>>>{}",rowNum);
 		Integer storeyNum = basicdataGoodsShelfDTO.getStoreyNum();//行
 		log.info("行>>>>>>>>>>{}",storeyNum);
+		Long ck = 1687637854291722242l;
 		//查询租户对应的库位码前缀规则
 	//	String allocationCode = basicTenantCodeClient.shelfCode(user.getTenantId(),"5");
 		//判断新增货位
@@ -343,6 +346,7 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
 				basicdataGoodsAllocationEntity.setGoodsAreaId(basicdataGoodsShelfDTO.getGoodsAreaId());
 				basicdataGoodsAllocationEntity.setGoodsShelfId(basicdataGoodsShelfDTO.getId());
 				basicdataGoodsAllocationEntity.setGoodsAllocationName( layer+ "-"  + row);
+				basicdataGoodsAllocationEntity.setWarehouseId(ck);
 //				basicdataGoodsAllocationEntity.setAllocationStatuc("1");
 //				basicdataGoodsAllocationEntity.setEnableStatus("1");
 				arrayList.add(basicdataGoodsAllocationEntity);
@@ -394,6 +398,7 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
 								basicdataGoodsAllocationEntity.setGoodsAreaId(basicdataGoodsShelfDTO.getGoodsAreaId());
 								basicdataGoodsAllocationEntity.setGoodsShelfId(basicdataGoodsShelfDTO.getId());
 								basicdataGoodsAllocationEntity.setGoodsAllocationName(z + "-" + k);
+								basicdataGoodsAllocationEntity.setWarehouseId(ck);
 								arrayList.add(basicdataGoodsAllocationEntity);
 							}
 						}
@@ -408,6 +413,7 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
 								basicdataGoodsAllocationEntity.setGoodsAreaId(basicdataGoodsShelfDTO.getGoodsAreaId());
 								basicdataGoodsAllocationEntity.setGoodsShelfId(basicdataGoodsShelfDTO.getId());
 								basicdataGoodsAllocationEntity.setGoodsAllocationName(z + "-"  + k);
+								basicdataGoodsAllocationEntity.setWarehouseId(ck);
 								arrayList.add(basicdataGoodsAllocationEntity);
 							}
 						}
@@ -448,6 +454,7 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
 							basicdataGoodsAllocationEntity.setGoodsAreaId(basicdataGoodsShelfDTO.getGoodsAreaId());
 							basicdataGoodsAllocationEntity.setGoodsShelfId(basicdataGoodsShelfDTO.getId());
 							basicdataGoodsAllocationEntity.setGoodsAllocationName(i + "-"  + k);
+							basicdataGoodsAllocationEntity.setWarehouseId(ck);
 							arrayList.add(basicdataGoodsAllocationEntity);
 						}
 						}
@@ -494,6 +501,7 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
 								basicdataGoodsAllocationEntity.setGoodsAreaId(basicdataGoodsShelfDTO.getGoodsAreaId());
 								basicdataGoodsAllocationEntity.setGoodsShelfId(basicdataGoodsShelfDTO.getId());
 								basicdataGoodsAllocationEntity.setGoodsAllocationName(z + "-"  + i);
+								basicdataGoodsAllocationEntity.setWarehouseId(ck);
 								arrayList.add(basicdataGoodsAllocationEntity);
 							}
 						}
@@ -586,6 +594,7 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
 								basicdataGoodsAllocationEntity.setGoodsAreaId(basicdataGoodsShelfDTO.getGoodsAreaId());
 								basicdataGoodsAllocationEntity.setGoodsShelfId(basicdataGoodsShelfDTO.getId());
 								basicdataGoodsAllocationEntity.setGoodsAllocationName(z + "-"  + i);
+								basicdataGoodsAllocationEntity.setWarehouseId(ck);
 								arrayList.add(basicdataGoodsAllocationEntity);
 							}
 						}
@@ -603,7 +612,8 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
 
 	}
 
-	static Integer getLayerNum(List<BasicdataGoodsAllocationEntity> products, String ColumnNum) {
+	@NotNull
+	static Integer getLayerNum(@NotNull List<BasicdataGoodsAllocationEntity> products, String ColumnNum) {
 		return products.stream()
 			.filter(e -> e.getColumnNum().equals(ColumnNum))
 			.mapToInt(BasicdataGoodsAllocationEntity::getLayerNum)