1.料架设置和工单设置 修改数据丢失bug修复

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

@@ -222,6 +222,10 @@ public class SettingsController {
             orderSetting.setAppendData(appendData);
         }
 
+        OrderSetting cacheOrderSetting = dataCache.getOrderSetting();
+        orderSetting.setShelfLightType(cacheOrderSetting.getShelfLightType());
+        orderSetting.setShelfConfigPutIn(cacheOrderSetting.isShelfConfigPutIn());
+
         dataCache.updateCache(Constants.CACHE_OrderSetting, orderSetting);
         dataCache.updateCache(Constants.CACHE_closeWorkOrder,orderSetting.isCloseWorkOrder());
         log.info("更改工单设置："+Constants.CACHE_OrderSetting+"=" + orderSetting.toString());
@@ -352,4 +356,15 @@ public class SettingsController {
        }
        return ResultBean.newOkResult(QRCodeLogin);
     }
+
+
+    @ApiOperation("修改料架设置")
+    @PutMapping("/shelf")
+    public ResultBean updateShelfSetting(@RequestBody OrderSetting orderSetting) {
+        OrderSetting cacheOrderSetting = dataCache.getOrderSetting();
+        cacheOrderSetting.setShelfConfigPutIn(orderSetting.isShelfConfigPutIn());
+        cacheOrderSetting.setShelfLightType(orderSetting.getShelfLightType());
+        dataCache.updateCache(Constants.CACHE_OrderSetting, cacheOrderSetting);
+        return ResultBean.newOkResult("保存成功");
+    }
 }