20211213

src/main/java/com/gaotao/modules/base/controller/BaseController.java

@@ -916,7 +916,69 @@ public class BaseController {
         }
         return responseData;
     }
+    /**
+     * @Title saveResource
+     * @Description 保存机台
+     * @author rq
+     * @date 2021/4/16 11:56
+     * @return {@link Object}
+     */
+
+    @PostMapping("/saveResource")
+    @ResponseBody
+    public Object saveResource(@RequestBody WorkCenterResourceData inData){
+        ResponseData responseData = new ResponseData();
+        try {
+            responseData = baseService.saveResource(inData);
+        } catch (Exception e) {
+            responseData.setMsg(e.getMessage());
+            responseData.setCode("500");
+        }
+        return responseData;
+    }
+    /**
+     * @Description 删除机台
+     * @Title deleteResource
+      * @param inData 
+     * @author rq
+     * @date 2022/1/12 18:00 
+     * @return Object
+     * @throw
+     */
+    @PostMapping("/deleteResource")
+    @ResponseBody
+    public Object deleteResource(@RequestBody WorkCenterResourceData inData){
+        ResponseData responseData = new ResponseData();
+        try {
+            responseData = baseService.deleteResource(inData);
+        } catch (Exception e) {
+            responseData.setMsg(e.getMessage());
+            responseData.setCode("500");
+        }
+        return responseData;
+    }
 
+    /**
+     * @Description 删除机台
+     * @Title deleteResource
+     * @param inData
+     * @author rq
+     * @date 2022/1/12 18:00
+     * @return Object
+     * @throw
+     */
+    @PostMapping("/setResourceFlag")
+    @ResponseBody
+    public Object setResourceFlag(@RequestBody WorkCenterResourceData inData){
+        ResponseData responseData = new ResponseData();
+        try {
+            responseData = baseService.setResourceFlag(inData);
+        } catch (Exception e) {
+            responseData.setMsg(e.getMessage());
+            responseData.setCode("500");
+        }
+        return responseData;
+    }
     /**
      * 生产线数据
      * @param

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

@@ -298,7 +298,31 @@ public interface BaseMapper {
      * @throw
      */
     List<SiteData> checkSiteId(String siteID );
+    /**
+     * @Description 检查编码是否存在
+     * @Title checkCal
+      * @param site
+     * @param calendarID
+     * @author rq
+     * @date 2022/1/12 16:20
+     * @return List<CalendarData>
+     * @throw
+     */
+    List<CalendarData> checkCal(@Param("site") String site,@Param("calendarID")String calendarID);
+    /**
+     * @Description 检查机台是否存在
+     * @Title checkResource
+      * @param indata
+     * @author rq
+     * @date 2022/1/12 16:24
+     * @return List<WorkCenterResourceData>
+     * @throw
+     */
+    List<WorkCenterResourceData> checkResource(WorkCenterResourceData indata);
+
 
+    void saveResource(WorkCenterResourceData inData);
+    void editResource(WorkCenterResourceData inData);
     /**
      * @Description 保存工厂
      * @Title saveSite
@@ -723,6 +747,26 @@ public interface BaseMapper {
      */
     void deleteWorkCenterData(WorkCenterData inData);
 
+    /**
+     * @Description 设为虚拟机台
+     * @Title setResourceFlag
+      * @param inData
+     * @author rq
+     * @date 2022/1/13 10:09
+     * @return void
+     * @throw
+     */
+    void setResourceFlag(WorkCenterResourceData inData);
+    /**
+     * @Description 删除机台
+     * @Title deleteResource
+      * @param inData
+     * @author rq
+     * @date 2022/1/12 18:03
+     * @return void
+     * @throw
+     */
+    void deleteResource(WorkCenterResourceData inData);
     /**
      * @Description 校验客户编号是否存在
      * @Title checkCustomerID

src/main/java/com/gaotao/modules/base/entity/WorkCenterResourceData.java

@@ -45,7 +45,7 @@ public class WorkCenterResourceData {
      *
      */
     private String remark;
-
+    private int add;
     /**
      *
      */
@@ -150,5 +150,13 @@ public class WorkCenterResourceData {
     public void setVirturlFlag(String virturlFlag) {
         this.virturlFlag = virturlFlag;
     }
+
+    public int getAdd() {
+        return add;
+    }
+
+    public void setAdd(int add) {
+        this.add = add;
+    }
 }
 

src/main/java/com/gaotao/modules/base/service/BaseService.java

