Merge branch 'master' of http://42.192.7.176:3000/suojin/jonhon-mes-svr

blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/feign/WmsTaskClient.java

@@ -4,7 +4,7 @@ import org.springblade.core.tool.api.R;
 import org.springblade.wms.pojo.dto.StGraphiteMoldOutDTO;
 import org.springblade.wms.pojo.entity.StGraphiteMoldOut;
 import org.springblade.wms.pojo.entity.StUserRight;
-import org.springblade.wms.pojo.vo.GraphiteStockKitVO;
+import org.springblade.wms.pojo.vo.*;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -41,6 +41,14 @@ public interface WmsTaskClient {
 
 	String GET_STOREKEEPERS_BY_GOODS_CODE = API_PREFIX + "/getStorekeepersByGoodsCode";
 
+	String BUY_ORDER_DETAIL = API_PREFIX + "/buyOrderDetail";
+
+	String CLASS_REQUEST_DETAIL = API_PREFIX + "/classRequestDetail";
+
+	String MOLD_APPLY_FOR_DETAIL = API_PREFIX + "/moldApplyForDetail";
+
+	String OTHER_OUT_RECORD_DETAIL = API_PREFIX + "/otherOutRecordDetail";
+
 	/**
 	 * 物料状态监控同步erp
 	 */
@@ -83,4 +91,15 @@ public interface WmsTaskClient {
 	@PostMapping(GET_STOREKEEPERS_BY_GOODS_CODE)
 	R<StUserRight> getStorekeepersByGoodsCode(@RequestParam String goodsCode);
 
+	@PostMapping(BUY_ORDER_DETAIL)
+	StBuyOrderVO buyOrderDetail(@RequestParam Long id);
+
+	@PostMapping(CLASS_REQUEST_DETAIL)
+	StClassRequestVO classRequestDetail(@RequestParam Long id);
+
+	@PostMapping(MOLD_APPLY_FOR_DETAIL)
+	StMoldApplyForVO moldApplyForDetail(@RequestParam Long id);
+
+	@PostMapping(OTHER_OUT_RECORD_DETAIL)
+	StOtherOutRecordVO otherOutRecordDetail(@RequestParam Long id);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/LiquidTankTaskServiceImpl.java

@@ -160,6 +160,10 @@ public class LiquidTankTaskServiceImpl extends BaseServiceImpl<LiquidTankTaskMap
     @Transactional
     public R fillFirstBat(List<LiquidTankTask> list) {
         for (LiquidTankTask task : list) {
+            LiquidTank liquidTank = liquidTankService.getById(task.getLiquidTankId());
+            if (liquidTank == null) {
+                return R.fail("槽液信息不存在");
+            }
             task = basicChangeTaskStatus(task, LiquidTankTaskConst.S_PENDING_REVIEW);
 //            task = basicChangeStatus(task.getId(), LiquidTankTaskConst.S_PENDING_REVIEW);
             // todo:计算加药量,通过公式 公式尚未实现 公式计算的 需加药量。
@@ -169,6 +173,7 @@ public class LiquidTankTaskServiceImpl extends BaseServiceImpl<LiquidTankTaskMap
             // 首次填报时间
             task.setFirstFillDate(LocalDateTime.now());
             basicUpdateById(task);
+            mesApprovalRecordService.createApprovalWithUsers(task.getId(), MesApprovalRecordBizTypeEnum.LIQUID_TANK_TASK.getDesc(), task.getUpdateUser(), task.getUpdateTime(), Arrays.asList(liquidTank.getProcessUserId()));
         }
         return R.success();
     }

blade-service/blade-desk/src/main/java/org/springblade/desk/wms/StBuyOrderApprovalServiceImpl.java

@@ -0,0 +1,32 @@
+package org.springblade.desk.wms;
+
+import jakarta.annotation.Resource;
+import org.springblade.desk.common.enums.MesApprovalRecordBizTypeEnum;
+import org.springblade.desk.common.service.ApprovalRecordDetailStrategy;
+import org.springblade.wms.feign.WmsTaskClient;
+import org.springblade.wms.pojo.vo.StBuyOrderVO;
+import org.springframework.stereotype.Service;
+
+/**
+ * @version 1.0
+ * @program: jonhon-mes-svr
+ * @ClassName StBuyOrderServiceImpl
+ * @description:
+ * @autor: WuSiYu
+ * @create 2026-06-13 15:15
+ **/
+@Service
+public class StBuyOrderApprovalServiceImpl implements ApprovalRecordDetailStrategy<StBuyOrderVO> {
+    @Resource
+    private WmsTaskClient wmsTaskClient;
+
+    @Override
+    public String getBizType() {
+        return MesApprovalRecordBizTypeEnum.WMS_EXTRA_PLAN.getDesc();
+    }
+
+    @Override
+    public StBuyOrderVO getDetail(Long bizId) {
+        return wmsTaskClient.buyOrderDetail(bizId);
+    }
+}

blade-service/blade-desk/src/main/java/org/springblade/desk/wms/StClassRequestApprovalServiceImpl.java

@@ -0,0 +1,34 @@
+package org.springblade.desk.wms;
+
+import jakarta.annotation.Resource;
+import org.springblade.desk.common.enums.MesApprovalRecordBizTypeEnum;
+import org.springblade.desk.common.service.ApprovalRecordDetailStrategy;
+import org.springblade.wms.feign.WmsTaskClient;
+import org.springblade.wms.pojo.vo.StClassRequestVO;
+import org.springframework.stereotype.Service;
+
+/**
+ * @version 1.0
+ * @program: jonhon-mes-svr
+ * @ClassName StClassRequestServiceImpl
+ * @description:
+ * @autor: WuSiYu
+ * @create 2026-06-13 16:06
+ **/
+@Service
+public class StClassRequestApprovalServiceImpl implements ApprovalRecordDetailStrategy<StClassRequestVO> {
+
+    @Resource
+    private WmsTaskClient wmsTaskClient;
+
+    @Override
+    public String getBizType() {
+        return MesApprovalRecordBizTypeEnum.TEAM_GROUP_PROCESS_AUDIT.getDesc();
+    }
+
+    @Override
+    public StClassRequestVO getDetail(Long bizId) {
+        return wmsTaskClient.classRequestDetail(bizId);
+    }
+
+}

blade-service/blade-desk/src/main/java/org/springblade/desk/wms/StMoldApplyForApprovalServiceImpl.java

@@ -0,0 +1,35 @@
+package org.springblade.desk.wms;
+
+import jakarta.annotation.Resource;
+import org.springblade.desk.common.enums.MesApprovalRecordBizTypeEnum;
+import org.springblade.desk.common.service.ApprovalRecordDetailStrategy;
+import org.springblade.wms.feign.WmsTaskClient;
+import org.springblade.wms.pojo.vo.StMoldApplyForVO;
+import org.springframework.stereotype.Service;
+
+/**
+ * @version 1.0
+ * @program: jonhon-mes-svr
+ * @ClassName st
+ * @description:
+ * @autor: WuSiYu
+ * @create 2026-06-13 16:38
+ **/
+
+@Service
+public class StMoldApplyForApprovalServiceImpl implements ApprovalRecordDetailStrategy<StMoldApplyForVO> {
+
+    @Resource
+    private WmsTaskClient wmsTaskClient;
+
+    @Override
+    public String getBizType() {
+        return MesApprovalRecordBizTypeEnum.TOOL_PLAN_APPLY_AUDIT.getDesc();
+    }
+
+    @Override
+    public StMoldApplyForVO getDetail(Long bizId) {
+        return wmsTaskClient.moldApplyForDetail(bizId);
+    }
+
+}

blade-service/blade-desk/src/main/java/org/springblade/desk/wms/StOtherOutRecordApprovalServiceImpl.java

@@ -0,0 +1,36 @@
+package org.springblade.desk.wms;
+
+import jakarta.annotation.Resource;
+import org.springblade.desk.common.enums.MesApprovalRecordBizTypeEnum;
+import org.springblade.desk.common.service.ApprovalRecordDetailStrategy;
+import org.springblade.wms.feign.WmsTaskClient;
+import org.springblade.wms.pojo.vo.StOtherOutRecordVO;
+import org.springframework.stereotype.Service;
+
+/**
+ * @version 1.0
+ * @program: jonhon-mes-svr
+ * @ClassName StOtherOutRecordApprovalServiceImpl
+ * @description:
+ * @autor: WuSiYu
+ * @create 2026-06-13 16:50
+ **/
+
+@Service
+public class StOtherOutRecordApprovalServiceImpl implements ApprovalRecordDetailStrategy<StOtherOutRecordVO> {
+
+    @Resource
+    private WmsTaskClient wmsTaskClient;
+
+    @Override
+    public String getBizType() {
+        // 替换为对应的业务枚举
+        return MesApprovalRecordBizTypeEnum.WMS_SCRAP_AUDIT.getDesc();
+    }
+
+    @Override
+    public StOtherOutRecordVO getDetail(Long bizId) {
+        return wmsTaskClient.otherOutRecordDetail(bizId);
+    }
+
+}

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

@@ -50,7 +50,7 @@ public class StBuyOrderController extends BladeController {
 	private final IStBuyOrderService stBuyOrderService;
 
 	/**
-	 * 采购申请单 详情
+	 * 采购跟踪 详情
 	 */
 	@GetMapping("/detail")
 	@ApiOperationSupport(order = 1)

blade-service/blade-wms/src/main/java/org/springblade/wms/feign/WmsTaskClientImpl.java

@@ -8,7 +8,7 @@ import org.springblade.core.tool.api.R;
 import org.springblade.wms.pojo.dto.StGraphiteMoldOutDTO;
 import org.springblade.wms.pojo.entity.StGraphiteMoldOut;
 import org.springblade.wms.pojo.entity.StUserRight;
-import org.springblade.wms.pojo.vo.GraphiteStockKitVO;
+import org.springblade.wms.pojo.vo.*;
 import org.springblade.wms.service.*;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
@@ -41,6 +41,12 @@ public class WmsTaskClientImpl implements WmsTaskClient{
 
 	private final IStUserRightService stUserRightService;
 
+	private final IStClassRequestService stClassRequestService;
+
+	private final IStMoldApplyForService stMoldApplyForService;
+
+	private final IStOtherOutRecordService stOtherOutRecordService;
+
 	@Override
 	public boolean executeGoodsStatusUpdate() {
 		stGoodsExtService.executeGoodsStatusUpdate();
@@ -72,4 +78,24 @@ public class WmsTaskClientImpl implements WmsTaskClient{
 	public R<StUserRight> getStorekeepersByGoodsCode(@RequestParam String goodsCode) {
 		return R.data(stUserRightService.getStorekeepersByMaterialCode(goodsCode));
 	}
+
+	@Override
+	public StBuyOrderVO buyOrderDetail(@RequestParam Long id) {
+		return stBuyOrderService.buyOrderDetail(id);
+	}
+
+	@Override
+	public StClassRequestVO classRequestDetail(@RequestParam Long id) {
+		return stClassRequestService.classRequestDetail(id);
+	}
+
+	@Override
+	public StMoldApplyForVO moldApplyForDetail(@RequestParam Long id) {
+		return stMoldApplyForService.moldApplyForDetail(id);
+	}
+
+	@Override
+	public StOtherOutRecordVO otherOutRecordDetail(@RequestParam Long id) {
+		return stOtherOutRecordService.getDetail(id);
+	}
 }

blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StBuyOrderMapper.java

@@ -52,6 +52,8 @@ public interface StBuyOrderMapper extends BaseMapper<StBuyOrder> {
 
 	StBuyOrder getByExtraBill(String extraBill);
 
+	StBuyOrderVO buyOrderDetail(Long id);
+
 //	JSONObject listByRecordDetail(Long boId, String goodsCode);
 }
 

blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StBuyOrderMapper.xml

@@ -293,6 +293,36 @@
           AND ROWNUM = 1
     </select>
 
+    <select id="buyOrderDetail" resultType="org.springblade.wms.pojo.vo.StBuyOrderVO">
+        SELECT
+        bo.*,
+        -- 物料信息（关联st_goods表）
+        g.goods_code ,        -- 物料编码
+        g.goods_name ,        -- 物料名称
+        g.material_model ,    -- 型号牌号
+        g.specifications , -- 物料规格
+        g.unit_name ,                  -- 单位
+        -- 采购部门名称（关联部门表）
+        dept_pur.dept_name AS purchaseDeptName,
+        -- 需求部门名称（关联部门表）
+        dept_req.dept_name AS requireDeptName,
+        -- 申报人名称（关联用户表）
+        user_create.name AS declareManName,
+        buy_create.name AS buyManName
+        FROM st_buy_order bo
+        -- 关联物料表（左连接：允许无物料信息的采购单）
+        LEFT JOIN st_goods g ON bo.goods_id = g.id AND g.is_deleted = 0
+        -- 关联采购部门表（左连接）
+        LEFT JOIN blade_dept dept_pur ON bo.buy_dept = dept_pur.id
+        -- 关联需求部门表（左连接）
+        LEFT JOIN blade_dept dept_req ON bo.need_dept = dept_req.id
+        -- 关联申报人用户表（左连接）
+        LEFT JOIN blade_user user_create ON bo.declare_man = user_create.id AND user_create.is_deleted = 0
+        LEFT JOIN blade_user buy_create ON bo.buy_man = buy_create.id AND buy_create.is_deleted = 0
+        WHERE bo.is_deleted = 0
+        AND bo.id = #{id}
+    </select>
+
     <!-- 1. 主记录 -->
 <!--    <select id="getRecordExByBoId" resultMap="prPlateGoodsRecordExResultMap">-->
 <!--        SELECT *-->

blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StClassRequestMapper.java

@@ -46,5 +46,7 @@ public interface StClassRequestMapper extends BaseMapper<StClassRequest> {
     StClassRequest getByCrCode(String crCode);
 
     List<StClassRequestVO> selectStTeamRequestPage(IPage<StClassRequestVO> page, StClassRequestVO stClassRequest);
+
+    StClassRequestVO classRequestDetail(Long id);
 }
 

blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StClassRequestMapper.xml

@@ -177,6 +177,23 @@
         ORDER BY CREATE_TIME ASC
     </select>
 
+    <select id="classRequestDetail" resultType="org.springblade.wms.pojo.vo.StClassRequestVO">
+        SELECT
+        t.*,
+        -- 提请人姓名（关联用户表，ID转名称）
+        u.name AS crManName
+        FROM st_class_request t
+        -- 左关联用户表：取提请人姓名（关联提请人ID cr_man）
+        LEFT JOIN BLADE_USER u ON t.cr_man = u.id
+        <where>
+            <!-- 1. 固定条件：状态 < COMPLETE -->
+            t.cur_status &lt; 20
+            <!-- 3. 软删除 -->
+            AND t.is_deleted = 0
+            AND t.id = #{id}
+        </where>
+    </select>
+
     <select id="exportStClassRequest" resultType="org.springblade.wms.excel.StClassRequestExcel">
         SELECT * FROM ST_CLASS_REQUEST ${ew.customSqlSegment}
     </select>

blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StMoldApplyForMapper.java

@@ -58,6 +58,8 @@ public interface StMoldApplyForMapper extends BaseMapper<StMoldApplyFor> {
 						   @Param("v_toolid1") String erpWoCode);
 
 	void deleteMoldPlan(@Param("v_toolid") String erpWoCode);
+
+    StMoldApplyForVO moldApplyForDetail(Long id);
 }
 
 

blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StMoldApplyForMapper.xml

@@ -119,6 +119,23 @@
         )}
     </select>
 
+    <select id="moldApplyForDetail" resultType="org.springblade.wms.pojo.vo.StMoldApplyForVO">
+        SELECT
+        maf.*,
+        -- 保管员名称（关联用户表，无则显示"未指定"）
+        k.name AS keeper_name,
+        -- 创建人员名称（关联用户表，无则显示"未指定"）
+        cu.name AS create_user_name
+        FROM ST_MOLD_APPLY_FOR maf
+        -- 左关联保管员用户表：通过keeperID获取保管员名称
+        LEFT JOIN BLADE_USER k ON maf.keeper = k.id AND k.is_deleted = 0
+        -- 左关联创建人用户表：通过create_user获取创建人员名称
+        LEFT JOIN BLADE_USER cu ON maf.create_user = cu.id AND cu.is_deleted = 0
+        -- 原有基础条件：软删除
+        WHERE maf.is_deleted = 0
+        AND maf.id = #{id}
+    </select>
+
     <select id="exportStMoldApplyFor" resultType="org.springblade.wms.excel.StMoldApplyForExcel">
         SELECT * FROM ST_MOLD_APPLY_FOR ${ew.customSqlSegment}
     </select>

blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StOtherOutRecordMapper.xml

@@ -116,6 +116,10 @@
         SELECT
             -- 主表：其他出库表所有字段
             soor.*,
+            CASE
+                WHEN soor.bf_type = -1 THEN NULL
+                ELSE soor.bf_type
+                END AS bfType,
             -- 出库凭证表：出库单号、出库日期、出库原因、领料人ID
             g.goods_code ,        -- 物料编码
             g.goods_name ,        -- 物料名称
@@ -130,7 +134,6 @@
             sir.quantity,
             sir.pi_no,
             sir.stove_pi_no,
-            soor.picker ,
             -- 库房表：出库仓库名称
             sh.sh_name AS shName,
             -- 制单人姓名（主表create_by关联用户表）

blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStBuyOrderService.java

@@ -62,6 +62,8 @@ public interface IStBuyOrderService extends BaseService<StBuyOrder> {
 
 	StBuyOrder getDetail(Long id);
 
+	StBuyOrderVO buyOrderDetail(Long id);
+
 //	JSONObject otherPlanDetail(Long id, String prtno);
 }
 

blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStClassRequestService.java

@@ -53,6 +53,8 @@ public interface IStClassRequestService extends BaseService<StClassRequest> {
 
 	StClassRequest getByCrCode(String crCode);
 
+	StClassRequestVO classRequestDetail(Long id);
+
 	IPage<StClassRequestVO> selectStTeamRequestPage(IPage<StClassRequestVO> page, StClassRequestVO stClassRequest);
 }
 

blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStMoldApplyForService.java

@@ -30,6 +30,8 @@ public interface IStMoldApplyForService extends BaseService<StMoldApplyFor> {
 	IPage<StMoldApplyForVO> selectStMoldApplyForPage(IPage<StMoldApplyForVO> page, StMoldApplyForVO stMoldApplyFor);
 
 
+	StMoldApplyForVO moldApplyForDetail(Long id);
+
 	/**
 	 * 导出数据
 	 *

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

@@ -425,6 +425,11 @@ public class StBuyOrderServiceImpl extends BaseServiceImpl<StBuyOrderMapper, StB
 		return buyOrder;
 	}
 
+	@Override
+	public StBuyOrderVO buyOrderDetail(Long id) {
+		return baseMapper.buyOrderDetail(id);
+	}
+
 //	@Override
 //	public JSONObject otherPlanDetail(Long boId, String goodsCode) {
 ////        JSONObject o = (JSONObject) prPlateGoodsRecordWebService.listByRecordDetail(boId,goodsCode);

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

@@ -14,7 +14,6 @@ import org.springblade.core.secure.BladeUser;
 import org.springblade.desk.common.enums.MesApprovalRecordBizTypeEnum;
 import org.springblade.desk.common.feign.IMesApprovalRecordClient;
 import org.springblade.desk.common.pojo.dto.MesApprovalRecordFeignDTO;
-import org.springblade.desk.common.pojo.entity.MesApprovalRecordEntity;
 import org.springblade.system.feign.ISysClient;
 import org.springblade.system.feign.IUserClient;
 import org.springblade.wms.excel.StClassRequestExcel;
@@ -389,6 +388,11 @@ public class StClassRequestServiceImpl extends BaseServiceImpl<StClassRequestMap
 		return baseMapper.getTeamNoOutStoreQtyByGoodsId(goodsId);
 	}
 
+	@Override
+	public StClassRequestVO classRequestDetail(Long id) {
+		return baseMapper.classRequestDetail(id);
+	}
+
 	@Override
 	public List<StClassRequestExcel> exportStClassRequest(Wrapper<StClassRequest> queryWrapper) {
 		List<StClassRequestExcel> stClassRequestList = baseMapper.exportStClassRequest(queryWrapper);

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

@@ -200,6 +200,11 @@ public class StMoldApplyForServiceImpl extends BaseServiceImpl<StMoldApplyForMap
 		}
 	}
 
+	@Override
+	public StMoldApplyForVO moldApplyForDetail(Long id) {
+		return baseMapper.moldApplyForDetail(id);
+	}
+
 	@Override
 	public List<StMoldApplyForExcel> exportStMoldApplyFor(Wrapper<StMoldApplyFor> queryWrapper) {
 		List<StMoldApplyForExcel> stMoldApplyForList = baseMapper.exportStMoldApplyFor(queryWrapper);

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

@@ -1,7 +1,5 @@
 package org.springblade.wms.service.impl;
 
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import jakarta.annotation.Resource;
@@ -11,10 +9,8 @@ import org.springblade.core.secure.BladeUser;
 import org.springblade.desk.common.enums.MesApprovalRecordBizTypeEnum;
 import org.springblade.desk.common.feign.IMesApprovalRecordClient;
 import org.springblade.desk.common.pojo.dto.MesApprovalRecordFeignDTO;
-import org.springblade.desk.common.pojo.entity.MesApprovalRecordEntity;
 import org.springblade.system.feign.ISysClient;
 import org.springblade.system.feign.IUserClient;
-import org.springblade.system.pojo.entity.User;
 import org.springblade.wms.excel.StOtherOutRecordExcel;
 import org.springblade.wms.mapper.StOtherOutRecordMapper;
 import org.springblade.wms.mapper.StReturnRecordMapper;