From ea534a9cb28bc6a1ecbf633a0ff245e6860f73e7 Mon Sep 17 00:00:00 2001
From: yiwenpeng <ywp303@163.com>
Date: Wed, 30 Aug 2023 00:13:05 +0800
Subject: [PATCH] feat:出库组盘右侧显示新增库区显示
---
src/main/java/com/huaheng/framework/config/ShiroConfig.java | 1 +
src/main/java/com/huaheng/pc/shipment/shippingCombination/controller/ShippingCombinationController.java | 2 +-
src/main/resources/templates/shipment/shippingCombination/shippingCombination.html | 17 ++++++++++++++++-
3 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/huaheng/framework/config/ShiroConfig.java b/src/main/java/com/huaheng/framework/config/ShiroConfig.java
index 91f18dd..f1efb66 100644
--- a/src/main/java/com/huaheng/framework/config/ShiroConfig.java
+++ b/src/main/java/com/huaheng/framework/config/ShiroConfig.java
@@ -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");
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 8e89145..0b49830 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
@@ -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);
diff --git a/src/main/resources/templates/shipment/shippingCombination/shippingCombination.html b/src/main/resources/templates/shipment/shippingCombination/shippingCombination.html
index 8052e4d..b13de8b 100644
--- a/src/main/resources/templates/shipment/shippingCombination/shippingCombination.html
+++ b/src/main/resources/templates/shipment/shippingCombination/shippingCombination.html
@@ -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
--
libgit2 0.22.2