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 "" + locationCode + "
";
- }
- return locationCode.toString();
+
+ String locationCode=origenData.get(2).toString();
+ String status=origenData.get(10).toString();
+ if(status.equals(LocationStatus.PICK)){
+ return "拣货
";
+ }
+
+ boolean res=inventoryManager.izAnyInv(locationCode);
+ if(res){
+ return "空库位
";
+ }else{
+ return "存货
";
+ }
}
}
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 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 @@
-
+
+
+