From 895696fcd05d301d7c16d1b953c770273d00604e Mon Sep 17 00:00:00 2001
From: sunjianxi <839419401@qq.com>
Date: Wed, 25 Mar 2026 19:38:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E4=BA=A7=E5=8A=9F=E8=83=BD=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9-sjx?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scheduling/mapper/EquipAbilityMapper.xml          |  2 +-
 .../scheduling/service/impl/WorkOrderServiceImpl.java |  2 +-
 .../wms/controller/StComboxController.java            |  6 ++----
 .../springblade/wms/controller/StGoodsController.java |  2 +-
 .../wms/service/impl/StBuyOrderServiceImpl.java       | 11 ++++++++---
 5 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/EquipAbilityMapper.xml b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/EquipAbilityMapper.xml
index e23f32b4..2d81bdb3 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/EquipAbilityMapper.xml
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/EquipAbilityMapper.xml
@@ -38,7 +38,7 @@
                 and equip_code = #{param2.equipCode}
             </if>
         </where>
-        order by update_time desc
+        order by work_center_id,equip_name,equip_code,equip_type,update_time desc
     </select>
 
 
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java
index d51b4028..3959aea1 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java
@@ -643,7 +643,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                                                     }
                                                     workPlan.setPlanEndTime(workPlan.getPlanEndTime().plusMinutes(personHours.longValue()));
                                                 }
-                                                workPlan.setWorkQty(order.getYpQty());
+                                                workPlan.setWorkQty(0);
                                                 workPlan.setCaId(craft.getCaId());
                                                 workPlan.setPpsId(craft.getPpsId());
                                                 workPlan.setMakeTeam(equipResource.getTeamId());
diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StComboxController.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StComboxController.java
index 55d6e72b..1ca36a77 100644
--- a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StComboxController.java
+++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StComboxController.java
@@ -116,13 +116,11 @@ public class StComboxController {
 				.or()
 				.like("goods_name", filterValue));
 		}
-		qw.eq("is_deleted", false);
-
 		// 2. 数据权限：当前用户工厂（可选）
-		BladeUser user = AuthUtil.getUser();
+		/*BladeUser user = AuthUtil.getUser();
 		if (user != null && user.getDeptId() != null) {
 			qw.eq("create_dept", user.getDeptId());
-		}
+		}*/
 
 		// 3. 分页查询
 		IPage<StGoods> page = stGoodsService.page(Condition.getPage(query), qw);
diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGoodsController.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGoodsController.java
index b59ac600..46aa678c 100644
--- a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGoodsController.java
+++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGoodsController.java
@@ -92,7 +92,7 @@ public class StGoodsController extends BladeController {
 	@ApiOperationSupport(order = 4)
 	@ApiLog("物料信息表 新增")
 	@Operation(summary = "新增", description  = "传入stGoods")
-	public R save(@Valid @RequestBody String goodsCode) throws Exception{
+	public R save(@RequestParam String goodsCode) throws Exception{
 		stGoodsService.saveGoods(goodsCode);
 		return R.success();
 	}
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 5bed33a7..2e9f7832 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
@@ -106,10 +106,15 @@ public class StBuyOrderServiceImpl extends BaseServiceImpl<StBuyOrderMapper, StB
 
 			// 采购部门：固定编码0200
 			Dept buyDept = SysCache.getDeptByCode("0200");
-			newBuyOrder.setBuyDept(buyDept.getId());
+			if(buyDept != null){
+				newBuyOrder.setBuyDept(buyDept.getId());
+			}
+
 			// 需求部门：固定编码3400
 			Dept needDept = SysCache.getDeptByCode("3400");
-			newBuyOrder.setNeedDept(needDept.getId());
+			if(needDept != null){
+				newBuyOrder.setNeedDept(needDept.getId());
+			}
 
 			// ===== 3. 日期默认值：当前系统时间 (原逻辑不变)
 			newBuyOrder.setDeclareDate(currDate);
@@ -181,7 +186,7 @@ public class StBuyOrderServiceImpl extends BaseServiceImpl<StBuyOrderMapper, StB
 					String roleNameData = roleName.getData();
 					approvalRecord.setCurrentRoleName(roleNameData);
 					approvalRecord.setNextRoleName("保管员");
-					R<String> roleIdResp = sysClient.getRoleIds(null, approvalRecord.getNextRoleName());
+					R<String> roleIdResp = sysClient.getRoleIds("000000", approvalRecord.getNextRoleName());
 					String roleId = roleIdResp.getData();
 					approvalRecord.setNextRoleId(Long.valueOf(roleId));
 					mesApprovalRecordClient.save(approvalRecord);