diff --git a/src/main/java/com/huaheng/pc/config/shipmentPreference/controller/ShipmentPreferenceController.java b/src/main/java/com/huaheng/pc/config/shipmentPreference/controller/ShipmentPreferenceController.java
index b9c8e25..3195b93 100644
--- a/src/main/java/com/huaheng/pc/config/shipmentPreference/controller/ShipmentPreferenceController.java
+++ b/src/main/java/com/huaheng/pc/config/shipmentPreference/controller/ShipmentPreferenceController.java
@@ -77,7 +77,7 @@ public class ShipmentPreferenceController extends BaseController {
     }
 
     /**
-     * 新增入库首选项
+     * 新增出库首选项
      */
     @GetMapping("/add")
     public String add() {
diff --git a/src/main/java/com/huaheng/pc/shipment/shippingCombination/controller/ShippingCombinationController.java b/src/main/java/com/huaheng/pc/shipment/shippingCombination/controller/ShippingCombinationController.java
index 1e43388..ae295fc 100644
--- a/src/main/java/com/huaheng/pc/shipment/shippingCombination/controller/ShippingCombinationController.java
+++ b/src/main/java/com/huaheng/pc/shipment/shippingCombination/controller/ShippingCombinationController.java
@@ -143,6 +143,9 @@ public class ShippingCombinationController extends BaseController {
         if(list.isEmpty()){
             throw new ServiceException("该物料没有库存或没有符合出库规则的库存");
         }
+        for(InventoryDetail item : list){
+            item.setQty(item.getQty().subtract(item.getTaskQty()));
+        }
         //查找分配规则
         return getDataTable(list);
     }
@@ -156,7 +159,7 @@ public class ShippingCombinationController extends BaseController {
     @RequiresPermissions("shipment:shippingCombination:combination")
     @PostMapping("/Addcombination")
     @ResponseBody
-    public AjaxResult Addcombination(ShipmentCombinationModel shipmentCombinationModel){
+    public  AjaxResult Addcombination(ShipmentCombinationModel shipmentCombinationModel){
         ShipmentContainerHeader shipmentContainerHeader= shipmentContainerHeaderService.combination(shipmentCombinationModel);
         return  AjaxResult.success(shipmentContainerHeader.getId());
     }
diff --git a/src/main/resources/templates/config/configValue/configValue.html b/src/main/resources/templates/config/configValue/configValue.html
index 2b82bbf..d6005ba 100644
--- a/src/main/resources/templates/config/configValue/configValue.html
+++ b/src/main/resources/templates/config/configValue/configValue.html
@@ -31,10 +31,10 @@
             </form>
         </div>
         <div class="btn-group hidden-xs" id="toolbar" role="group">
-            <a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()" shiro:hasPermission="config:company:add">
+            <a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()" shiro:hasPermission="config:configValue:add">
                 <i class="fa fa-plus"></i> 新增
             </a>
-            <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()" shiro:hasPermission="config:company:remove">
+            <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()" shiro:hasPermission="config:configValue:remove">
                 <i class="fa fa-trash-o"></i> 删除
             </a>
         </div>
@@ -95,10 +95,10 @@
                     field : 'description',
                     title : '描述'
                 },
-                {
-                    field : 'systemCreated',
-                    title : '系统创建'
-                },
+                // {
+                //     field : 'systemCreated',
+                //     title : '系统创建'
+                // },
                 {
                     field : 'created',
                     title : '创建时间'
diff --git a/src/main/resources/templates/config/shipmentPreference/shipmentPreference.html b/src/main/resources/templates/config/shipmentPreference/shipmentPreference.html
index ecfd78b..5fb0a51 100644
--- a/src/main/resources/templates/config/shipmentPreference/shipmentPreference.html
+++ b/src/main/resources/templates/config/shipmentPreference/shipmentPreference.html
@@ -54,7 +54,7 @@
             var prefix = ctx + "config/shipmentPreference";
             var StatusFlow = [[${@StatusFlow.shipmentStatusFlowHeaders('shipment')}]];
             var shipmentPickingRule = [[${@filterConfigHeaderService.getFilterConfigHeaderService('shipment','shipmentPickingRule')}]];
-            var allocationRule = [[${@filterConfigHeaderService.getFilterConfigHeaderService('shipment','allocationRule')}]];
+            var allocationRules = [[${@filterConfigHeaderService.getFilterConfigHeaderService('shipment','allocationRule')}]];
             $(function() {
                 var options = {
                     url: prefix + "/list",
@@ -102,7 +102,7 @@
                             title : '库存分配规则',
                             formatter: function (value, item, index) {
                                 var actions = [];
-                                $.each(allocationRule, function(index, dict) {
+                                $.each(allocationRules, function(index, dict) {
                                     if (dict.filterCode == value) {
                                         actions.push("<span class='badge badge-" + dict.filterCode + "'>" + dict.filterName + "</span>");
                                         return false;