From 95f6d95d422887b60f5169147422d9fde798bb89 Mon Sep 17 00:00:00 2001
From: wusiyu <2015098864@qq.com>
Date: Thu, 7 May 2026 14:41:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93=E7=AE=A1=E7=90=86=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/springblade/erpdata/mapper/ErpDataWmsMapper.xml  | 2 +-
 .../org/springblade/wms/controller/StBuyOrderController.java  | 4 ----
 .../main/java/org/springblade/wms/mapper/StGoodsExtMapper.xml | 2 +-
 .../springblade/wms/service/impl/StBuyOrderServiceImpl.java   | 4 ++--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataWmsMapper.xml b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataWmsMapper.xml
index 3dc78681..1b3093a9 100644
--- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataWmsMapper.xml
+++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataWmsMapper.xml
@@ -10,7 +10,7 @@
         NVL(erp.planqty, 0) AS planqty
 
         FROM dba_mgr.v_mes_rb_prtstuff erp
-            ON erp.prtno = #{goodsCode}
+            WHERE erp.prtno = #{goodsCode}
     </select>
 
 </mapper>
diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StBuyOrderController.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StBuyOrderController.java
index dc98c5cc..abcd7b3c 100644
--- a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StBuyOrderController.java
+++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StBuyOrderController.java
@@ -105,10 +105,6 @@ public class StBuyOrderController extends BladeController {
 			stBuyOrder.setApprovalStatus(StBuyOrder.APPROVAL_STATUS_CHECKING);
 		}
 
-		if (StrUtil.isBlank(query.getAscs()) && StrUtil.isBlank(query.getDescs())) {
-			query.setDescs("create_time");
-		}
-
 		IPage<StBuyOrderVO> pages = stBuyOrderService.selectStBuyOrderPage(Condition.getPage(query), stBuyOrder);
 		return R.data(pages);
 	}
diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsExtMapper.xml b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsExtMapper.xml
index fdcb4ce5..caa14337 100644
--- a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsExtMapper.xml
+++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsExtMapper.xml
@@ -104,7 +104,7 @@
 
         FROM st_goods_ext ge
         INNER JOIN st_goods g ON g.id = ge.goods_id
-        AND g.id = #{goodsId}
+        WHERE g.id = #{goodsId}
 
         LEFT JOIN (
         SELECT b.goods_code, SUM(a.quantity - a.occupy_quantity) AS last_qty
diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StBuyOrderServiceImpl.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StBuyOrderServiceImpl.java
index 6eea0c3c..b4c370ec 100644
--- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StBuyOrderServiceImpl.java
+++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StBuyOrderServiceImpl.java
@@ -10,7 +10,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.secure.BladeUser;
-import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.desk.common.feign.IMesApprovalRecordClient;
 import org.springblade.desk.common.pojo.entity.MesApprovalRecordEntity;
@@ -277,7 +276,8 @@ public class StBuyOrderServiceImpl extends BaseServiceImpl<StBuyOrderMapper, StB
 			StGoods goods = stGoodsService.getById(bo.getGoodsId());
 			dto.setPrtno(goods.getGoodsCode());
 			dto.setPrtlotno(StrUtil.blankToDefault(bo.getGrade(), " "));
-			dto.setReqdept(AuthUtil.getUser().getDeptId().toString()); // 当前人部门"3400"
+//			dto.setReqdept(AuthUtil.getUser().getDeptId().toString()); // 当前人部门"3400"
+			dto.setReqdept("3400"); // 当前人部门"3400"
 			dto.setReqdat(bo.getNeedDate() == null ? "" : DateUtil.format(bo.getNeedDate(), "yyyy-MM-dd"));
 			dto.setReqqty(BigDecimal.valueOf(Optional.ofNullable(bo.getBuyQty()).orElse(0D)));
 			dto.setReqdate(bo.getDeclareDate() == null ? "" : DateUtil.format(bo.getDeclareDate(), "yyyy-MM-dd"));