1127

ccl-plm-java.iml

@@ -220,6 +220,6 @@
     <orderEntry type="library" name="Maven: com.github.s7connector:s7connector:2.1" level="project" />
     <orderEntry type="library" name="Maven: com.ghgande:j2mod:3.2.1" level="project" />
     <orderEntry type="library" name="Maven: com.fazecast:jSerialComm:2.10.4" level="project" />
-    <orderEntry type="library" name="Maven: com.github.dathlin:HslCommunication:3.7.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.xingshuangs:iot-communication:1.5.3" level="project" />
   </component>
 </module>

src/main/java/com/spring/modules/Tooling/data/PlmProjectToolApplyDetailData.java

@@ -10,4 +10,7 @@ public class PlmProjectToolApplyDetailData extends PlmProjectToolApplyDetail {
     public String toolDesc;
     public String operationName;
     public String operationNo;
+    public String customerPartNo;
+    public String partDesc;
+    public String ifsPartNo;
 }

src/main/java/com/spring/modules/base/dao/BaseMapper.java

@@ -274,7 +274,7 @@ public interface BaseMapper {
      * @throw
      */
     void deleteAccessProjectByUser(AccessProjectData inData);
-
+    void deleteAccessProjectByUserPlus(AccessProjectData inData);
     /**
      * @param inData
      * @return void

src/main/java/com/spring/modules/base/data/AccessProjectData.java

@@ -8,6 +8,7 @@ public class AccessProjectData {
     private String site;
     private String username;
     private String projectId;
+    private String sql;
     private List<PlmUserRoleData>  accessProjectList;
 
 
@@ -42,4 +43,12 @@ public class AccessProjectData {
     public void setAccessProjectList(List<PlmUserRoleData> accessProjectList) {
         this.accessProjectList = accessProjectList;
     }
+
+    public String getSql() {
+        return sql;
+    }
+
+    public void setSql(String sql) {
+        this.sql = sql;
+    }
 }

src/main/java/com/spring/modules/base/service/Impl/BaseServiceImpl.java

@@ -460,6 +460,15 @@ public class BaseServiceImpl implements BaseService {
     @Override
     @Transactional
     public  void saveAccessProject(AccessProjectData data){
+        String sql=" and project_id in (";
+        for (int i = 0; i < data.getAccessProjectList().size(); i++) {
+            if(i!=data.getAccessProjectList().size()-1){
+                sql=sql+"'"+data.getAccessProjectList().get(i).getProjectId()+"',";
+            }
+            sql=sql+"'"+data.getAccessProjectList().get(i).getProjectId()+"'";
+        }
+        sql=sql+")";
+        baseMapper.deleteAccessProjectByUserPlus(data);
         baseMapper.deleteAccessProjectByUser(data);
         for (int i = 0; i <data.getAccessProjectList().size() ; i++) {
             baseMapper.saveAccessProject(data.getAccessProjectList().get(i));

src/main/resources/mapper/Tooling/ProjectToolingApplyMapper.xml

@@ -213,10 +213,15 @@
                dbo.plm_get_toolDesc(a.site, a.tool_id) toolDesc,
                a.orderRef6,
                b.operation_no,
-               b.operation_name
+               b.operation_name,
+                g.customer_part_no,
+                h.part_desc,
+                h.final_part_no  ifs_part_no
         from plm_project_tool_applyDetail a
-                 left join plm_routing_component b
-                           on a.site = b.site and a.orderRef6 = convert(varchar(20), b.operation_id)
+         left join plm_routing_component b on a.site = b.site and a.orderRef6 = convert(varchar(20), b.operation_id)
+         left join plm_project_info f on a.site=f.site and a.orderRef1=f.project_id
+         left join plm_customer_part_info g on a.site=g.site and f.customer_id=g.customer_no and a.orderRef2 =g.part_no
+         left join view_Project_Part h on b.site=h.site and a.orderRef2=h.test_part_no and a.orderRef1=h.project_id
         <where>
             <if test="site != null and site != ''">
                 AND a.site = #{site}

src/main/resources/mapper/base/BaseMapper.xml

@@ -171,7 +171,6 @@
         where a.site=#{site} and a.role_no=#{roleNo}  and b.active='Y'
     </select>
 
-
     <select id="selectUserBySite" resultType="SysUserData">
         select a.username,a.user_display from sys_user a left join AccessSite b on a.site=b.site and a.username=b.UserID
         where b.site=#{site} and a.status=1
@@ -190,13 +189,32 @@
         delete from AccessRole where site=#{site} and role_no=#{roleNo}
     </delete>
     <select id="searchAccessProjectForUser" resultType="PlmUserRoleData">
-        select a.project_id,a.project_name,a.project_desc,a.site,isnull(c.searchFlag,'N') searchFlag
+        select top 2000 a.project_id,a.project_name,a.project_desc,a.site,isnull(c.searchFlag,'N') searchFlag
         ,isnull(c.updateFlag,'N') updateFlag,isnull(c.downFlag,'N') downFlag,isnull(c.deleteFlag,'N') deleteFlag,#{username} as username
         from plm_project_info a left join AccessSite b on a.site=b.site
         left join AccessProject c on a.project_id=c.project_id  and c.site=#{site} and c.username=#{username}
          <where>
           and b.UserID=#{username}
            and  a.site=#{site}
+         <if test="projectId != null and projectId != ''">
+                AND isnull(a.project_id,'N') like #{projectId}
+            </if>
+            <if test="projectName != null and projectName != ''">
+                AND isnull(a.project_name,'N') like #{projectName}
+            </if>
+            <if test="searchFlag != null and searchFlag != ''">
+                AND isnull(c.searchFlag,'N') = #{searchFlag}
+            </if>
+              <if test="updateFlag != null and updateFlag != ''">
+                AND isnull(c.updateFlag,'N') = #{updateFlag}
+            </if>
+              <if test="downFlag != null and downFlag != ''">
+                AND isnull(c.downFlag,'N') = #{downFlag}
+            </if>
+              <if test="deleteFlag != null and deleteFlag != ''">
+                AND isnull(c.deleteFlag,'N') = #{deleteFlag}
+            </if>
+
         </where>
          order by a.project_id desc
     </select>
@@ -204,6 +222,9 @@
     <delete id="deleteAccessProjectByUser">
         delete  from AccessProject where site=#{site} and username=#{username}
     </delete>
+      <delete id="deleteAccessProjectByUserPlus">
+        delete  from AccessProject where site=#{site} and username=#{username} ${sql}
+    </delete>
 
     <insert id="saveAccessProject">
         insert into AccessProject (site,project_id,username,searchFlag,updateFlag,downFlag,deleteFlag) values