1.工单出库增加优先级配置

2.系统设置增加电子仓对接配置

src/main/java/com/neotel/smfcore/common/utils/Constants.java

@@ -223,4 +223,8 @@ public class Constants {
      * 缓存的出口信息
      * 缓存的出口信息
      */
      */
     public static final String Cache_PutOutLoc_Info  ="Cache_PutOutLoc_Info";
     public static final String Cache_PutOutLoc_Info  ="Cache_PutOutLoc_Info";
+
+
+    //电子仓启用对接
+    public static final String Cache_Electronic_Warehouse_Docking  ="Cache_Electronic_Warehouse_Docking";
 }
 }

src/main/java/com/neotel/smfcore/core/order/rest/OrderController.java

@@ -327,6 +327,29 @@ public class OrderController {
         return ResultBean.newOkResult("");
         return ResultBean.newOkResult("");
     }
     }
 
 
+    @ApiOperation("updatePriority")
+    @RequestMapping("/updatePriority")
+    //@AnonymousAccess
+    public ResultBean updatePriority(String orderNo, int priority) {
+        if (StringUtils.isEmpty(orderNo)) {
+            return ResultBean.newErrorResult(-1, "smfcore.valueCanotNull", "{0}不能为空", new String[]{"需求单号"});
+        }
+        LiteOrder order = liteOrderCache.getLiteOrder(orderNo);
+        if (order == null) {
+            return ResultBean.newErrorResult(-1, "smfcore.valueNotExist", "{0}[{1}]不存在", new String[]{"需求单", orderNo});
+        }
+        if (order.isClosed()) {
+            return ResultBean.newErrorResult(-1, "smfcore.order.hasClose", "工单已关闭");
+        }
+        if (!order.isTaskFinished() && !order.isNew()) {
+            return ResultBean.newErrorResult(-1, "smfcore.order.out.executing", "工单正在执行");
+        }
+        order.setPriority(priority);
+        liteOrderManager.save(order);
+        liteOrderCache.addOrderToMap(order);
+        return ResultBean.newOkResult("");
+    }
+
 
 
     private OrderDto toOrderDto(LiteOrder liteOrder) {
     private OrderDto toOrderDto(LiteOrder liteOrder) {
         OrderSetting orderSetting = dataCache.getOrderSetting();
         OrderSetting orderSetting = dataCache.getOrderSetting();

src/main/java/com/neotel/smfcore/core/order/rest/bean/dto/OrderDto.java

@@ -94,6 +94,9 @@ public class OrderDto implements Serializable {
     @ApiModelProperty("工单线别")
     @ApiModelProperty("工单线别")
     private String line = "";
     private String line = "";
 
 
+    @ApiModelProperty("优先级")
+    private int priority = 0;
+
     @ApiModelProperty("附加字段")
     @ApiModelProperty("附加字段")
     private Map<String,String> appendData = new HashMap<>();
     private Map<String,String> appendData = new HashMap<>();
 }
 }

src/main/java/com/neotel/smfcore/core/order/service/po/LiteOrder.java

@@ -105,6 +105,8 @@ public class LiteOrder extends BasePo implements Serializable {
     private String createTime;
     private String createTime;
     private String creator;
     private String creator;
 
 
+    //优先级
+    private int priority = 0;
 
 
     /**
     /**
      * 订单的详细信息
      * 订单的详细信息

src/main/java/com/neotel/smfcore/core/system/rest/SettingsController.java

@@ -82,6 +82,10 @@ public class SettingsController {
         Integer caWarn=dataCache.getCache(Constants.CACHE_CapacityWarn);
         Integer caWarn=dataCache.getCache(Constants.CACHE_CapacityWarn);
         Integer backUpMonth = dataCache.getCache(Constants.BACKUP_MONTH_KEY);
         Integer backUpMonth = dataCache.getCache(Constants.BACKUP_MONTH_KEY);
         Boolean closeWorkOrder = dataCache.getCache(Constants.CACHE_closeWorkOrder);
         Boolean closeWorkOrder = dataCache.getCache(Constants.CACHE_closeWorkOrder);
+        Boolean electronicWarehouseDocking = dataCache.getCache(Constants.Cache_Electronic_Warehouse_Docking);
+        if (electronicWarehouseDocking == null) {
+            electronicWarehouseDocking = false;
+        }
         SysSettingsDto dto = new SysSettingsDto();
         SysSettingsDto dto = new SysSettingsDto();
         dto.setStartJob(startJob);
         dto.setStartJob(startJob);
         dto.setStopOut(stopOut);
         dto.setStopOut(stopOut);
@@ -92,6 +96,7 @@ public class SettingsController {
         if (closeWorkOrder != null) {
         if (closeWorkOrder != null) {
             dto.setCloseWorkOrder(closeWorkOrder);
             dto.setCloseWorkOrder(closeWorkOrder);
         }
         }
+        dto.setElectronicWarehouseDocking(electronicWarehouseDocking);
         return dto;
         return dto;
     }
     }
 
 
@@ -106,6 +111,8 @@ public class SettingsController {
         dataCache.updateCache(Constants.CACHE_CapacityWarn,sysSettingsDto.getCapacityWarn());
         dataCache.updateCache(Constants.CACHE_CapacityWarn,sysSettingsDto.getCapacityWarn());
         dataCache.updateCache(Constants.BACKUP_MONTH_KEY,sysSettingsDto.getBackUpMonth());
         dataCache.updateCache(Constants.BACKUP_MONTH_KEY,sysSettingsDto.getBackUpMonth());
         dataCache.updateCache(Constants.CACHE_closeWorkOrder,sysSettingsDto.isCloseWorkOrder());
         dataCache.updateCache(Constants.CACHE_closeWorkOrder,sysSettingsDto.isCloseWorkOrder());
+        //更新电子仓对接状态
+        dataCache.updateCache(Constants.Cache_Electronic_Warehouse_Docking,sysSettingsDto.isElectronicWarehouseDocking());
         log.info("更改系统设置：stopout=" + sysSettingsDto.isStopOut() + ",stopjob=" + sysSettingsDto.isStartJob()+",sluggishDay="+sysSettingsDto.getSluggishDay()
         log.info("更改系统设置：stopout=" + sysSettingsDto.isStopOut() + ",stopjob=" + sysSettingsDto.isStartJob()+",sluggishDay="+sysSettingsDto.getSluggishDay()
                 +",expiresDay="+sysSettingsDto.getExpiresDay()+",capacityWarn="+sysSettingsDto.getCapacityWarn()+",backUpMonth="+sysSettingsDto.getBackUpMonth()
                 +",expiresDay="+sysSettingsDto.getExpiresDay()+",capacityWarn="+sysSettingsDto.getCapacityWarn()+",backUpMonth="+sysSettingsDto.getBackUpMonth()
                 +",缺料不自动关闭工单="+sysSettingsDto.isCloseWorkOrder());
                 +",缺料不自动关闭工单="+sysSettingsDto.isCloseWorkOrder());

src/main/java/com/neotel/smfcore/core/system/rest/bean/dto/SysSettingsDto.java

@@ -30,4 +30,7 @@ public class SysSettingsDto implements Serializable {
 
 
     @ApiModelProperty("缺料不自动关闭工单")
     @ApiModelProperty("缺料不自动关闭工单")
     private boolean closeWorkOrder = false;
     private boolean closeWorkOrder = false;
+
+    @ApiModelProperty("电子仓对接")
+    private boolean electronicWarehouseDocking = false;
 }
 }