Merge branch 'master' of https://gitee.com/wanli_yang/mesnac_-mes

common/common.iml

@@ -229,5 +229,6 @@
     <orderEntry type="library" name="Maven: com.itextpdf:itext-asian:5.2.0" level="project" />
     <orderEntry type="library" name="Maven: com.google.zxing:core:3.1.0" level="project" />
     <orderEntry type="library" name="Maven: com.google.zxing:javase:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.jcraft:jsch:0.1.55" level="project" />
   </component>
 </module>

dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/ShopOrderReleaseController.java

@@ -23,6 +23,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.websocket.server.PathParam;
+import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.util.*;

dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/ShopOrderReleaseService.java

@@ -74,7 +74,7 @@ public interface ShopOrderReleaseService {
      * @param user
      * @param shopOrderRelease
      */
-    Boolean shopOrderRelease(String site, String user,StringBuffer message, ShopOrderRelease shopOrderRelease) throws IOException;
+    Boolean shopOrderRelease(String site, String user,StringBuffer message, ShopOrderRelease shopOrderRelease ) throws IOException;
 
     /**
      * 工单整理- 刷新派工单

dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/ShopOrderReleaseServiceImpl.java

@@ -297,7 +297,7 @@ public class ShopOrderReleaseServiceImpl implements ShopOrderReleaseService {
             Sfc sfcModel = new Sfc();
             sfcModel.setSfc(releasedSfc.getSfc());
             sfcModel.setQty(releasedSfc.getQuantity().doubleValue());
-            sfcDispatch(site, user, shopOrderModel, sfcModel, routerList, "false");
+            sfcDispatch(site, user, shopOrderModel, sfcModel, routerList,"false");
         }
       return flag;
     }
@@ -306,7 +306,7 @@ public class ShopOrderReleaseServiceImpl implements ShopOrderReleaseService {
     //------------------------------------------------------------------------------------------------------------------
     /**派工--按工序**/
     @Override
-    public void sfcDispatch(String site, String user, ShopOrder shopOrderModel, Sfc sfcModel, List<RouterDTO> routerList, String isSplitSfc) throws IOException {
+    public void sfcDispatch(String site, String user, ShopOrder shopOrderModel, Sfc sfcModel, List<RouterDTO> routerList,String isSplitSfc) throws IOException {
         LocalDateTime nowDate = LocalDateTime.now();
 
         String router = routerList.get(0).getRouter();
@@ -334,11 +334,8 @@ public class ShopOrderReleaseServiceImpl implements ShopOrderReleaseService {
         String routerStepBo = entryRouterStepBo;
 
         //首工序计划开始时间为工单计划开始时间
-        LocalDateTime plannedStartDate = shopOrderModel.getPlannedStartDate();
-        if (plannedStartDate == null){
-            plannedStartDate = nowDate;
-        }
-        LocalDateTime plannedCompleteDate;
+        //LocalDateTime plannedStartDate = shopOrderModel.getPlannedStartDate();
+        //LocalDateTime plannedCompleteDate = shopOrderModel.getPlannedStartDate();
 
         //前置步骤&工序
         String prepositionStepId = null;
@@ -369,7 +366,7 @@ public class ShopOrderReleaseServiceImpl implements ShopOrderReleaseService {
 
                 Double prodHours = new Double(this.prodHoursCl(operation, routerDTO.getProdHours()));
                 //计算完成时间
-                plannedCompleteDate = plannedStartDate.plusMinutes(prodHours.longValue());
+                //plannedCompleteDate = plannedStartDate.plusMinutes(prodHours.longValue());
 
                 //查询工序所属车间
                 String workCenter = null;
@@ -406,10 +403,8 @@ public class ShopOrderReleaseServiceImpl implements ShopOrderReleaseService {
                 sfcDispatchModel.setDispatchQty(sfcModel.getQty());
                 sfcDispatchModel.setProdHours(prodHours);
                 sfcDispatchModel.setTurnOperation("false");
-                if (operation.equals("WX_6106GX")) {
-                    sfcDispatchModel.setPlannedStartDate(plannedStartDate);
-                    sfcDispatchModel.setPlannedCompDate(plannedCompleteDate);
-                }
+                //sfcDispatchModel.setPlannedStartDate(plannedStartDate);
+                //sfcDispatchModel.setPlannedCompleteDate(plannedCompleteDate);
                 sfcDispatchModel.setSoReleasedDate(nowDate);
                 sfcDispatchModel.setIsDispatch(Constants.BOOL_FALSE);
                 sfcDispatchModel.setIsImport(Constants.BOOL_FALSE);