From 5ff35d6f044feeb9b3f2001cd91719329226dba4 Mon Sep 17 00:00:00 2001
From: "HUOJIN\\92525" <Jin980303>
Date: Tue, 20 Jan 2026 14:03:12 +0800
Subject: [PATCH] no message

---
 .../formatter/LocationAgeFormatter.java       | 31 ++++++++++++++-----
 .../service/inventory/InventoryManager.java   |  3 ++
 .../pojo/DefaultInventoryManager.java         |  7 +++++
 src/main/java/formatContext.xml               |  6 +++-
 .../origen/base/maintainLocationPage.xml      |  4 +--
 .../origen/base/maintainLocationPage.xml      |  4 +--
 .../jrwms/WEB-INF/classes/formatContext.xml   |  6 +++-
 7 files changed, 47 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/dev/swms/server/action/formatter/LocationAgeFormatter.java b/src/main/java/com/dev/swms/server/action/formatter/LocationAgeFormatter.java
index 4e248ae..04a181a 100644
--- a/src/main/java/com/dev/swms/server/action/formatter/LocationAgeFormatter.java
+++ b/src/main/java/com/dev/swms/server/action/formatter/LocationAgeFormatter.java
@@ -1,20 +1,35 @@
 package com.dev.swms.server.action.formatter;
 
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.List;
 
 import com.dev.energy.server.format.Formatter;
+import com.dev.swms.server.model.base.LocationStatus;
+import com.dev.swms.server.service.inventory.InventoryManager;
 
 public class LocationAgeFormatter  implements Formatter {
 	
-	public String format(String property, Object locationCode, List origenData,
+	private final InventoryManager inventoryManager;
+
+	public LocationAgeFormatter(InventoryManager inventoryManager) {
+		this.inventoryManager = inventoryManager;
+	}
+	
+	
+	public String format(String property, Object cellValue, List origenData,
 			String referenceModel, String locale) {
-			if(locationCode.equals("FC")){
-				return "<div style='background-color:red' >" + locationCode + "</div>";
-			}
-			return locationCode.toString();
+		
+		String locationCode=origenData.get(2).toString();
+		String status=origenData.get(10).toString();
+		if(status.equals(LocationStatus.PICK)){
+			return "<div>拣货</div>";
+		}
+		
+		boolean res=inventoryManager.izAnyInv(locationCode);
+		if(res){
+			return "<div>空库位</div>";
+		}else{
+			return "<div>存货</div>";
+		}
 	}
 
 }
diff --git a/src/main/java/com/dev/swms/server/service/inventory/InventoryManager.java b/src/main/java/com/dev/swms/server/service/inventory/InventoryManager.java
index 1c30f56..6a178e0 100644
--- a/src/main/java/com/dev/swms/server/service/inventory/InventoryManager.java
+++ b/src/main/java/com/dev/swms/server/service/inventory/InventoryManager.java
@@ -308,4 +308,7 @@ public interface InventoryManager extends BaseManager{
 	//批量移位
 	@Transactional
 	void multiMove(File file);
+	
+	//当前库位是否有库存
+	boolean izAnyInv(String locationCode);
 }
diff --git a/src/main/java/com/dev/swms/server/service/inventory/pojo/DefaultInventoryManager.java b/src/main/java/com/dev/swms/server/service/inventory/pojo/DefaultInventoryManager.java
index 8342f29..0dfa5a0 100644
--- a/src/main/java/com/dev/swms/server/service/inventory/pojo/DefaultInventoryManager.java
+++ b/src/main/java/com/dev/swms/server/service/inventory/pojo/DefaultInventoryManager.java
@@ -2527,4 +2527,11 @@ public class DefaultInventoryManager extends DefaultBaseManager implements Inven
 			e.printStackTrace();
 		}
 	}
