rightKeyMenu sxm 2022-3-24

src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java

@@ -1463,4 +1463,69 @@ public class ScheduleController {
         scheduleService.pauseOrReopenProduceOrder(inData);
         return R.ok("操作成功,请刷新数据！");
     }
+
+   /**
+    * @Author sxm
+    * @Description 确认生产已排料 / 取消生产已排料
+    * @Date 2022/3/23 9:33
+    * @Param inData
+    * @return 
+    **/
+    @PostMapping(value = "costRollUpProduceOrder")
+    public R costRollUpProduceOrder(@RequestBody SearchScheduleData inData){
+        scheduleService.costRollUpProduceOrder(inData);
+        return R.ok("操作成功,请刷新数据！");
+    }
+
+    /**
+     * @Author sxm
+     * @Description 确认/取消 刀模已发
+     * @Date 2022/3/23 10:16
+     * @Param inData
+     * @return
+     **/
+    @PostMapping(value = "manualProduceOrder")
+    public R manualProduceOrder(@RequestBody SearchScheduleData inData){
+        scheduleService.manualProduceOrder(inData);
+        return R.ok("操作成功,请刷新数据！");
+    }
+
+
+    /**
+     * @Author sxm
+     * @Description 印版取消已发
+     * @Date 2022/3/24 8:43
+     * @Param inData
+     * @return
+     **/
+    @PostMapping(value = "repairSOFlagProduceOrder")
+    public R repairSOFlagProduceOrder(@RequestBody SearchScheduleData inData){
+        scheduleService.repairSOFlagProduceOrder(inData);
+        return R.ok("操作成功,请刷新数据！");
+    }
+
+    /**
+     * @Author sxm
+     * @Description 取消派工单所有操作
+     * @Date 2022/3/24 8:43
+     * @Param inData
+     * @return
+     **/
+    @PostMapping(value = "workbenchCancelallops")
+    public R workbenchCancelallops(@RequestBody SearchScheduleData inData){
+        return scheduleService.workbenchCancelallops(inData);
+    }
+    /**
+     * @Author sxm
+     * @Description 创建重检派工单
+     * @Date 2022/3/24 13:16
+     * @Param inData
+     * @return
+     **/
+    @PostMapping(value = "soscheduleNewReinspectjob")
+    public R soscheduleNewReinspectjob(@RequestBody SearchScheduleData inData){
+        return scheduleService.soscheduleNewReinspectjob(inData);
+    }
+
+
 }

src/main/java/com/gaotao/modules/schedule/data/SearchScheduleData.java

