Merge remote-tracking branch 'origin/master'

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

@@ -11,7 +11,9 @@ import com.heai.modules.production.dao.AbnormalMapper;
 import com.heai.modules.production.dao.DailyPlanMapper;
 import com.heai.modules.production.entity.*;
 import com.heai.modules.production.service.AbnormalService;
+import com.heai.modules.sys.dao.SysUserRoleDao;
 import com.heai.modules.sys.entity.SysUserEntity;
+import com.heai.modules.sys.entity.SysUserRoleEntity;
 import com.heai.modules.taskmanage.dto.TaskDto;
 import com.heai.modules.taskmanage.entity.TaskDetailEntity;
 import com.heai.modules.taskmanage.service.TaskListService;
@@ -46,6 +48,11 @@ public class AbnormalServiceImpl implements AbnormalService {
     private TaskListService taskListService;
     @Autowired
     private SysOssDao sysOssDao;
+
+    @Autowired
+    private SysUserRoleDao sysUserRoleDao;
+
+
     @Override
     public List<AbnormalItemData> getAbnormalCodeList(){
         return abnormalMapper.getAbnormalCodeList();
@@ -138,6 +145,11 @@ public class AbnormalServiceImpl implements AbnormalService {
     @Override
     @Transactional
     public void closeFeedBack(AbnormalFeedBackDataIn inData){
+        Long userId = ((SysUserEntity) SecurityUtils.getSubject().getPrincipal()).getUserId();
+        List<SysUserRoleEntity> checkRole=sysUserRoleDao.checkRole(userId,"('超级管理员','管理员','实验室人员')");
+        if(checkRole.size()==0){
+            throw new RuntimeException("只有实验室和管理员可以结单！");
+        }
         abnormalMapper.updateFeedBackFirstCloseDate(inData);
         inData.setStatus("已完结");
         abnormalMapper.updateFeedBackStatus(inData);
@@ -145,6 +157,11 @@ public class AbnormalServiceImpl implements AbnormalService {
 
     @Override
     public void openFeedBack(AbnormalFeedBackDataIn inData){
+        Long userId = ((SysUserEntity) SecurityUtils.getSubject().getPrincipal()).getUserId();
+        List<SysUserRoleEntity> checkRole=sysUserRoleDao.checkRole(userId,"('超级管理员','管理员','实验室人员')");
+        if(checkRole.size()==0){
+            throw new RuntimeException("只有实验室和管理员可以开启！");
+        }
 
         List<AbnormalFeedBackData> list=abnormalMapper.getAbnormalFeedBackById(inData);
         if(list.size()==0){

src/main/java/com/heai/modules/sys/controller/SysConfigController.java

@@ -23,6 +23,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("/sys/config")
 public class SysConfigController extends AbstractController {
+
 	@Autowired
 	private SysConfigService sysConfigService;
 	

src/main/java/com/heai/modules/sys/dao/SysUserRoleDao.java

@@ -3,8 +3,10 @@
 package com.heai.modules.sys.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.heai.modules.sys.entity.SysRoleEntity;
 import com.heai.modules.sys.entity.SysUserRoleEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -26,4 +28,7 @@ public interface SysUserRoleDao extends BaseMapper<SysUserRoleEntity> {
 	 * 根据角色ID数组，批量删除
 	 */
 	int deleteBatch(Long[] roleIds);
+
+
+	List<SysUserRoleEntity> checkRole(@Param("userId") Long userId, @Param("roleData") String roleData);
 }

src/main/java/com/heai/modules/sys/service/SysUserRoleService.java

@@ -3,7 +3,9 @@
 package com.heai.modules.sys.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.heai.modules.sys.entity.SysRoleEntity;
 import com.heai.modules.sys.entity.SysUserRoleEntity;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -27,4 +29,5 @@ public interface SysUserRoleService extends IService<SysUserRoleEntity> {
 	 * 根据角色ID数组，批量删除
 	 */
 	int deleteBatch(Long[] roleIds);
+
 }

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

@@ -44,6 +44,9 @@
             </if>
             <if test="status !=null and status != ''">
                 AND a.Status = #{status}
+            </if>
+            <if test="abnormalDesc !=null and abnormalDesc != ''">
+                AND b.abnormalDesc like #{abnormalDesc}
             </if>
              <if test="partDesc !=null and partDesc != ''">
                 AND dbo.Get_Part_SpecDesc(sos.site,sos.PartNo) like #{partDesc}

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

@@ -8,8 +8,8 @@
 
     <select id="getShopOrderData" resultType="com.heai.modules.production.entity.ShopOrderData" parameterType="com.heai.modules.production.entity.DailyPlanInData">
         select  a.site, a.OrderNo,a.PartNo,a.Status,a.PlanStartDate,a.NeedDate,a.LotSize,a.EnterDate,a.UserName,
-        P.Spec+'/'+isnull(P.PartDescription,'') PartDescription,P.Spec,ROUND(ISNULL(so.scheduling_size,0),3) as scheduling_size,dbo.Get_PartWeightFactorForReport(a.site,a.PartNo,a.OrderNo) as weightFactor,
-        Round(dbo.Get_PartWeightFactorForReport(a.site,a.PartNo,a.OrderNo)*a.LotSize,2) as weight
+        P.Spec+'/'+isnull(P.PartDescription,'') PartDescription,P.Spec,ROUND(ISNULL(so.scheduling_size,0),3) as scheduling_size,P.NetWeight/1000 as weightFactor,
+        Round(isnull(P.NetWeight/1000,1)*a.LotSize,2) as weight
         ,dbo.Get_E_OriginalOrderTypeDesc(a.site, a.OrderNo) orderTypeDesc
         FROM ShopOrder a
         LEFT JOIN Part P ON P.PartNo=a.PartNo AND a.site=P.Site
@@ -53,7 +53,7 @@
             </if>
             AND a.PartNo like 'SP%'
         </where>
-        order by a.PlanStartDate
+        order by  case when dbo.Get_E_OriginalOrderTypeDesc(a.site, a.OrderNo) in ('变更订单','加急订单')  then 1 else 2 end , a.PlanStartDate
     </select>
 
     <select id="getGenerateReportList" resultType="com.heai.modules.production.entity.GenerateReportData">
@@ -230,8 +230,8 @@
     <select id="getShopOrderRoutingData" resultType="ShopOrderRoutingData">
         select   a.site, a.OrderNo,a.PartNo,a.Status,a.PlanStartDate,a.NeedDate,a.LotSize,a.EnterDate,a.UserName,a.MaterialSplitFlag,a.RepairSOFlag,
         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,
+        S.machRunFactor,S.factorUnit,S.ItemNo,S.OperationDesc,s.Efficiency,isnull(SOP.TotalFinishedQty,0) lastApproveQty,P.NetWeight/1000 weightFactor,
+        Round(isnull(P.NetWeight/1000,1)*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,Round(S.DefectiveQty,3) DefectiveQty,dbo.Get_PartValue( a.site,a.PartNo,'CURING METHOD') cuiHuaJi,
         Round((a.LotSize- S.qtyReported)/case when s.MachRunFactor=0 then 1000000 else s.MachRunFactor end  ,1) lastTime
         ,dbo.Get_E_OriginalOrderTypeDesc(a.site, a.OrderNo) orderTypeDesc
@@ -292,7 +292,8 @@
                 and a.E_Levels = #{eLevels}
             </if>
         </where>
-        order by a.PlanStartDate desc,s.itemNo
+       order by  case when dbo.Get_E_OriginalOrderTypeDesc(a.site, a.OrderNo) in ('变更订单','加急订单')  then 1 else 2 end ,
+        a.PlanStartDate desc,s.itemNo
     </select>
     <select id="getShopOrderRoutingVPData" resultType="ShopOrderRoutingData">
          select t.OrderNo as liuhuaOrderNo,t.site,SO.PartNo,dbo.Get_Part_SpecDesc(t.site,T.partno) as liuhuaPartDescSpec,t.partNo as liuhuaPartNo
@@ -357,7 +358,7 @@
                 and dbo.Get_Part_SpecDesc(t.site,T.partno) like #{liuhuaPartDescSpec}
             </if>
         </where>
-        order by h.OrderDate ,so.partNo,s.itemNo
+        order by   case when dbo.Get_E_OriginalOrderTypeDesc(t.site, t.OrderNo) in ('变更订单','加急订单')  then 1 else 2 end , h.OrderDate ,so.partNo,s.itemNo
     </select>
 <update id="updateSOTaskCombineTime">
     update SOTaskOrderHeader set CombineTime = GetDate() where site=#{site} and orderNo=#{orderNo}
@@ -366,8 +367,8 @@
      <select id="getSOTastRoutingData" resultType="ShopOrderRoutingData">
         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,so.RepairSOFlag,
         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
+        S.machRunFactor,S.factorUnit,S.ItemNo,S.OperationDesc,s.Efficiency,a.qtyfinished,a.finishFlag,ROUND(isnull(P.NetWeight/1000,1)*a.OrderQty,2) as weight,
+         P.NetWeight/1000 as weightFactor,dbo.Get_PartPlanQty(a.site,a.PartNo,a.OrderRef1) partPlanQty,so.needDate,cod.PlanShipDate
         ,a.comBineTime lastStartDate,dbo.Get_PartValue( a.site,a.PartNo,'CURING METHOD') cuiHuaJi,dbo.Get_PartValue( a.site,a.PartNo,'TIME') liuHuaShiJian,dbo.Get_PartValue( a.site,a.PartNo,'CURING METHOD') yangHuaJiType
         ,case when dbo.Get_PartNumberValue( a.site,a.PartNo,'PLAN-QUANTITY') is not null and dbo.Get_PartNumberValue( a.site,a.PartNo,'CAVITY') is not null
         then   CEILING((a.OrderQty-isnull(SL.scheduledQty,0))/(dbo.Get_PartNumberValue( a.site,a.PartNo,'PLAN-QUANTITY')*dbo.Get_PartNumberValue( a.site,a.PartNo,'CAVITY'))) else null end as banQty,
@@ -429,7 +430,7 @@
                 AND  #{endDate4} >=  cod.PlanShipDate
             </if>
         </where>
-        order by a.OrderDate desc,s.itemNo
+        order by  case when dbo.Get_E_OriginalOrderTypeDesc(so.site, so.OrderNo) in ('变更订单','加急订单')  then 1 else 2 end , a.OrderDate desc,s.itemNo
     </select>
 
     <select id="getWorkCenterOperatorList" resultType="OperatorData">
@@ -902,7 +903,7 @@
                                    LEFT JOIN Part c on b.PartNo=c.PartNo and b.site=c.site
 
          <where>
-            and a.Status!='已取消' and a.ToTypeFlag_DB not in ('I','Q')
+            and a.Status!='已取消' and a.ToTypeFlag_DB  = 'W'
             <if test="startDate != null ">
                 and TransDate >= #{startDate}
             </if>

src/main/resources/mapper/sys/SysUserRoleDao.xml

@@ -13,4 +13,10 @@
 	<select id="queryRoleIdList" resultType="long">
 		select role_id from sys_user_role where user_id = #{value}
 	</select>
+
+	<select id="checkRole" resultType="com.heai.modules.sys.entity.SysUserRoleEntity">
+		select a.role_id as roleId
+		from sys_user_role a left join sys_role b on a.role_id=b.role_id
+		where a.user_id=#{userId,jdbcType=BIGINT}  and b.role_name in ${roleData}
+	</select>
 </mapper>