+
+	@Override
+	public boolean izAnyInv(String locationCode) {
+		String hql="from Inventory inv where inv.location.code='"+locationCode+"' and inv.itemKeyInventory.warehouse.id="+WarehouseHolder.getWarehouse().getId()+"  ";
+		List<Inventory> Inventorys =  commonDao.findByQuery(hql); 
+		return Inventorys.isEmpty()?true:false;
+	}
 }
\ No newline at end of file
diff --git a/src/main/java/formatContext.xml b/src/main/java/formatContext.xml
index 24797c5..b64c9ea 100644
--- a/src/main/java/formatContext.xml
+++ b/src/main/java/formatContext.xml
@@ -35,7 +35,11 @@
 	<bean id="colourFormat" class="com.dev.swms.server.action.formatter.ColourFormatter"/>
 	<bean id="inventoryAgeFormat" class="com.dev.swms.server.action.formatter.InventoryAgeFormatter" singleton="false"/>	
 	<bean id="invokeFormat" class="com.dev.swms.server.action.formatter.ReportFileIsInvokeFormatter"/>
-	<bean id="locationAgeFormatter" class="com.dev.swms.server.action.formatter.LocationAgeFormatter"/>
+	<bean id="locationAgeFormatter" class="com.dev.swms.server.action.formatter.LocationAgeFormatter">
+		<constructor-arg index="0">
+					<ref bean="inventoryManager"/>
+		</constructor-arg>
+	</bean>
 	<bean id="colourChangeFormat" class="com.dev.swms.server.action.formatter.ColourChangeFormat" singleton="false"/>	
 	<bean id="lookPictureFormatter" class="com.dev.swms.server.action.formatter.LookPictureFormatter"/>
 	<bean id="downloadPictureFormatter" class="com.dev.swms.server.action.formatter.DownloadPictureFormatter"/>
diff --git a/src/webapp/WEB-INF/classes/config/origen/base/maintainLocationPage.xml b/src/webapp/WEB-INF/classes/config/origen/base/maintainLocationPage.xml
index abd4dbc..a5e9ab4 100644
--- a/src/webapp/WEB-INF/classes/config/origen/base/maintainLocationPage.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/base/maintainLocationPage.xml
@@ -72,7 +72,7 @@
         <columns>
             <column id="location.id" title="location.id" visible="false"/>
             <column id="location.zone.name" title="location.zone" visible="true" horizonAlign="left"/>
-            <column id="location.code" title="location.code" visible="true" horizonAlign="left"/>
+            <column id="location.code" title="location.code" visible="true" horizonAlign="left" />
             <column id="location.name" title="location.name" visible="true" horizonAlign="left"/>
             <column id="location.type" width="80" title="location.type" visible="true" horizonAlign="left" verticalAlign="middle" format="enumFormat" formatParam="LocationType"  />
             <column id="location.stowage.name" title="location.stowage" visible="true" horizonAlign="center" verticalAlign="middle"/>
@@ -80,7 +80,7 @@
             <column id="location.mixItem" width="80" title="location.mixItem" visible="true" horizonAlign="center" verticalAlign="middle" format="booleanFormat" formatParam="yesNo"/>
             <column id="location.mixLot" width="80" title="location.mixLot" visible="true" horizonAlign="center" verticalAlign="middle" format="booleanFormat" formatParam="yesNo"/>
             <column id="location.sortIndex" width="60" title="location.sortIndex" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="location.status" width="80" title="location.status" visible="true" horizonAlign="center" verticalAlign="middle" format="enumFormat" formatParam="LocationStatus" />
+            <column id="location.status" width="80" title="location.status" visible="true" horizonAlign="center" verticalAlign="middle" format="locationAgeFormatter"  formatParam="LocationStatus" />
             <column id="location.inLock" width="80" title="location.inLock" visible="true" horizonAlign="center" verticalAlign="middle"/>
             <column id="location.outLock" width="80" title="location.outLock" visible="true" horizonAlign="center" verticalAlign="middle"/>
             <column id="location.countLock" title="location.countLock" visible="true" horizonAlign="center" verticalAlign="middle"/>