@@ -131,6 +131,60 @@ public class SearchScheduleData extends BaseData {
     private String parkFlag; // 暂停状态
     private String virtualFlag;//虚拟排产标记
     private boolean checkFlag; //是否检查
+    private String costRollUpFlag;  // 生产已排产 状态
+    private String orderChangeStatus;  // 生产已排产 描述
+    private String manualFlag; // 刀模已发 状态
+    private String repairSOFlag; // 印版已发状态
+    private Double qtytoSchedule; // 排产数量
+    private Double timeRequired;  // 预计重检时长
+
+    public Double getTimeRequired() {
+        return timeRequired;
+    }
+
+    public void setTimeRequired(Double timeRequired) {
+        this.timeRequired = timeRequired;
+    }
+
+    public Double getQtytoSchedule() {
+        return qtytoSchedule;
+    }
+
+    public void setQtytoSchedule(Double qtytoSchedule) {
+        this.qtytoSchedule = qtytoSchedule;
+    }
+
+    public String getRepairSOFlag() {
+        return repairSOFlag;
+    }
+
+    public void setRepairSOFlag(String repairSOFlag) {
+        this.repairSOFlag = repairSOFlag;
+    }
+
+    public String getManualFlag() {
+        return manualFlag;
+    }
+
+    public void setManualFlag(String manualFlag) {
+        this.manualFlag = manualFlag;
+    }
+
+    public String getOrderChangeStatus() {
+        return orderChangeStatus;
+    }
+
+    public void setOrderChangeStatus(String orderChangeStatus) {
+        this.orderChangeStatus = orderChangeStatus;
+    }
+
+    public String getCostRollUpFlag() {
+        return costRollUpFlag;
+    }
+
+    public void setCostRollUpFlag(String costRollUpFlag) {
+        this.costRollUpFlag = costRollUpFlag;
+    }
 
     public String getParkFlag() {
         return parkFlag;

src/main/java/com/gaotao/modules/schedule/mapper/ScheduleMapper.java

@@ -499,4 +499,39 @@ public interface ScheduleMapper {
      **/
     void pauseOrReopenProduceOrder(SearchScheduleData inData);
 
+    /**
+     * @Author sxm
+     * @Description 确认/取消 生产订单已排料
+     * @Date 2022/3/23 9:35
+     * @Param
+     * @return
+     **/
+    void costRollUpProduceOrder(SearchScheduleData inData);
+
+    /**
+     * @Author sxm
+     * @Description 保存 生产订单排料 记录
+     * @Date 2022/3/23 9:40
+     * @Param
+     * @return
+     **/
+    void insertShopOrderChangeHist(SearchScheduleData inData);
+
+    /**
+     * @Author sxm
+     * @Description 确认/取消 刀模已发
+     * @Date 2022/3/23 10:33
+     * @Param inData
+     * @return
+     **/
+    void manualProduceOrder(SearchScheduleData inData);
+
+    /**
+     * @Author sxm
+     * @Description 印版已发  确认/取消
+     * @Date 2022/3/24 8:46
+     * @Param
+     * @return
+     **/
+    void repairSOFlagProduceOrder(SearchScheduleData inData);
 }

src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java

@@ -1,5 +1,6 @@
 package com.gaotao.modules.schedule.service;
 
+import com.gaotao.common.utils.R;
 import com.gaotao.modules.schedule.data.*;
 import com.gaotao.modules.schedule.data.dto.ScheduleDateShifDto;
 import com.gaotao.modules.schedule.data.dto.WorkbenchPostinspection;
@@ -855,4 +856,51 @@ public interface ScheduleService {
      **/
     void pauseOrReopenProduceOrder(SearchScheduleData inData);
 
+    /**
+     * @Author sxm
+     * @Description 确认生产已排料 / 取消生产已排料
+     * @Date 2022/3/23 9:33
+     * @Param inData
+     * @return
+     **/
+    void costRollUpProduceOrder(SearchScheduleData inData);
+
+    /**
+     * @Author sxm
+     * @Description 确认/取消 刀模已发
+     * @Date 2022/3/23 10:16
+     * @Param inData
+     * @return
+     **/
+    void manualProduceOrder(SearchScheduleData inData);
+
+    /**
+     * @Author sxm
+     * @Description  印版已发  确认/取消
+     * @Date 2022/3/24 8:45
+     * @Param
+     * @return
+     **/
+    void repairSOFlagProduceOrder(SearchScheduleData inData);
+
+    /**
+     * @Author sxm
+     * @Description 取消派工单所有操作
+     * @Date 2022/3/24 9:17
+     * @Param
+     * @return
+     **/
+    R workbenchCancelallops(SearchScheduleData inData);
+
+    /**
+     * @Author sxm
+     * @Description 创建重检派工单
+     * @Date 2022/3/24 13:16
+     * @Param
+     * @return
+     **/
+    R soscheduleNewReinspectjob(SearchScheduleData inData);
+
+
+
 }

src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.gaotao.common.exception.RRException;
 import com.gaotao.common.utils.DateUtil;
 import com.gaotao.common.utils.DateUtils;
+import com.gaotao.common.utils.R;
 import com.gaotao.modules.schedule.data.dto.ScheduleDateShifDto;
 import com.gaotao.modules.schedule.data.dto.WorkbenchPostinspection;
 import com.gaotao.modules.schedule.mapper.ProcedureMapper;
@@ -3940,4 +3941,60 @@ public class ScheduleServiceImpl implements ScheduleService {
     public void pauseOrReopenProduceOrder(SearchScheduleData inData) {
         scheduleMapper.pauseOrReopenProduceOrder(inData);
     }
+
+    @Override
+    @Transactional
+    public void costRollUpProduceOrder(SearchScheduleData inData) {
+        scheduleMapper.costRollUpProduceOrder(inData);
+        scheduleMapper.insertShopOrderChangeHist(inData);
+    }
+
+    @Override
+    @Transactional
+    public void manualProduceOrder(SearchScheduleData inData) {
+        scheduleMapper.manualProduceOrder(inData);
+        scheduleMapper.insertShopOrderChangeHist(inData);
+    }
+
+    @Override
+    @Transactional
+    public void repairSOFlagProduceOrder(SearchScheduleData inData) {
+        scheduleMapper.repairSOFlagProduceOrder(inData);
+        scheduleMapper.insertShopOrderChangeHist(inData);
+    }
+
+    @Override
+    @Transactional
+    public R workbenchCancelallops(SearchScheduleData inData) {
+        List<Object> list = new ArrayList<>();
+        list.add(inData.getSite());
+        list.add(inData.getOrderNo());
+        list.add(inData.getItemNo());
+        list.add(inData.getSeqNo());
+        Map<String, Object> map = workbenchCreateslittingrollFqcCheck("workbench_cancelallops", list);
+        if ("400".equals(map.get("resultCode"))){
+            throw new RRException(map.get("resultMsg").toString(), 400);
+        }
+        return R.ok("操作成功!");
+    }
+
+    @Override
+    @Transactional
+    public R soscheduleNewReinspectjob(SearchScheduleData inData) {
+        List<Object> list = new ArrayList<>();
+        list.add(inData.getSite());
+        list.add(inData.getOrderNo());
+        list.add(inData.getItemNo());
+        list.add(inData.getWorkCenterNo());
+        list.add(inData.getResourceId());
+        list.add(inData.getScheduleDate());
+        list.add(inData.getPlanStartTime());
+        list.add(inData.getQtytoSchedule());
+        list.add(inData.getTimeRequired());
+        Map<String, Object> map = workbenchCreateslittingrollFqcCheck("soschedule_new_reinspectjob", list);
+        if ("400".equals(map.get("resultCode"))){
+            throw new RRException(map.get("resultMsg").toString(), 400);
+        }
+        return R.ok("操作成功!");
+    }
 }

src/main/resources/mapper/schedule/ScheduleMapper.xml

@@ -19,6 +19,24 @@
           and ItemNo = #{itemNo}
           and SeqNo = #{seqNo}
     </update>
+    <update id="costRollUpProduceOrder">
+        Update ShopOrder
+        Set CostRollUpFlag= #{costRollUpFlag}
+        Where Site= #{site}
+          and OrderNo = #{orderNo}
+    </update>
+    <update id="manualProduceOrder">
+        Update ShopOrder
+        Set ManualFlag=#{manualFlag}
+        Where Site= #{site}
+          and OrderNo = #{orderNo}
+    </update>
+    <update id="repairSOFlagProduceOrder">
+        Update ShopOrder
+        Set RepairSOFlag=#{repairSOFlag}
+        Where Site= #{site}
+          and OrderNo = #{orderNo}
+    </update>
     <!--查询加工中心机台的信息-->
     <select id="getResourceLIst" parameterType="SearchScheduleData" resultType="ResourceOutData">
         SELECT wcr.Site site, wcr.WorkCenterNo workCenterNo, wcr.ResourceID resourceId, wcr.ResourceDesc resourceDEsc, wcr.Efficiency efficiency,
@@ -1141,7 +1159,10 @@
                 ,#{item.reportedDate},#{item.reportedBy},#{item.defectCode},#{item.defectQty},#{item.rollNo} )
         </foreach>
     </insert>
-
+    <insert id="insertShopOrderChangeHist">
+        Insert into ShopOrderChangeHist(Site,OrderNo,CreateDate,Fieldname,FieldCaption,OldValue,NewValue,UserID,RecordType,Remark)
+        Values(#{site},#{orderNo},getdate(),'*','*','*','*',#{username},'更改',#{orderChangeStatus})
+    </insert>
 
 
     <select id="getSORoutingPreviousOperationItemNo" resultType="java.lang.Integer">