部分更新

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

@@ -50,7 +50,7 @@ public interface BaseMapper {
      * @return
      * @author rq
      */
-    CalendarData findByCalendarId(@Param("calendarId")String CalendarId);
+    CalendarData findByCalendarId(@Param("site")String site,@Param("calendarId")String CalendarId);
 
     /**
      * 保存新增日历

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

@@ -72,7 +72,7 @@ public class BaseServiceImpl implements BaseService {
             }
         }else{
             String CalendarId=indata.getCalendarId();
-            CalendarData checkData =  baseMapper.findByCalendarId(CalendarId);
+            CalendarData checkData =  baseMapper.findByCalendarId(indata.getSite(),CalendarId);
             if(checkData!=null){
                 responseData.setMsg("该日历编号已存在！");
                 return responseData;

src/main/java/com/gaotao/modules/shopOrder/dao/ProductionReportMapper.java

@@ -31,7 +31,26 @@ public interface ProductionReportMapper {
      * @throw
      */
     void saveProductionLineOperatorRegistration(OperatorData inData);
-
+    /**
+     * @Description FQC机台创建
+     * @Title saveOperatorResource
+     * @param
+     * @author rq
+     * @date 2021/10/9 16:37
+     * @return
+     * @throw
+     */
+    void saveOperatorResource(OperatorData inData);
+    /**
+     * @Description FQC机台创建
+     * @Title saveOperatorResource
+     * @param
+     * @author rq
+     * @date 2021/10/9 16:37
+     * @return
+     * @throw
+     */
+    void updateOperatorResource(OperatorData inData);
     /**
      * @Description 修改生产计划
      * @Title editProductionLineOperatorRegistration

src/main/java/com/gaotao/modules/shopOrder/service/Impl/ProductionReportServiceImpl.java

@@ -3,6 +3,7 @@ package com.gaotao.modules.shopOrder.service.Impl;
 import com.gaotao.common.utils.DateUtil;
 import com.gaotao.modules.base.dao.BaseMapper;
 import com.gaotao.modules.base.entity.AccessSiteData;
+import com.gaotao.modules.base.entity.CalendarData;
 import com.gaotao.modules.base.entity.SiteData;
 import com.gaotao.modules.base.entity.WorkCenterData;
 import com.gaotao.modules.pda.utils.ResponseData;
@@ -48,6 +49,11 @@ public class ProductionReportServiceImpl implements ProductionReportService {
                 responseData.setCode("500");
                 return responseData;
             }
+            CalendarData checkData =  baseMapper.findByCalendarId(inData.getSite(),inData.getCalendarID());
+            if(checkData==null){
+                responseData.setMsg("该日历编号不存在！");
+                return responseData;
+            }
         }
 
         if (inData.getAdd()==0){
@@ -71,6 +77,9 @@ public class ProductionReportServiceImpl implements ProductionReportService {
             }
             //新增
             productionReportMapper.saveProductionLineOperatorRegistration(inData);
+            if("Y".equals(inData.getfQCFlag())){
+                productionReportMapper.saveOperatorResource(inData);
+            }
         }else{
             List<AccessSiteData> list=baseMapper.checkAccessSite(inData.getSite(),inData.getUser());
             if(list.size()==0){
@@ -79,6 +88,9 @@ public class ProductionReportServiceImpl implements ProductionReportService {
                 return responseData;
             }
             productionReportMapper.editProductionLineOperatorRegistration(inData);
+            if("Y".equals(inData.getfQCFlag())){
+                productionReportMapper.updateOperatorResource(inData);
+            }
         }
         responseData.setCode("200");
         responseData.setSuccess(true);

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

@@ -32,7 +32,7 @@
     <update id="editCalendar" >
     UPDATE calendar set CalendarDesc=#{calendarDesc},status=#{status}
 
-                WHERE CalendarID = #{calendarId}
+                WHERE CalendarID = #{calendarId}     AND site = #{site}
 
 <!--            <if test="version != null and version != ''">-->
 <!--                AND version = #{version}-->
@@ -46,6 +46,9 @@
             <if test="calendarId != null and calendarId != ''">
                 AND CalendarID = #{calendarId}
             </if>
+             <if test="site != null and site != ''">
+                AND site = #{site}
+            </if>
         </where>
     </select>
 
@@ -55,7 +58,7 @@
     </insert>
 
     <delete id="delCalendar" >
-        DELETE FROM calendar  WHERE CalendarID = #{calendarId}
+        DELETE FROM calendar  WHERE CalendarID = #{calendarId}  AND site = #{site}
 
     </delete>
 

src/main/resources/mapper/purchasingManagement/MaterialSplitMapper.xml

@@ -354,7 +354,7 @@
 
 
       <update id="updateCRollInfo">
-        Update C_RollInfo  Set Status_DB='D'  ,Status='已耗用' ,ConsumeOrderNo='',ConsumeSeqNo=-1,NeedsynchronizeFlag='N' where
+        Update C_RollInfo  Set Status_DB='D',Status='已耗用',ConsumeOrderNo='',ConsumeSeqNo=-1,NeedsynchronizeFlag='N' where
         rollNo=#{rollNo} and site=#{site}
     </update>
 </mapper>

src/main/resources/mapper/shopOrder/ProductionReportMapper.xml

@@ -17,14 +17,25 @@
         values (#{site},#{operatorID},#{operatorName},#{active},#{department},#{createdDate},#{passwords},#{lineLeader},#{fQCFlag},#{calendarID}
         ,#{efficiency},#{workCenterNo})
     </insert>
+
+    <insert id="saveOperatorResource">
+        INSERT INTO WorkCenterResource (Site,WorkCenterNo,ResourceID,ResourceDesc,Efficiency,Utilization,Active,Remark,CreatedDate,CalendarID,VirturlFlag)
+        values (#{site},#{workCenterNo},#{operatorID},#{operatorName},#{efficiency},100,'Y','产线操作员自动同步',GETDATE(),#{calendarID},'N')
+    </insert>
+
     <update id="editProductionLineOperatorRegistration" parameterType="com.gaotao.modules.shopOrder.entity.OperatorData">
         UPDATE Operator SET OperatorName=#{operatorName},Active=#{active},Department=#{department},CreatedDate=#{createdDate},Passwords=#{passwords},LineLeader=#{lineLeader},FQCFlag=#{fQCFlag},CalendarID=#{calendarID},Efficiency=#{efficiency},WorkCenterNo=#{workCenterNo}
         where OperatorID=#{operatorID} and Site=#{site}
     </update>
 
+    <update id="updateOperatorResource">
+        UPDATE WorkCenterResource set CalendarID=#{calendarID}, Efficiency=#{efficiency} where ResourceID=#{operatorID} and Site=#{site}
+    </update>
+
     <delete id="deleteProductionLineOperatorRegistration" parameterType="com.gaotao.modules.shopOrder.entity.OperatorData">
         delete from Operator where OperatorID=#{operatorID} and Site=#{site}
     </delete>
+
      <select id="checkProductionLineOperatorRegistration" resultType="com.gaotao.modules.shopOrder.entity.OperatorData">
          select   OperatorID,OperatorName from Operator  where OperatorID=#{operatorID} and Site=#{site}
     </select>