24-03-13 出库检验

src/main/java/com/heai/modules/production/controller/DailyPlanController.java

@@ -511,6 +511,12 @@ public class DailyPlanController {
         return R.ok().put("rows", resultList).put("total",resultList.size());
     }
 
+    @PostMapping("/getSOScheduleRoutingDataPrint")
+    public R getSOScheduleRoutingDataPrint(@RequestBody SOScheduledRoutingOutData inData){
+        List<SOScheduledRoutingOutData> resultList = dailyPlanService.getSOScheduleRoutingDataPrint(inData);
+        return R.ok().put("rows", resultList).put("total",resultList.size());
+    }
+
     /**
      * @Description TODO
      * @Title saveGenerateReportForSchedule

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

@@ -341,6 +341,7 @@ public interface DailyPlanMapper {
      * @throw
      */
     List<SOScheduledRoutingOutData> getSOScheduleRoutingData(SOScheduledRoutingOutData inData);
+    List<SOScheduledRoutingOutData> getSOScheduleRoutingDataPrint(SOScheduledRoutingOutData inData);
     /**
      * @Description 实验室不区分权限的查询
      * @Title getSOScheduleRoutingData

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

@@ -428,6 +428,7 @@ public interface DailyPlanService  {
      * @throw
      */
     List<SOScheduledRoutingOutData> getSOScheduleRoutingData(SOScheduledRoutingOutData inData);
+    List<SOScheduledRoutingOutData> getSOScheduleRoutingDataPrint(SOScheduledRoutingOutData inData);
     SORoutingData searchReportedQty(GenerateReportData generateReportData);
     SORoutingData searchLastApproveQty(GenerateReportData generateReportData);
 

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

