111

src/main/java/com/spring/modules/request/service/impl/RequestManageServiceImpl.java

@@ -208,6 +208,7 @@ public class RequestManageServiceImpl extends ServiceImpl<RequestManageMapper, P
             List<PlmFieldData> relList = new ArrayList<>();
             relList.add(new PlmFieldData("operatorId#engineer", "PE Engineer"));
             relList.add(new PlmFieldData("operatorId#technician", "Artwork"));
+            relList.add(new PlmFieldData("operatorId#dcc", "DCC"));
             return relList;
         }
         List<PlmFieldData> list = requestManageMapper.getFieldList(inData);

src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml

@@ -63,7 +63,7 @@
            a.csOperater,
            dbo.get_userDisPlay(a.csOperater)                                             csOperaterName
             ,
-           a.dccOperater,
+        dbo.get_technicalSpecificationTeamNo(a.site, a.code_no, 'dcc') dccOperater,
             dbo.get_technicalSpecificationTeamNames(a.site, a.code_no, 'dcc')               dccOperaterName,
            d.is_reject,
            d.node_id,
@@ -117,11 +117,11 @@
 <insert id="saveTechnicalSpecificationSheet">
     insert into plm_technical_specification_sheet(site,code_no,project_id,test_part_no,status,rev_no,ECN_flag,ECN_no,ECN_address,remark,
     create_date,create_by,proofing_no,ori_code_no,bom_type,eng_chg_level,bom_alternative_no,routing_type,routing_revision,routing_alternative_no,stage,materialType,step_id
-    ,cqcOperator,faiOperator,peOperater,csOperater,dccOperater,mpOperator)
+    ,cqcOperator,faiOperator,peOperater,csOperater,mpOperator)
      values
       (#{site},#{codeNo},#{projectId},#{testPartNo},#{status},#{revNo},#{ecnFlag},#{ecnNo},#{ecnAddress}
     ,#{remark},GetDate(),#{createBy},#{proofingNo},#{oriCodeNo},#{bomType},#{engChgLevel,jdbcType=INTEGER},#{bomAlternativeNo},#{routingType},#{routingRevision,jdbcType=INTEGER},#{routingAlternativeNo},'Sample','Label',10
-    ,#{cqcOperator},#{faiOperator},#{peOperater},#{csOperater},#{dccOperater},#{mpOperator})
+    ,#{cqcOperator},#{faiOperator},#{peOperater},#{csOperater},#{mpOperator})
 </insert>
 
 <update id="updateProjectPartNowBm">
@@ -137,7 +137,7 @@
     update plm_technical_specification_sheet set project_id=#{projectId},test_part_no=#{testPartNo},status=#{status}
     ,rev_no=#{revNo},ECN_no=#{ecnNo},ECN_flag=#{ecnFlag},ECN_address=#{ecnAddress},remark=#{remark},update_date=GetDate(),update_by=#{updateBy}
     ,cqcOperator=#{cqcOperator},faiOperator=#{faiOperator},peOperater=#{peOperater},
-    csOperater=#{csOperater},dccOperater=#{dccOperater},mpOperator=#{mpOperator}
+    csOperater=#{csOperater},mpOperator=#{mpOperator}
     where id=#{id}
 </update>
 
@@ -177,7 +177,7 @@
         ,a.overPrintOperator, a.printOperator,dbo.get_userDisPlay(a.overPrintOperator) overPrintOperatorName,dbo.get_userDisPlay(a.printOperator) printOperatorName
         ,a.peOperater,dbo.get_userDisPlay(a.peOperater) peOperaterName
         ,a.csOperater,dbo.get_userDisPlay(a.csOperater) csOperaterName
-        ,a.dccOperater,dbo.get_userDisPlay(a.dccOperater) dccOperaterName,isnull(a.step_id,10) stepId,d.is_reject,a.pod, d.node_id, d.node_name,
+        ,isnull(a.step_id,10) stepId,d.is_reject,a.pod, d.node_id, d.node_name,
         a.mpOperator,dbo.get_userDisPlay(a.mpOperator) mpOperatorName
         ,dbo.get_technicalSpecificationTeamName(a.site,a.code_no,'technician') technician,
             dbo.get_technicalSpecificationTeamNo(a.site, a.code_no, 'engineer')         engineerNo,
@@ -254,7 +254,7 @@
 <update  id="updateBMBasicInformation" >
     update plm_technical_specification_sheet set status=#{status},stage=#{stage},remarkPage=#{remarkPage}
     ,rev_no=#{revNo},ECN_no=#{ecnNo},ECN_flag=#{ecnFlag},ECN_address=#{ecnAddress},cqcOperator=#{cqcOperator},update_date=GetDate(),update_by=#{updateBy}
-    ,faiOperator=#{faiOperator},peOperater=#{peOperater},csOperater=#{csOperater},dccOperater=#{dccOperater},pod=#{pod},mpOperator=#{mpOperator}
+    ,faiOperator=#{faiOperator},peOperater=#{peOperater},csOperater=#{csOperater},pod=#{pod},mpOperator=#{mpOperator}
     where site=#{site} and  code_no=#{codeNo}
 </update>
 
@@ -1038,7 +1038,7 @@ pressure,updateDate,updateBy,remark) values
           id,site,code_no,proofing_no,project_id,test_part_no,status,rev_no,work_center_no,ECN_flag,ECN_no,ECN_address,remark,
 create_date,create_by,update_date,update_by,picture_addess,customerPictureChangeRemark,productionFileComments,
 ori_code_no,bom_type,eng_chg_level,bom_alternative_no,routing_type,routing_revision,routing_alternative_no,remarkPage,
-process,stage,materialType,cqcOperator,faiOperator,overPrintOperator,printOperator,peOperater,csOperater,dccOperater,
+process,stage,materialType,cqcOperator,faiOperator,overPrintOperator,printOperator,peOperater,csOperater,
 step_id,reject_flag,reject_step_id,mpOperator,pod
         FROM plm_technical_specification_sheet a
         where a.site = #{site} and a.code_no = #{codeNo}