repackage 2022-04-05 sxm

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

@@ -1582,4 +1582,48 @@ public class ScheduleController {
                 .put("msg", "操作成功!");
     }
 
+    /**
+     * @Author sxm
+     * @Description 切换卷校验
+     * @Date 2022/4/5 16:05
+     * @Param
+     * @return
+     **/
+    @RequestMapping(value = "switchrollRepackCheck")
+    public R switchrollRepackCheck(@RequestBody SearchScheduleData scheduleData){
+        Map<String, Object> resultMap = scheduleService.switchrollRepackCheck(scheduleData);
+        return R.ok()
+                .put("resultMap", resultMap);
+    }
+
+    /**
+     * @Author sxm
+     * @Description 换包装 切换卷
+     * @Date 2022/3/30 16:30
+     * @Param
+     * @return
+     **/
+    @RequestMapping(value = "switchrollRepackAction")
+    public R switchrollRepackAction(@RequestBody SearchScheduleData inData) {
+        scheduleService.switchrollRepackAction(inData);
+        return R.ok()
+                .put("code", 200)
+                .put("msg", "操作成功!");
+    }
+
+
+    /**
+     * @Author sxm
+     * @Description 换包装创建分卷
+     * @Date 2022/4/5 16:54
+     * @Param
+     * @return
+     **/
+    @RequestMapping(value = "workbench_createslittingroll_Repack_action")
+    public R workbenchCreateslittingrollRepackAction(@RequestBody SearchScheduleData inData) {
+        scheduleService.workbenchCreateslittingrollRepackAction(inData);
+        return R.ok()
+                .put("code", 200)
+                .put("msg", "操作成功!");
+    }
 }

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

