0412更新

src/main/java/com/heai/modules/app/service/impl/FunctionServiceImpl.java

@@ -353,6 +353,26 @@ public class FunctionServiceImpl implements FunctionService {
     @Override
     @Transactional
     public R saveSaveTransForRetrun(List<SaveTransData> inList) {
+        //判断是不是流转单
+        if(inList.size()==0){
+            throw new RuntimeException("没有退库记录明细！");
+        }
+        Integer seqNo=Integer.parseInt(inList.get(0).getOrderRef3());
+        //流转单不判断
+        List<SOScheduledRoutingOutData> checkCirculation =dailyPlanMapper.checkCirculation(seqNo);
+        if(checkCirculation.size()==0){
+            for (int i = 0; i < inList.size(); i++) {
+                TransDetailData getNowIssure=dailyPlanMapper.getNowIssure(inList.get(0).getOrderRef3(),inList.get(i).getPartNo());
+                if(getNowIssure !=null){
+                    if(inList.get(0).getTransQty().doubleValue()>getNowIssure.getTransQty()){
+                        throw new RuntimeException(inList.get(i).getPartNo()+"超过可退料数量："+getNowIssure.getTransQty());
+                    }
+                }
+            }
+        }
+
+
+
         List<Object> params = new ArrayList<>();
         params.add(inList.get(0).getSite());
         params.add(inList.get(0).getWarehouseId());

src/main/java/com/heai/modules/production/dao/DailyPlanMapper.java

@@ -1006,4 +1006,9 @@ public interface DailyPlanMapper {
     List<SOOPInspectData> checkFqcInspectForSeqNo(SOScheduledRoutingOutData inData);
 
     List<SoBomData> checkBomHasRcScSP(SOScheduledRoutingOutData inData);
+
+    List<SOScheduledRoutingOutData> checkCirculation(Integer seqNo);
+
+    TransDetailData getNowIssure(@Param("orderRef3") String orderRef3,
+                                 @Param("partNo") String partNo);
 }

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

@@ -1,7 +1,9 @@
 package com.heai.modules.production.entity;
 
-import java.util.Date;
+import org.apache.ibatis.type.Alias;
 
+import java.util.Date;
+@Alias("TransDetailData")
 public class TransDetailData {
     /**
      *

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

@@ -1270,7 +1270,8 @@
     Round( dbo.Get_scheduleIssure(a.Site,a.SeqNo),2) as qtyIssure,Round(QtyReported*dbo.Get_PartWeightFactorForReport(a.Site,a.partNo,null),2) as reportWeight,
     Round(dbo.Get_scheduleIssure(a.Site,a.SeqNo) -QtyReported*dbo.Get_PartWeightFactorForReport(a.Site,a.partNo,null),2)  as qty,
     dbo.Get_ScheduleissurePartNo(a.Site,a.SeqNo) issurePartNo ,dbo.Get_Part_SpecDesc(a.Site,dbo.Get_ScheduleissurePartNo(a.Site,a.SeqNo)) issurePartDesc
-    ,dbo.Get_scheduleHunlianTask(a.site,a.seqNo) TaskNo
+    ,dbo.Get_scheduleHunlianTask(a.site,a.seqNo) TaskNo, case when isnull(a.QtyReported,0)>0 then   Round(dbo.Get_scheduleIssure(a.Site,a.SeqNo) -QtyReported*dbo.Get_PartWeightFactorForReport(a.Site,a.partNo,null) *1000/a.QtyReported,2)
+    else null end as realQty
     from SOScheduledRouting a
 
      <where>
@@ -1427,4 +1428,14 @@
         from SOBOM
         where site=#{site} and OrderNo=#{orderNo} and (ComponentPartNo like 'SP' or ComponentPartNo like 'RC' or ComponentPartNo like 'SC' )
     </select>
+
+    <select id="checkCirculation" resultType="SOScheduledRoutingOutData">
+        select site,seqNo from SOScheduledRouting where circulation_seqNo=#{seqNo,jdbcType=INTEGER}
+    </select>
+
+    <select id="getNowIssure" resultType="TransDetailData">
+        select PartNo,Sum( case when Direction='-' then TransQty else  TransQty*(-1.0) end   )  as transQty
+        from TransDetail where OrderRef3=#{orderRef3} and TransNo like 'SI%' and PartNo=#{partNo}
+        GROUP BY PartNo
+    </select>
  </mapper>

src/main/resources/mapper/taskmanage/TaskListDao.xml

@@ -41,7 +41,7 @@
         OrderRef3,OrderRefType,OrderRef4,taskType,oldSpec,newSpec
         from task_list
         <where>
-            site = #{site}
+            and site = #{site}
             <if test="department != null and department != ''">
                 and department like #{department}
             </if>