@@ -435,6 +435,38 @@ public interface BaseService {
      * @throw
      */
     ResponseData deleteWorkCenterData(WorkCenterData inData);
+
+    /**
+     * @Description 保存机台
+     * @Title saveResource
+     * @param
+     * @author rq
+     * @date 2021/10/9 16:37
+     * @return
+     * @throw
+     */
+    ResponseData saveResource(WorkCenterResourceData inData);
+    /**
+     * @Description 删除机台
+     * @Title deleteResource
+      * @param inData
+     * @author rq
+     * @date 2022/1/12 18:01
+     * @return ResponseData
+     * @throw
+     */
+    ResponseData deleteResource(WorkCenterResourceData inData);
+    /**
+     * @Description 设置虚拟机台
+     * @Title setResourceFlag
+      * @param inData
+     * @author rq
+     * @date 2022/1/13 10:06
+     * @return ResponseData
+     * @throw
+     */
+    ResponseData setResourceFlag(WorkCenterResourceData inData);
+
     /**
      * @Description 校验客户编号是否存在
      * @Title checkCustomerID

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

@@ -1070,6 +1070,64 @@ public class BaseServiceImpl implements BaseService {
         responseData.setMsg("操作成功!");
         return responseData;
     }
+
+
+    @Override
+    public ResponseData saveResource(WorkCenterResourceData inData){
+        ResponseData responseData = new ResponseData();
+        List<CalendarData> checkCal=baseMapper.checkCal(inData.getSite(),inData.getCalendarID());
+        if(checkCal.size()==0){
+            responseData.setMsg("该工作日历编码不存在！");
+            responseData.setCode("500");
+            return responseData;
+        }
+        if (inData.getAdd()==0){
+            List<SiteData> list3=baseMapper.checkSiteId(inData.getSite());
+            if(list3.size()==0){
+                responseData.setMsg("该工厂编码不存在！");
+                responseData.setCode("500");
+                return responseData;
+            }
+            List<WorkCenterResourceData> list2=baseMapper.checkResource(inData);
+            if(list2.size()!=0){
+                responseData.setMsg("该机台已经存在！");
+                responseData.setCode("500");
+                return responseData;
+            }
+            //新增
+            baseMapper.saveResource(inData);
+        }else{
+
+            baseMapper.editResource(inData);
+        }
+        responseData.setCode("200");
+        responseData.setSuccess(true);
+        responseData.setMsg("操作成功!");
+        return responseData;
+    }
+    @Override
+    public ResponseData setResourceFlag(WorkCenterResourceData inData){
+        ResponseData responseData = new ResponseData();
+        if("N".equals(inData.getVirturlFlag())){
+            inData.setVirturlFlag("Y");
+        }else {
+            inData.setVirturlFlag("N");
+        }
+        baseMapper.setResourceFlag(inData);
+        responseData.setCode("200");
+        responseData.setSuccess(true);
+        responseData.setMsg("操作成功!");
+        return responseData;
+    }
+    @Override
+    public ResponseData deleteResource(WorkCenterResourceData inData) {
+        ResponseData responseData = new ResponseData();
+        baseMapper.deleteResource(inData);
+        responseData.setCode("200");
+        responseData.setSuccess(true);
+        responseData.setMsg("操作成功!");
+        return responseData;
+    }
     @Override
     public ResponseData deleteWorkCenterData(WorkCenterData inData) {
         ResponseData responseData = new ResponseData();

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

@@ -297,6 +297,23 @@
         select SiteName,SiteID from Site where SiteID=#{siteID} and Active='Y'
     </select>
 
+    <select id="checkCal" resultType="com.gaotao.modules.base.entity.CalendarData">
+        select calendarID from calendar where Site=#{site} and status='使用中' and calendarID=#{calendarID}
+    </select>
+
+     <select id="checkResource" resultType="com.gaotao.modules.base.entity.WorkCenterResourceData">
+        select site from WorkCenterResource where Site=#{site}  and ResourceID=#{resourceID}
+    </select>
+
+    <insert id="saveResource" parameterType="com.gaotao.modules.base.entity.WorkCenterResourceData">
+        INSERT INTO WorkCenterResource (Site,WorkCenterNo,ResourceID,ResourceDesc,Efficiency,Utilization,Active,Remark,CreatedDate,CalendarID,VirturlFlag)
+        VALUES(#{site},#{workCenterNo},#{resourceID},#{resourceDesc},#{efficiency},#{utilization},#{active},#{remark},GetDate(),#{calendarID},'N')
+    </insert>
+     <update id="editResource" parameterType="com.gaotao.modules.base.entity.WorkCenterResourceData">
+        update WorkCenterResource SET ResourceDesc=#{resourceDesc},Efficiency=#{efficiency},Utilization=#{utilization},Active=#{active},Remark=#{remark},CalendarID=#{calendarID}
+        where Site=#{site} and ResourceID=#{resourceID}
+    </update>
+
     <insert id="saveSite" parameterType="com.gaotao.modules.base.entity.SiteData">
         INSERT INTO Site (SiteID,SiteName,SiteName_E,Address,Address_E,ContactName,PostCode,Email,FaxNo,PhoneNo,Active,Website,CompanyID,ShipTime,
          ReferenceCustomerID)
@@ -524,6 +541,14 @@ CapacityType,UMID,Active,Remark,CreatedDate,ProLineNo,CanCreateNewRollFlag,NeedS
         delete from WorkCenter where WorkCenterNo=#{workCenterNo} and Site=#{site}
     </delete>
 
+     <delete id="deleteResource" parameterType="com.gaotao.modules.base.entity.WorkCenterResourceData">
+        delete from WorkCenterResource where ResourceID=#{resourceID} and Site=#{site}
+    </delete>
+
+    <update id="setResourceFlag" parameterType="com.gaotao.modules.base.entity.WorkCenterResourceData">
+        UPDATE WorkCenterResource SET VirturlFlag=#{virturlFlag} where ResourceID=#{resourceID} and Site=#{site}
+    </update>
+
     <select id="checkCustomerID" resultType="com.gaotao.modules.base.entity.PartData">
         select PartNo,ConfigurationTemplateID from Part WHERE site=#{site}  and ConfigurationTemplateID=#{configurationTemplateID}
     </select>