@@ -1054,6 +1054,11 @@ public class DailyPlanServiceImpl implements DailyPlanService {
     public List<SOScheduledRoutingOutData> getSOScheduleRoutingData(SOScheduledRoutingOutData inData){
         return dailyPlanMapper.getSOScheduleRoutingData(inData);
     }
+
+    @Override
+    public List<SOScheduledRoutingOutData> getSOScheduleRoutingDataPrint(SOScheduledRoutingOutData inData){
+        return dailyPlanMapper.getSOScheduleRoutingDataPrint(inData);
+    }
     @Override
     public SORoutingData searchReportedQty(GenerateReportData generateReportData){
 

src/main/java/com/heai/modules/taskmanage/service/impl/ChatHistoryServiceImpl.java

@@ -10,8 +10,10 @@ import com.heai.modules.oss.service.SysOssService;
 import com.heai.modules.taskmanage.dto.ChatHistoryDto;
 import com.heai.modules.taskmanage.entity.TaskDetailEntity;
 import com.heai.modules.taskmanage.entity.TaskListEntity;
+import com.heai.modules.taskmanage.entity.UsersEntity;
 import com.heai.modules.taskmanage.service.TaskDetailService;
 import com.heai.modules.taskmanage.service.TaskListService;
+import com.heai.modules.taskmanage.service.UsersService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -45,6 +47,9 @@ public class ChatHistoryServiceImpl extends ServiceImpl<ChatHistoryDao, ChatHist
     @Autowired
     private TaskDetailService taskDetailService;
 
+    @Autowired
+    private UsersService usersService;
+
     @Override
     public PageUtils queryPage(Map<String, Object> params) {
         IPage<ChatHistoryEntity> page = this.page(
@@ -71,10 +76,22 @@ public class ChatHistoryServiceImpl extends ServiceImpl<ChatHistoryDao, ChatHist
             }
             List<TaskDetailEntity> list = taskDetailService.lambdaQuery().eq(TaskDetailEntity::getTaskId, detail.getTaskId()).list();
             List<Integer> ids = list.stream().map(TaskDetailEntity::getId).collect(Collectors.toList());
-            return wrapper.in(ChatHistoryEntity::getTaskId,ids).list();
+            wrapper.in(ChatHistoryEntity::getTaskId,ids);
+        }else {
+            wrapper.eq(ChatHistoryEntity::getTaskId, params.getTaskId());
         }
-        return wrapper.eq(ChatHistoryEntity::getTaskId,params.getTaskId()).list();
-
+        List<ChatHistoryEntity> list = wrapper.list();
+        for (ChatHistoryEntity chatHistoryEntity : list) {
+            String userName = chatHistoryEntity.getUserName();
+            String site = chatHistoryEntity.getSite();
+            UsersEntity user = usersService.lambdaQuery()
+                    .eq(UsersEntity::getUserid, userName.toUpperCase())
+                    .eq(UsersEntity::getSite, site).one();
+            if (Objects.nonNull(user)){
+                chatHistoryEntity.setUserName(user.getUsername());
+            }
+        }
+        return list;
     }
 
     @Override

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

@@ -528,6 +528,82 @@
         </where>
         order by a.S_ScheduledDate
     </select>
+
+    <select id="getSOScheduleRoutingDataPrint" resultType="SOScheduledRoutingOutData">
+        select a.Site,a.OrderNo,a.ItemNo,a.SeqNo,a.QtyRequired,a.QtyReported,a.QtyApprove,a.TimeRequired,a.TimeReported,a.previousSeqNo,a.previousBatchNo,a.materSeqNo,
+        a.BarcodeID,a.Remark,a.Crewsize,a.ClosedFlag,a.S_ScheduledDate,a.S_ResourceID,a.S_ScheduledSeqNo,a.S_ShiftNo,a.repairSOFlag,
+        a.S_WorkCenterNo, a.EnteredDate,a.scheduleType,a.operatorId,a.partNo,dbo.Get_Part_SpecDesc(a.Site,a.partNo) as partDesc,
+        dbo.Get_OperatorDesc(a.Site,a.operatorId) as operatorName,dbo.Get_ItemDesc(a.Site,a.OrderNo,a.ItemNo) as itemDesc,a.orderRef1 ,
+        dbo.Get_WorkCenterDesc(a.Site,a.S_WorkCenterNo) as workCenterDesc , dbo.Get_Part_SpecDesc(a.Site,a.partNo) as partSpec,a.circulation_seqNo,a.circulation_qty
+        ,dbo.Get_PartWeightFactorForReport(a.site,a.PartNo,a.OrderNo) as weightFactor,dbo.Get_Part_UMID(a.Site,a.PartNo) umid,a.jobType,
+        case when a.worktime is not null and a.worktime>0 then Round(a.QtyReported/a.worktime,2) else Round(a.QtyReported/0.1,2) end as efficiency,Round(isnull(a.workTime,0),2) workTime,
+        Round(dbo.Get_PartWeightFactorForReport(a.site,a.PartNo,a.OrderNo)*a.QtyRequired,2) as weight ,c.MachRunFactor
+        ,case when 0>=c.MachRunFactor then 0 else Round(a.QtyReported*100/case when isnull(a.worktime,0.1)=0 then 0.1 else isnull(a.worktime,0.1) end/c.MachRunFactor,2)  end as xiaolv
+        from SOScheduledRouting a
+          left join user_work_center uwc on a.site=uwc.site and a.S_WorkCenterNo =uwc.WorkCenterNo and uwc.userId=#{userId}
+          left join SORouting c on a.Site=c.Site and a.orderNo=c.orderNo and a.itemNo=c.itemNo
+         <where>
+        <if test="site != null and site != ''">
+            AND a.site = #{site}
+        </if>
+        <if test="orderNo != null and orderNo != ''">
+            AND a.OrderNo LIKE  #{orderNo}
+        </if>
+        <if test="partDesc != null and partDesc != ''">
+            AND  dbo.Get_Part_SpecDesc(a.Site,a.partNo) LIKE  #{partDesc}
+        </if>
+        <if test="seqNo != null ">
+            AND a.seqNo =  #{seqNo}
+        </if>
+        <if test="partNo != null and partNo != ''">
+            AND a.PartNo LIKE  #{partNo}
+        </if>
+         <if test="sWorkCenterNo != null and sWorkCenterNo != ''">
+            AND a.S_WorkCenterNo LIKE  #{sWorkCenterNo}
+        </if>
+
+        <if test="itemNo != null and itemNo != ''">
+            and a.ItemNo = #{itemNo}
+        </if>
+          <if test="itemDesc != null and itemDesc != ''">
+            and dbo.Get_ItemDesc(a.Site,a.OrderNo,a.ItemNo) = #{itemDesc}
+        </if>
+        <if test="closedFlag != null and closedFlag != ''">
+            and a.ClosedFlag = #{closedFlag}
+        </if>
+        <if test="startDate != null ">
+            and a.S_ScheduledDate >= #{startDate}
+        </if>
+        <if test="endDate != null ">
+            and #{endDate} >= a.S_ScheduledDate
+        </if>
+         <if test="scheduleType != null and scheduleType != ''">
+            and a.scheduleType = #{scheduleType}
+        </if>
+         <if test="reportFlag != null and reportFlag != ''">
+            and ${reportFlag}
+        </if>
+         <if test="operatorName != null and operatorName != ''">
+            and  dbo.Get_OperatorDesc(a.Site,a.operatorId) like #{operatorName}
+        </if>
+         <if test="sResourceID != null and sResourceID != ''">
+            and a.S_ResourceID like #{sResourceID}
+        </if>
+          <if test="sShiftNo != null and sShiftNo != ''">
+            and a.S_ShiftNo = #{sShiftNo}
+        </if>
+           <if test="previousSeqNo != null ">
+            and a.previousSeqNo = #{previousSeqNo}
+        </if>
+             <if test="materSeqNo != null ">
+            and a.materSeqNo = #{materSeqNo}
+        </if>
+            <if test="repairSOFlag != null and repairSOFlag != ''">
+                and a.repairSOFlag = #{repairSOFlag}
+            </if>
+        </where>
+        order by a.S_ScheduledDate
+    </select>
     <select id="checkUserSeqNo" resultType="SOScheduledRoutingOutData">
         select seqNo ,CancelReportFlag,a.mat_issueflag,a.site,a.OrderNo,a.ItemNo,a.QtyRequired,a.S_WorkCenterNo,a.operatorId,a.partNo,dbo.Get_Part_Spec(a.site,a.partNo) PartSpec
         ,PreviousSeqNo,PreviousBatchNo,materSeqNo from SOScheduledRouting a