精度

src/main/java/com/heai/modules/production/entity/SOOPInspectData.java

@@ -9,6 +9,7 @@ import java.util.Date;
 @Data
 public class SOOPInspectData extends SOOpsTransferHeaderData{
     private Integer SeqNo;
+    private Integer itemNo;
     private String workCenterNo;
     private String orderNo;
     private String partNo;

src/main/java/com/heai/modules/production/service/InspectService.java

@@ -62,4 +62,20 @@ public interface InspectService {
      * @throw
      */
     List<SOScheduledRoutingOutData> getSOScheduleRoutingDataForShiyanshi(SOScheduledRoutingOutData inData);
+
+    /**
+     *
+     * @description QMS检验登记通用接口
+     * @author 常熟吴彦祖
+     * @param site 工厂编码
+     *             TransNo 检验单号
+     *             item 子表序号
+     *             actionType 操作类型 （submit/cancel）
+     *             inspectResult 检验结果  （合格/不合格/让步接收）
+     *             inspectRemark 检验备注 随意填可为空（之前薛总要求必须填的，迁移后需要后期确认）
+     *             user 操作人
+     * @date 2026/3/11 13:37
+     * @return SOScheduledRoutingOutData
+     */
+    SOScheduledRoutingOutData inspectForQMS(String site,String TransNo,Integer item,String actionType,String inspectResult,String inspectRemark,String user);
 }

src/main/java/com/heai/modules/production/service/impl/InspectServiceImpl.java

@@ -213,4 +213,29 @@ public class InspectServiceImpl implements InspectService {
     public List<SOScheduledRoutingOutData> getSOScheduleRoutingDataForShiyanshi(SOScheduledRoutingOutData inData){
         return dailyPlanMapper.getSOScheduleRoutingDataForShiyanshi(inData);
     }
+
+    @Override
+    @Transactional
+    public SOScheduledRoutingOutData inspectForQMS(String site,String TransNo,Integer item,String actionType,String inspectResult,String inspectRemark,String user){
+        SOOPInspectData inData=new SOOPInspectData();
+        inData.setSite(site);
+        inData.setTransNo(TransNo);
+        inData.setItemNo(item);
+        List<SOOPInspectData> checkData= soScheduledListMapper.getInspectData(inData);
+        if(checkData.isEmpty()){
+            throw new RuntimeException("该检验单不存在！");
+        }
+        SOOPInspectData data=checkData.get(0);
+        data.setInspectResult(inspectResult);
+        data.setInspectRemark(inspectRemark);
+        data.setUser( user);
+        if("submit".equals(actionType)){
+        return inspectSave(data);
+        }else if("cancel".equals(actionType)){
+            cancelInspectResult( data);
+        }else {
+            throw new RuntimeException("请传入正确的操作类型！");
+        }
+        return null;
+    }
 }

src/main/resources/mapper/production/SoScheduledListMapper.xml

@@ -67,7 +67,9 @@
     <select id="getInspectData" resultType="com.heai.modules.production.entity.SOOPInspectData">
         select  a.site,a.TransNo,a.TransDate,a. Status,a.inspected_flag,a.inspect_remark,a.inspect_result,a.NeedReceiveFlag,B.FromWorkCenterNo workCenterNo,B.OrderNo,b.PartNo,b.TransQty,b.seqNo,dbo.Get_Part_SpecDesc(a.site,b.PartNo) partDescSpec,a.ToTypeFlag
         ,dbo.Get_WorkCenterDesc(a.site,B.FromWorkCenterNo) workCenterDesc,a.fromReceiver,dbo.Get_OperatorDesc(a.site,a.fromReceiver) operatorName,a.ToTypeFlag_db,isnull(c.S_ShiftNo,'白班') shiftNo,ConfirmedTransNo
-        from SOOpsTransferHeader a left join SOOpsTransferDetail b on a.site=b.site and a.TransNo=b.TransNo left join SOScheduledRouting c on b.seqNo=c.seqNo and a.site=c.site
+        from SOOpsTransferHeader a
+        left join SOOpsTransferDetail b on a.site=b.site and a.TransNo=b.TransNo
+        left join SOScheduledRouting c on b.seqNo=c.seqNo and a.site=c.site
            <where>
            and a.need_inspect_flag='Y' and a. Status!='已取消'  and a.ToTypeFlag!='调拨入仓库'
             <if test="site != null and site != ''">
@@ -106,6 +108,9 @@
             <if test="endDate != null ">
                 and #{endDate} >= a.TransDate -1
             </if>
+            <if test="itemNo != null">
+                and b.item_no = #{itemNo}
+            </if>
             </where>
             order by a.TransDate
     </select>