diff --git a/target/jrwms/WEB-INF/classes/config/origen/base/maintainLocationPage.xml b/target/jrwms/WEB-INF/classes/config/origen/base/maintainLocationPage.xml
index abd4dbc..a5e9ab4 100644
--- a/target/jrwms/WEB-INF/classes/config/origen/base/maintainLocationPage.xml
+++ b/target/jrwms/WEB-INF/classes/config/origen/base/maintainLocationPage.xml
@@ -72,7 +72,7 @@
         <columns>
             <column id="location.id" title="location.id" visible="false"/>
             <column id="location.zone.name" title="location.zone" visible="true" horizonAlign="left"/>
-            <column id="location.code" title="location.code" visible="true" horizonAlign="left"/>
+            <column id="location.code" title="location.code" visible="true" horizonAlign="left" />
             <column id="location.name" title="location.name" visible="true" horizonAlign="left"/>
             <column id="location.type" width="80" title="location.type" visible="true" horizonAlign="left" verticalAlign="middle" format="enumFormat" formatParam="LocationType"  />
             <column id="location.stowage.name" title="location.stowage" visible="true" horizonAlign="center" verticalAlign="middle"/>
@@ -80,7 +80,7 @@
             <column id="location.mixItem" width="80" title="location.mixItem" visible="true" horizonAlign="center" verticalAlign="middle" format="booleanFormat" formatParam="yesNo"/>
             <column id="location.mixLot" width="80" title="location.mixLot" visible="true" horizonAlign="center" verticalAlign="middle" format="booleanFormat" formatParam="yesNo"/>
             <column id="location.sortIndex" width="60" title="location.sortIndex" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="location.status" width="80" title="location.status" visible="true" horizonAlign="center" verticalAlign="middle" format="enumFormat" formatParam="LocationStatus" />
+            <column id="location.status" width="80" title="location.status" visible="true" horizonAlign="center" verticalAlign="middle" format="locationAgeFormatter"  formatParam="LocationStatus" />
             <column id="location.inLock" width="80" title="location.inLock" visible="true" horizonAlign="center" verticalAlign="middle"/>
             <column id="location.outLock" width="80" title="location.outLock" visible="true" horizonAlign="center" verticalAlign="middle"/>
             <column id="location.countLock" title="location.countLock" visible="true" horizonAlign="center" verticalAlign="middle"/>
diff --git a/target/jrwms/WEB-INF/classes/formatContext.xml b/target/jrwms/WEB-INF/classes/formatContext.xml
index 24797c5..b64c9ea 100644
--- a/target/jrwms/WEB-INF/classes/formatContext.xml
+++ b/target/jrwms/WEB-INF/classes/formatContext.xml
@@ -35,7 +35,11 @@
 	<bean id="colourFormat" class="com.dev.swms.server.action.formatter.ColourFormatter"/>
 	<bean id="inventoryAgeFormat" class="com.dev.swms.server.action.formatter.InventoryAgeFormatter" singleton="false"/>	
 	<bean id="invokeFormat" class="com.dev.swms.server.action.formatter.ReportFileIsInvokeFormatter"/>
-	<bean id="locationAgeFormatter" class="com.dev.swms.server.action.formatter.LocationAgeFormatter"/>
+	<bean id="locationAgeFormatter" class="com.dev.swms.server.action.formatter.LocationAgeFormatter">
+		<constructor-arg index="0">
+					<ref bean="inventoryManager"/>
+		</constructor-arg>
+	</bean>
 	<bean id="colourChangeFormat" class="com.dev.swms.server.action.formatter.ColourChangeFormat" singleton="false"/>	
 	<bean id="lookPictureFormatter" class="com.dev.swms.server.action.formatter.LookPictureFormatter"/>
 	<bean id="downloadPictureFormatter" class="com.dev.swms.server.action.formatter.DownloadPictureFormatter"/>