@@ -137,6 +137,25 @@ public class SearchScheduleData extends BaseData {
     private String repairSOFlag; // 印版已发状态
     private Double qtytoSchedule; // 排产数量
     private Double timeRequired;  // 预计重检时长
+    private boolean directRepackageflag; // 是否是换包装
+
+    private Double rollCount;
+
+    public Double getRollCount() {
+        return rollCount;
+    }
+
+    public void setRollCount(Double rollCount) {
+        this.rollCount = rollCount;
+    }
+
+    public boolean isDirectRepackageflag() {
+        return directRepackageflag;
+    }
+
+    public void setDirectRepackageflag(boolean directRepackageflag) {
+        this.directRepackageflag = directRepackageflag;
+    }
 
     public Double getTimeRequired() {
         return timeRequired;

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

@@ -937,4 +937,31 @@ public interface ScheduleService {
      * @return
      **/
     String getShopOrderType(SearchScheduleData inData);
+
+    /**
+     * @Author sxm
+     * @Description 换包装校验切换卷
+     * @Date 2022/4/5 16:05
+     * @Param
+     * @return
+     **/
+    Map<String, Object> switchrollRepackCheck(SearchScheduleData scheduleData);
+
+    /**
+     * @Author sxm
+     * @Description 换包装切换卷
+     * @Date 2022/4/5 16:15
+     * @Param
+     * @return
+     **/
+    void switchrollRepackAction(SearchScheduleData inData);
+
+    /**
+     * @Author sxm
+     * @Description 换包装创建分卷
+     * @Date 2022/4/5 16:54
+     * @Param
+     * @return
+     **/
+    void workbenchCreateslittingrollRepackAction(SearchScheduleData inData);
 }

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

@@ -465,7 +465,13 @@ public class ScheduleServiceImpl implements ScheduleService {
         Map<String, Object> resultMap =  this.getScheduleDateShif(site, resourceId, currentDate);
 
         Date scheduledDate = (Date) resultMap.get("scheduleddate");
-        String scheduleTime = DateUtil.getStringDate(scheduledDate, "yyyy-MM-dd");
+        // todo 判空  2022-04-05 sxm
+        String scheduleTime = "";
+        if(scheduledDate == null){
+             scheduleTime = "";
+        }else {
+             scheduleTime = DateUtil.getStringDate(scheduledDate, "yyyy-MM-dd");
+        }
         String shiftNo = String.valueOf(resultMap.get("ShiftNo"));
         result.put("shiftDesc", shiftNo);
         result.put("shiftNo", shiftNo);
@@ -4249,4 +4255,58 @@ public class ScheduleServiceImpl implements ScheduleService {
     public String getShopOrderType(SearchScheduleData inData) {
         return scheduleMapper.getShopOrderType(inData);
     }
+
+    @Override
+    public Map<String, Object> switchrollRepackCheck(SearchScheduleData scheduleData) {
+        List<Object> params = new ArrayList<>();
+        params.add(scheduleData.getSite());
+        params.add(scheduleData.getOrderNo());
+        params.add(scheduleData.getItemNo());
+        params.add(scheduleData.getSeqNo());
+        params.add(scheduleData.getRollNo());
+        params.add(scheduleData.isDirectRepackageflag());
+        return workbenchCreateslittingrollFqcCheck("switchroll_repack_check",params);
+    }
+
+    @Override
+    public void switchrollRepackAction(SearchScheduleData scheduleData) {
+        Map<String, Object> checkMap = switchrollRepackCheck(scheduleData);
+        if (checkMap == null) {
+            throw new RRException("存储过程未返回信息", 400);
+        }
+        //判断结果是否成功
+        String checkCode = String.valueOf(checkMap.get("resultCode"));
+        if ("400".equalsIgnoreCase(checkCode)) {
+            String msg = String.valueOf(checkMap.get("resultMsg"));
+            throw new RRException(msg, 400);
+        }
+        List<Object> params = new ArrayList<>();
+        params.add(scheduleData.getSite());
+        params.add(scheduleData.getOrderNo());
+        params.add(scheduleData.getItemNo());
+        params.add(scheduleData.getSeqNo());
+        params.add(scheduleData.getRollNo());
+        params.add(scheduleData.getOperatorId());
+        params.add(scheduleData.isDirectRepackageflag());
+        params.add(scheduleData.getCurrentDate());
+        params.add(scheduleData.getWorkCenterNo());
+        params.add(scheduleData.getResourceId());
+        params.add(scheduleData.getShiftNo());
+        params.add(scheduleData.getScheduleDate());
+        workbenchCreateslittingrollFqcCheck("switchroll_repack_action",params);
+    }
+
+    @Override
+    public void workbenchCreateslittingrollRepackAction(SearchScheduleData scheduleData) {
+        List<Object> params = new ArrayList<>();
+        params.add(scheduleData.getSite());
+        params.add(scheduleData.getOrderNo());
+        params.add(scheduleData.getItemNo());
+        params.add(scheduleData.getSeqNo());
+        params.add(scheduleData.getRollQty());
+        params.add(scheduleData.getRollNo());
+        params.add(scheduleData.getRollCount());
+        params.add(scheduleData.getOperatorId());
+        workbenchCreateslittingrollFqcCheck("workbench_createslittingroll_Repack_action",params);
+    }
 }

src/main/resources/mapper/finishedProduct/CRollinfoDao.xml

@@ -177,7 +177,7 @@
     </select>
     <select id="getCoustomerCode" resultType="java.lang.String">
         SELECT CardCode
-        FROM   YRTEST.dbo.ODRF
+        FROM   RXE.dbo.ODRF
         WHERE DocEntry = #{orderNo}
     </select>
     <select id="getOrderNo" resultType="java.lang.String">
@@ -204,11 +204,11 @@
                             )         AS customer_id,
                         t3.Substitute AS mpn,
                         T0.u_ul
-        FROM   YRTEST.dbo.OITM T0
-                 INNER JOIN   YRTEST.dbo.OWOR T1 ON T0.ItemCode = T1.ItemCode
+        FROM   RXE.dbo.OITM T0
+                 INNER JOIN   RXE.dbo.OWOR T1 ON T0.ItemCode = T1.ItemCode
                  INNER JOIN XJMES.dbo.C_RollInfo t2 ON t1.DocEntry = t2.OrderRef1
             AND t2.SourceType = '生产订单'
-                 LEFT JOIN   YRTEST.dbo.OSCN t3 ON T0.ItemCode = t3.ItemCode
+                 LEFT JOIN   RXE.dbo.OSCN t3 ON T0.ItemCode = t3.ItemCode
         WHERE T0.ItemCode = #{partno}
     </select>
     <select id="rollOutboundControl" resultType="com.gaotao.modules.finishedProduct.entity.CRollinfoEntity">
@@ -271,7 +271,7 @@
     </select>
     <select id="searchLotNo" resultType="java.lang.String">
         SELECT MAX(docentry)
-        FROM   YRTEST.dbo.OWOR
+        FROM   RXE.dbo.OWOR
         WHERE ItemCode = #{partNo}
     </select>
 

src/main/resources/mapper/finishedProduct/SapDao.xml

@@ -2,16 +2,16 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.gaotao.modules.finishedProduct.dao.SapDao">
     <update id="updateOnnmAutoKey">
-        update   YRTEST.dbo.onnm set AutoKey = #{sapNo} where ObjectCOde = 15
+        update   RXE.dbo.onnm set AutoKey = #{sapNo} where ObjectCOde = 15
     </update>
     <update id="updateNNM1NextNumber">
-        update   YRTEST.dbo.NNM1 set NextNumber = #{sapNo} where ObjectCOde = 15
+        update   RXE.dbo.NNM1 set NextNumber = #{sapNo} where ObjectCOde = 15
     </update>
     <update id="updateODRFStuts">
-        update   YRTEST.dbo.ODRF set DocStatus='C' where  DocEntry = #{orderNo}
+        update   RXE.dbo.ODRF set DocStatus='C' where  DocEntry = #{orderNo}
     </update>
     <delete id="reomverNullData">
-        DELETE FROM   YRTEST.dbo.ODLN where docDate is null  and CardCode is null
+        DELETE FROM   RXE.dbo.ODLN where docDate is null  and CardCode is null
     </delete>
     <select id="getCount" resultType="java.lang.Integer">
         Select count(1)   from RoutingHeader where site='1' and PartNo='100001701400' and RevNo='A0'
@@ -19,7 +19,7 @@
     </select>
 
     <update id="UpdateODLNMesTranNo">
-        update    YRTEST.dbo.ODLN set U_MESTransNo=#{orderNo},draftKey=#{orderNo} where  DocEntry = #{sapNo}
+        update    RXE.dbo.ODLN set U_MESTransNo=#{orderNo},draftKey=#{orderNo} where  DocEntry = #{sapNo}
     </update>