jx mes 生产线

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/ProdOrgExtService.java

@@ -160,6 +160,7 @@ public class ProdOrgExtService implements IProdOrgExtService {
         workCenterExtDb.setPersonnelCost(workCenterExt.getPersonnelCost());
         workCenterExtDb.setCategoryCode(workCenterExt.getCategoryCode());
         workCenterExtDb.setCareerCode(workCenterExt.getCareerCode());
+        workCenterExtDb.setWorkTakt(workCenterExt.getWorkTakt());
         ConvertBean.serviceModelUpdate(workCenterExtDb, workCenterExt.getModifyUser());
         new ConvertBeanExt(workCenterExtDb).convertBean(workCenterExtDb);
         return workCenterExtRepository.save(workCenterExtDb);

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxCenterWorkingBoardCenterThreeService.java

@@ -368,8 +368,8 @@ public class JxCenterWorkingBoardCenterThreeService extends JxCenterWorkingBoard
     }
 
     private String compareToTimeByFlag(String time, String curTime, boolean flag) {
-        if (flag ? time.compareTo(curTime) > 0 : time.compareTo(curTime) < 0) return curTime;
+        if (flag ? time.compareTo(curTime) > 0 : time.compareTo(curTime) < 0) return time;
-        else return time;
+        else return curTime;
     }
 
 }

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/excel/bu3/SxWorkCenterExtExcelService.java

@@ -240,6 +240,13 @@ public class SxWorkCenterExtExcelService implements IExcelImportExtService {
                 } catch (Exception e) {
                 }
 
+                //生产节拍
+                String workTakt = null;
+                try {
+                    workTakt = new DataFormatter().formatCellValue(row.getCell(15, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK));
+                } catch (Exception e) {
+                }
+
                 //验证区域代码
                 if (CollectionUtils.isEmpty(areaDbMap) || !areaDbMap.containsKey(areaCode)) {
                     errorNum ++;
@@ -339,6 +346,26 @@ public class SxWorkCenterExtExcelService implements IExcelImportExtService {
                     errorInfo += "第O列数据无效;";
                 }
 
+                if (!StringUtils.isEmpty(workTakt)) {
+                    try {
+                        if (MathOperation.compareTo(new Double(workTakt), new Double(0)) < 0) {
+                            errorNum++;
+                            cellNum += "P;";
+                            errorInfo += "第P列数据无效,必须是正数,最多两位小数;";
+                        }
+                        String[] personnelCostArr = personnelCost.split(MesExtConstWords.DECIMAL_POINT);
+                        if (null != personnelCostArr && personnelCostArr.length == 2 && personnelCostArr[1].length() > 2) {
+                            errorNum++;
+                            cellNum += "P;";
+                            errorInfo += "第P列数据无效,必须是正数,最多两位小数;";
+                        }
+                    } catch (NumberFormatException e) {
+                        errorNum++;
+                        cellNum += "P;";
+                        errorInfo += "第P列数据无效,必须是正数,最多两位小数;";
+                    }
+                }
+
                 Boolean isExist = false;
                 if (StringUtils.isEmpty(errorInfo)) {
                     if (!existMap.containsKey(workCenterCode)) {

modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/SxProdOrgModel.java

@@ -73,5 +73,7 @@ public class SxProdOrgModel extends BaseBean {
     private String categoryCode;
     @ApiParam("事业别")
     private String careerCode;
+    @ApiParam("生产节拍")
+    private Double workTakt;
 
 }