feat:出库组盘右侧显示新增库区显示

易文鹏
1 parent 537adf18
Showing 3 changed files with 18 additions and 2 deletions
src/main/java/com/huaheng/framework/config/ShiroConfig.java
src/main/java/com/huaheng/pc/shipment/shippingCombination/controller/ShippingCombinationController.java
src/main/resources/templates/shipment/shippingCombination/shippingCombination.html
@@ -254,6 +254,7 @@ public class ShiroConfig {
 //        filterChainDefinitionMap.put("/admin/home", "anon,captchaValidate");
         filterChainDefinitionMap.put("/mobile/download/*", "anon");
         filterChainDefinitionMap.put("/config/zone/*", "anon");
+        filterChainDefinitionMap.put("/receipt/receiptHeader/listPda", "anon");
         filterChainDefinitionMap.put("/admin/login", "anon");
         filterChainDefinitionMap.put("/login", "anon");
         filterChainDefinitionMap.put("/file/**", "anon");
@@ -401,7 +401,7 @@ public class ShippingCombinationController extends BaseController {
             lambdaQuery.eq(ShipmentDetail::getShipmentId, shipmentDetail.getShipmentId())
                     .lt(ShipmentDetail::getStatus, QuantityConstant.TASK_STATUS_COMPLETED);
             List<ShipmentDetail> shipmentDetailDatas = shipmentDetailService.list(lambdaQuery);
-            if (shipmentDetailDatas.size() < 1) {
+            if (shipmentDetailDatas.isEmpty()) {
                 shipmentHeader.setFirstStatus(QuantityConstant.SHIPMENT_HEADER_COMPLETED);
                 shipmentHeader.setLastStatus(QuantityConstant.SHIPMENT_HEADER_COMPLETED);
                 shipmentHeaderService.updateById(shipmentHeader);
@@ -86,7 +86,7 @@
     var containerHeaderStatus = [[${@dict.getType('shipmentContainerHeaderStatus')}]];
     var inventoryStatus = [[${@dict.getType('inventorySts')}]];
     var taskType = [[${@dict.getType('taskType')}]];
-
+    var zone = [[${@zone.getCode()}]];
     var prefix = ctx + "shipment/shippingCombination";
     var prefix_container = ctx + "shipment/shipmentContainerHeader"
@@ -240,6 +240,21 @@
                 visible: false
             },
             {
+                field: 'zoneCode',
+                title: '库区',
+                align: 'center',
+                formatter: function (value, row, index) {
+                    var actions = [];
+                    $.each(zone, function (index, dict) {
+                        if (dict.code == value) {
+                            actions.push("<span class='badge badge-info'>" + dict.name + "</span>");
+                            return false;
+                        }
+                    });
+                    return actions.join('');
+                }
+            },
+            {
                 field: 'companyCode',
                 title: '货主',
                 visible: false