From 62559d17b05dccd0f2bd7d95dc3e84a78ff7f2b0 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Mon, 14 Nov 2022 18:24:09 +0800
Subject: [PATCH] =?UTF-8?q?0412=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../board/entity/ViewKanbanSoHunlianPlanData.java        | 9 +++++++++
 .../production/service/impl/DailyPlanServiceImpl.java    | 8 ++++----
 .../heai/modules/sys/controller/SysMenuController.java   | 3 ++-
 .../modules/sys/service/impl/SysUserServiceImpl.java     | 8 ++++----
 src/main/resources/mapper/board/BoardMapper.xml          | 6 +++---
 src/main/resources/mapper/production/DailyPlanMapper.xml | 8 ++++----
 .../mapper/production/SOTaskOrderHeaderMapper.xml        | 2 +-
 7 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/heai/modules/board/entity/ViewKanbanSoHunlianPlanData.java b/src/main/java/com/heai/modules/board/entity/ViewKanbanSoHunlianPlanData.java
index b9028af..821fe24 100644
--- a/src/main/java/com/heai/modules/board/entity/ViewKanbanSoHunlianPlanData.java
+++ b/src/main/java/com/heai/modules/board/entity/ViewKanbanSoHunlianPlanData.java
@@ -85,6 +85,7 @@ public class ViewKanbanSoHunlianPlanData {
     private String finishedFlag;
     private int number;
     private String erpStatus;
+    private String dispatchedHunlian;
     public String getOrderNo() {
         return orderNo;
     }
@@ -228,5 +229,13 @@ public class ViewKanbanSoHunlianPlanData {
     public void setErpStatus(String erpStatus) {
         this.erpStatus = erpStatus;
     }
+
+    public String getDispatchedHunlian() {
+        return dispatchedHunlian;
+    }
+
+    public void setDispatchedHunlian(String dispatchedHunlian) {
+        this.dispatchedHunlian = dispatchedHunlian;
+    }
 }
 
diff --git a/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java b/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java
index 6863acd..d755737 100644
--- a/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java
+++ b/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java
@@ -559,10 +559,7 @@ public class DailyPlanServiceImpl implements DailyPlanService {
 
     @Override
     public void addSkill(WorkCenterData inData){
-        List<WorkCenterData> checkList=dailyPlanMapper.checkWorkCenterOperatorData(inData);
-        if(checkList.size()==0){
-            dailyPlanMapper.addSkill(inData);
-        }
+
     }
 
     @Override
@@ -817,6 +814,9 @@ public class DailyPlanServiceImpl implements DailyPlanService {
         if("Y".equals(saveData.getClosedFlag())){
             throw new RuntimeException("派工单已关闭无法流转！");
         }
+        if(saveData.getCirculationSeqNo()!=null){
+            throw new RuntimeException("派工单已流转无需再次流转！");
+        }
         int nextSeqNo=dailyPlanMapper.getDataSequence();
         dailyPlanMapper.updateDataSequence();
         saveData.setSeqNo(nextSeqNo);
diff --git a/src/main/java/com/heai/modules/sys/controller/SysMenuController.java b/src/main/java/com/heai/modules/sys/controller/SysMenuController.java
index 0482f6d..49017c1 100644
--- a/src/main/java/com/heai/modules/sys/controller/SysMenuController.java
+++ b/src/main/java/com/heai/modules/sys/controller/SysMenuController.java
@@ -52,7 +52,8 @@ public class SysMenuController extends AbstractController {
 	@GetMapping("/list")
 	@RequiresPermissions("sys:menu:list")
 	public List<SysMenuEntity> list(){
-		List<SysMenuEntity> menuList = sysMenuService.list();
+		// List<SysMenuEntity> menuList = sysMenuService.list();
+		List<SysMenuEntity> menuList =sysMenuService.lambdaQuery().orderBy(true,true,SysMenuEntity::getOrderNum).list();
 		for(SysMenuEntity sysMenuEntity : menuList){
 			SysMenuEntity parentMenuEntity = sysMenuService.getById(sysMenuEntity.getParentId());
 			if(parentMenuEntity != null){
diff --git a/src/main/java/com/heai/modules/sys/service/impl/SysUserServiceImpl.java b/src/main/java/com/heai/modules/sys/service/impl/SysUserServiceImpl.java
index ebd109c..50133dd 100644
--- a/src/main/java/com/heai/modules/sys/service/impl/SysUserServiceImpl.java
+++ b/src/main/java/com/heai/modules/sys/service/impl/SysUserServiceImpl.java
@@ -125,12 +125,12 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserDao, SysUserEntity> i
 		}
 		
 		//查询用户创建的角色列表
-		List<Long> roleIdList = sysRoleService.queryRoleIdList(user.getCreateUserId());
+		// List<Long> roleIdList = sysRoleService.queryRoleIdList(user.getCreateUserId());
 
 		//判断是否越权
-		if(!roleIdList.containsAll(user.getRoleIdList())){
-			throw new RRException("新增用户所选角色，不是本人创建");
-		}
+		// if(!roleIdList.containsAll(user.getRoleIdList())){
+		// 	throw new RRException("新增用户所选角色，不是本人创建");
+		// }
 	}
 
 	@Override
diff --git a/src/main/resources/mapper/board/BoardMapper.xml b/src/main/resources/mapper/board/BoardMapper.xml
index 46e3d18..749262b 100644
--- a/src/main/resources/mapper/board/BoardMapper.xml
+++ b/src/main/resources/mapper/board/BoardMapper.xml
@@ -50,7 +50,7 @@
 
     <select id="productionBlankingSearch" resultType="com.heai.modules.board.entity.ViewKanbanSoHunlianPlanData" parameterType="com.heai.modules.production.entity.DailyPlanInData">
         select OrderNo,site,PartNo,PartDescSpec,ComponentPartNo,CompPartDescSpec,SJPH1,SJPH_QtyReq1,SJPH2,SJPH_QtyReq2,QtyRequired,QtyFinished,PlanStartDate,CompOrderNo,
-        FinishedFlag,erpStatus FROM view_KANBAN_SO_Hunlian_Plan
+        FinishedFlag,erpStatus,dispatched_hunlian  dispatchedHunlian FROM view_KANBAN_SO_Hunlian_Plan
         <where>
             <if test="sql != null ">
                  AND  #{sql} >=   PlanStartDate
@@ -61,10 +61,10 @@
             <if test="partDescSpec != null and partDescSpec != ''">
                 AND PartDescSpec like #{partDescSpec}
             </if>
-
+            and dispatchedHunlian='N'
 
         </where>
-        Order By PlanStartDate
+        Order By ComponentPartNo,PlanStartDate
     </select>
 
     <select id="transFerBoard" resultType="TransFerBoardData" >
diff --git a/src/main/resources/mapper/production/DailyPlanMapper.xml b/src/main/resources/mapper/production/DailyPlanMapper.xml
index 7c5ca89..714becc 100644
--- a/src/main/resources/mapper/production/DailyPlanMapper.xml
+++ b/src/main/resources/mapper/production/DailyPlanMapper.xml
@@ -187,16 +187,16 @@
         LEFT JOIN ScheduleList SL on S.site=SL.site and S.OrderNo=SL.orderNo and S.ItemNo=SL.ItemNo
         LEFT JOIN SORoutingOutput SOP ON a.site=SOP.site and a.OrderNo=SOP.OrderNo and SOP.itemNo=dbo.Get_SORouting_PreviousOperationItemNo(a.site,a.OrderNo,S.itemNo)
          <where>
-           a.E_Levels in (0,2)
+           a.E_Levels =0
            <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="status !=null and status != ''">
-                AND a.Status IN ${status}
-            </if>
+<!--            <if test="status !=null and status != ''">-->
+<!--                AND a.Status IN ${status}-->
+<!--            </if>-->
             <if test="startDate1 != null ">
                 AND a.EnterDate >=   #{startDate1}
             </if>
diff --git a/src/main/resources/mapper/production/SOTaskOrderHeaderMapper.xml b/src/main/resources/mapper/production/SOTaskOrderHeaderMapper.xml
index 19c995b..a8c1a12 100644
--- a/src/main/resources/mapper/production/SOTaskOrderHeaderMapper.xml
+++ b/src/main/resources/mapper/production/SOTaskOrderHeaderMapper.xml
@@ -117,7 +117,7 @@ SOT.PartNo,SOT.UserName,SOT.EnterDate,SOT.Qtyfinished,SOT.QtyFinished_Ontime,SOT
 </select>
 
     <select id="getWorkPlanDataByOrderRef1AndDate" resultType="com.heai.modules.production.entity.SOTaskOrderHeaderData" parameterType="com.heai.modules.production.entity.SOTaskOrderHeaderData">
-        select  orderNo,OrderQty,CloseFlag FROM SOTaskOrderHeader WHERE OrderRef1 = #{orderRef1} and OrderDate =#{orderDate} AND  AND Status !='已取消'
+        select  orderNo,OrderQty,CloseFlag FROM SOTaskOrderHeader WHERE OrderRef1 = #{orderRef1} and OrderDate =#{orderDate}  AND Status !='已取消'
     </select>
 
     <update id="updateCirculation" parameterType="com.heai.modules.production.entity.DailyPlanInData">