0412更新

src/main/java/com/heai/common/utils/DateUtil.java

@@ -27,6 +27,26 @@ public class DateUtil {
         }
     }
 
+    public static Date getDateNotTime()  {
+        // 获取当前日期
+        Date currentDate = new Date();
+
+        // 创建 Calendar 对象，并将 currentDate 设置为时间
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(currentDate);
+
+        // 将时分秒部分设置为零
+        calendar.set(Calendar.HOUR_OF_DAY, 0);
+        calendar.set(Calendar.MINUTE, 0);
+        calendar.set(Calendar.SECOND, 0);
+        calendar.set(Calendar.MILLISECOND, 0);
+
+        // 获取当天日期（不带时分秒）
+        Date startDate = calendar.getTime();
+
+       return startDate;
+    }
+
 
     /**
      * 将时间转为小数

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

@@ -86,7 +86,7 @@ public class GenerateReportData {
     private Integer qtyRework;
     private String orderRef1;
     private String scheduleType;
-    private int seqNo;
+    private Integer seqNo;
     private Double approveWeight;
     private Double reportWeight;
     private Double moldQty;

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

@@ -25,6 +25,7 @@ public class ShopOrderRoutingData extends ShopOrderData{
     private float scheduledQty;
     private float qtyfinished;
     private Double partPlanQty;
+    private Double defectiveQty;
     private Integer eLevels;
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@@ -341,4 +342,12 @@ public class ShopOrderRoutingData extends ShopOrderData{
     public void setLastStartDate(Date lastStartDate) {
         this.lastStartDate = lastStartDate;
     }
+
+    public Double getDefectiveQty() {
+        return defectiveQty;
+    }
+
+    public void setDefectiveQty(Double defectiveQty) {
+        this.defectiveQty = defectiveQty;
+    }
 }

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

@@ -533,6 +533,9 @@ public class DailyPlanServiceImpl implements DailyPlanService {
         }else if(Integer.parseInt(String.valueOf(map.get("resultCode")))  != 200) {
             throw new RuntimeException(String.valueOf(map.get("resultMsg")));
         }
+
+        //判断是否群发所有部门异常信息 通过沟通看板，abnormalUser 表设定群发人员
+
         return R.ok().put("msg" ,"操作成功！");
     }
     @Override
@@ -595,6 +598,29 @@ public class DailyPlanServiceImpl implements DailyPlanService {
             transData=dailyPlanMapper.getTransData(inData.getSite(),transNo);
         }
         updateTvBase(inData.getSite(),"",inData.getSeqNo(),inData.getOperatorId());
+        if("PQ003".equals(inData.getBadCodeNo())&&(Double.parseDouble(inData.getQtyReported())> Double.parseDouble(inData.getQtyApprove()))) {
+            Date date = DateUtil.getDateToDate(new Date(), "yyyy-MM-dd");
+            // TaskDto taskDto=abnormalMapper.getOriginator();
+            TaskDto taskDto = new TaskDto();
+            taskDto.setSite(inData.getSite());
+
+            taskDto.setCreatedBy(inData.getUserId());
+            taskDto.setCustomer(inData.getSeqNo().toString());
+            taskDto.setProject("生产让步接收");
+            taskDto.setFinalStatus("未完成");
+            taskDto.setRequiredCompletionDate(date);
+            taskDto.setStatus("未受理");
+            taskDto.setTaskDescription("瑕疵品数量" + (Double.parseDouble(inData.getQtyReported()) - Double.parseDouble(inData.getQtyApprove())) + "让步接收");
+            taskDto.setTaskHeader(inData.getPartNo() + inData.getPartDescription());
+            taskDto.setTaskInitiator(taskDto.getCreatedBy());
+            taskDto.setTaskStartDate(date);
+            List<TaskDetailEntity> taskDetails = abnormalMapper.getAbnormalUsers(taskDto);
+            if (taskDetails.size() == 0) {
+                throw new RuntimeException("未维护异常反馈群发任务组！请联系管理员");
+            }
+            taskDto.setTaskDetails(taskDetails);
+            taskListService.saveBatchTaskList(taskDto);
+        }
         return R.ok().put("msg" ,"操作成功！").put("transData" ,transData);
     }
     @Override

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

@@ -231,7 +231,7 @@
         P.Spec+'/'+isnull(P.PartDescription,'') PartDescription,P.Spec,isnull(SL.scheduledQty,0) as scheduledQty,s.workCenterNo,S.qtyReported,S.qtyApprove,S.machSetupTime,
         S.machRunFactor,S.factorUnit,S.ItemNo,S.OperationDesc,s.Efficiency,isnull(SOP.TotalFinishedQty,0) lastApproveQty,dbo.Get_PartWeightFactorForReport(a.site,a.PartNo,a.OrderNo) weightFactor,
         Round(dbo.Get_PartWeightFactorForReport(a.site,a.PartNo,a.OrderNo)*a.LotSize,2) weight,dbo.Get_PartPlanQty(a.site,a.PartNo,a.OrderNo) partPlanQty,cod.PlanShipDate,
-        dbo.Get_LastStartTime( a.site, a.OrderNo,S.ItemNo) LastStartDate
+        dbo.Get_LastStartTime( a.site, a.OrderNo,S.ItemNo) LastStartDate,Round(S.DefectiveQty,3) DefectiveQty
         FROM ShopOrder a
         LEFT JOIN Part P ON P.PartNo=a.PartNo AND a.site=P.Site
         LEFT JOIN SORouting S on S.site=a.site and S.OrderNo=a.orderNo
@@ -297,7 +297,7 @@
 </update>
 
      <select id="getSOTastRoutingData" resultType="ShopOrderRoutingData">
-        select   a.site, a.OrderNo,a.PartNo,a.Status,a.OrderRef1,a.OrderDate,a.OrderQty as LotSize,
+        select   a.site, a.OrderNo,a.PartNo,a.Status,a.OrderRef1,a.OrderDate,a.OrderQty as LotSize,dbo.Get_PartValue(a.site,a.PartNo,'equipment') as equipment,
         P.Spec+'/'+isnull(P.PartDescription,'') PartDescription,P.Spec,isnull(SL.scheduledQty,0) as scheduledQty,s.workCenterNo,S.machSetupTime,
         S.machRunFactor,S.factorUnit,S.ItemNo,S.OperationDesc,s.Efficiency,a.qtyfinished,a.finishFlag,ROUND(dbo.Get_PartWeightFactorForReport(a.site,a.PartNo,a.OrderRef1)*a.OrderQty,2) as weight,
         dbo.Get_PartWeightFactorForReport(a.site,a.PartNo,a.OrderRef1) as weightFactor,dbo.Get_PartPlanQty(a.site,a.PartNo,a.OrderRef1) partPlanQty,so.needDate,cod.PlanShipDate