仓库管理修改

blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StBuyOrder.java

@@ -138,7 +138,7 @@ public class StBuyOrder extends TenantEntity {
 	 * 检查人
 	 */
 	@Schema(description = "检查人")
-	private Long checkMan;
+	private String checkMan;
 	/**
 	 * 检查时间
 	 */

blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StOtherOutRecordController.java

@@ -238,7 +238,7 @@ public class StOtherOutRecordController extends BladeController {
 	@ApiLog("其他出库表 根据条件查询库存")
 	@Operation(summary = "根据物料编号和仓库号批号查询", description = "传入goodsId、shId")
 	public R<IPage<StRealtimeStockVO>> queryByGoodsIdShId(
-		@Parameter(description = "仓库ID", required = true) @RequestParam Long shId,
+		@Parameter(description = "仓库ID", required = false) @RequestParam(required = false) Long shId,
 		@Parameter(description = "物料ID", required = true) @RequestParam Long goodsId,
 		@RequestParam(required = false) Long slId, // 可选，非必传
 		@RequestParam(required = false) String piNo, Query query) {

blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StBuyOrderServiceImpl.java

@@ -222,6 +222,8 @@ public class StBuyOrderServiceImpl extends BaseServiceImpl<StBuyOrderMapper, StB
 
 			// 3. 更新审批状态
 			buyOrder.setApprovalStatus(approvalResult);
+			buyOrder.setCheckMan(approver.getNickName());
+			buyOrder.setCheckDate(new Date());
 			baseMapper.updateById(buyOrder);
 
 			R<String> roleIdResp = sysClient.getRoleIds("000000", "保管员");
@@ -278,7 +280,7 @@ public class StBuyOrderServiceImpl extends BaseServiceImpl<StBuyOrderMapper, StB
 			dto.setPlnarea(bo.getPlanArea());
 			dto.setReqctlr(String.valueOf(AuthUtil.getUser().getUserId())); // 当前登录人
 			dto.setCheckdate(bo.getCheckDate() == null ? "" : DateUtil.format(bo.getCheckDate(), "yyyy-MM-dd"));
-			dto.setCheckman(String.valueOf(Optional.ofNullable(bo.getCheckMan()).orElse(Long.valueOf(""))));
+			dto.setCheckman(bo.getCheckMan() == null ? "" : bo.getCheckMan());
 			pdList.add(dto);
 		}