From 80c789f6d530eab32d357130dd3563b479efada9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9A=B4=E7=82=B3=E6=9E=97?= <15237758276@163.com>
Date: Wed, 5 Mar 2025 10:37:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=8C=BALOC=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sql | 14 ++++++
.../swms/server/model/delivery/ZonePlant.java | 24 +++++++++
.../server/model/delivery/zonePlant.hbm.xml | 23 +++++++++
.../service/base/WarehouseAreaManager.java | 7 ++-
.../pojo/DefaultWarehouseAreaManager.java | 32 +++++++++++-
src/main/java/daoContext.xml | 5 ++
.../origen/base/maintainWarehouseAreaPage.xml | 5 +-
.../origen/base/modifyWarehouseAreaPage.xml | 50 +++++++++++++++++++
.../origen/base/modifyZonePlantPage.xml | 44 ++++++++++++++++
9 files changed, 200 insertions(+), 4 deletions(-)
create mode 100644 src/main/java/com/dev/swms/server/model/delivery/ZonePlant.java
create mode 100644 src/main/java/com/dev/swms/server/model/delivery/zonePlant.hbm.xml
create mode 100644 src/webapp/WEB-INF/classes/config/origen/base/modifyWarehouseAreaPage.xml
create mode 100644 src/webapp/WEB-INF/classes/config/origen/base/modifyZonePlantPage.xml
diff --git a/sql b/sql
index d80c113..64c098c 100644
--- a/sql
+++ b/sql
@@ -56,3 +56,17 @@ alter table location add BeInventorys bit;
#2023-06-14
alter table SHIXIAO add pandian numeric(18);
alter table SHIXIAO add zhengli numeric(18);
+
+#2023-03-5 添加 库区LOC配置
+CREATE TABLE [dbo].[ZONE_PLANT] (
+ [ID] numeric(19) IDENTITY(1,1) NOT NULL,
+ [ZONE_ID] int NULL,
+ [PLANE_LOCATION_ID] int NULL,
+ CONSTRAINT [PK__zone_pla__3213E83FEFD8CD6E] PRIMARY KEY CLUSTERED ([ID])
+WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON)
+ON [PRIMARY]
+)
+ON [PRIMARY]
+GO
+
+ALTER TABLE [dbo].[ZONE_PLANT] SET (LOCK_ESCALATION = TABLE)
diff --git a/src/main/java/com/dev/swms/server/model/delivery/ZonePlant.java b/src/main/java/com/dev/swms/server/model/delivery/ZonePlant.java
new file mode 100644
index 0000000..88ef7e1
--- /dev/null
+++ b/src/main/java/com/dev/swms/server/model/delivery/ZonePlant.java
@@ -0,0 +1,24 @@
+package com.dev.swms.server.model.delivery;
+
+import com.dev.energy.server.model.Entity;
+import com.dev.swms.server.model.base.WarehouseArea;
+
+public class ZonePlant extends Entity {
+
+ /** 货架 */
+ private WarehouseArea area;
+ /** 缓存地 */
+ private PlantLocation pLocation;
+ public WarehouseArea getArea() {
+ return area;
+ }
+ public void setArea(WarehouseArea area) {
+ this.area = area;
+ }
+ public PlantLocation getpLocation() {
+ return pLocation;
+ }
+ public void setpLocation(PlantLocation pLocation) {
+ this.pLocation = pLocation;
+ }
+}
diff --git a/src/main/java/com/dev/swms/server/model/delivery/zonePlant.hbm.xml b/src/main/java/com/dev/swms/server/model/delivery/zonePlant.hbm.xml
new file mode 100644
index 0000000..6033175
--- /dev/null
+++ b/src/main/java/com/dev/swms/server/model/delivery/zonePlant.hbm.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+ wms_ZonePlant
+ START WITH 1000
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/com/dev/swms/server/service/base/WarehouseAreaManager.java b/src/main/java/com/dev/swms/server/service/base/WarehouseAreaManager.java
index 188fbb0..2d43888 100644
--- a/src/main/java/com/dev/swms/server/service/base/WarehouseAreaManager.java
+++ b/src/main/java/com/dev/swms/server/service/base/WarehouseAreaManager.java
@@ -40,8 +40,13 @@ public interface WarehouseAreaManager extends BaseManager {
//生效
@Transactional
void ShengXiaoAll(List warehouseAreaIds);
+ //保存LOC
+ @Transactional
+ void storeZonePlant(Long waId,List plIds);
-
+ //移除LOC
+ @Transactional
+ void deleteZonePlant(List zpIds);
/**
* 保存库区信息，进行license验证
* @param warehouse
diff --git a/src/main/java/com/dev/swms/server/service/base/pojo/DefaultWarehouseAreaManager.java b/src/main/java/com/dev/swms/server/service/base/pojo/DefaultWarehouseAreaManager.java
index be149d8..c4544ff 100644
--- a/src/main/java/com/dev/swms/server/service/base/pojo/DefaultWarehouseAreaManager.java
+++ b/src/main/java/com/dev/swms/server/service/base/pojo/DefaultWarehouseAreaManager.java
@@ -27,6 +27,8 @@ import com.dev.swms.server.model.base.UserGroupWarehouse;
import com.dev.swms.server.model.base.Warehouse;
import com.dev.swms.server.model.base.WarehouseArea;
import com.dev.swms.server.model.base.WarehouseAreaStatus;
+import com.dev.swms.server.model.delivery.PlantLocation;
+import com.dev.swms.server.model.delivery.ZonePlant;
import com.dev.swms.server.model.inventory.Inventory;
import com.dev.swms.server.model.inventory.Task;
import com.dev.swms.server.model.shipping.SeedWall;
@@ -184,7 +186,33 @@ public class DefaultWarehouseAreaManager extends DefaultBaseManager implements
}
}*/
-
-
+
+ @Override
+ public void storeZonePlant(Long waId, List plIds) {
+ // TODO 自动生成的方法存根
+ WarehouseArea area=this.load(WarehouseArea.class,waId);
+ for (Long id : plIds) {
+ PlantLocation plantLocation=this.load(PlantLocation.class, id);
+ String sql=" from ZonePlant zp where zp.area.id="+waId+" and zp.pLocation.id="+id;
+ List zonePlantList=commonDao.findByQuery(sql);
+ if (zonePlantList.size()>0) {
+
+ }else {
+ ZonePlant zonePlant=new ZonePlant();
+ zonePlant.setArea(area);
+ zonePlant.setpLocation(plantLocation);
+ commonDao.store(zonePlant);
+ }
+ }
+ }
+
+ @Override
+ public void deleteZonePlant(List zpIds) {
+ // TODO 自动生成的方法存根
+ for (Long id : zpIds) {
+ ZonePlant zonePlant=this.load(ZonePlant.class, id);
+ commonDao.delete(zonePlant);
+ }
+ }
}
diff --git a/src/main/java/daoContext.xml b/src/main/java/daoContext.xml
index 376a78f..ce49994 100644
--- a/src/main/java/daoContext.xml
+++ b/src/main/java/daoContext.xml
@@ -1191,6 +1191,11 @@
com/dev/swms/server/model/delivery/plantInfo.hbm.xml
+
+
+ com/dev/swms/server/model/delivery/zonePlant.hbm.xml
+
+
com/dev/swms/server/model/delivery/plantLocation.hbm.xml
diff --git a/src/webapp/WEB-INF/classes/config/origen/base/maintainWarehouseAreaPage.xml b/src/webapp/WEB-INF/classes/config/origen/base/maintainWarehouseAreaPage.xml
index af19fdb..96ebe54 100644
--- a/src/webapp/WEB-INF/classes/config/origen/base/maintainWarehouseAreaPage.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/base/maintainWarehouseAreaPage.xml
@@ -44,7 +44,7 @@
where 1=1
/~warehouseArea.name: and wa.name like upper({warehouseArea.name})~/
/~SESSION_WAREHOUSE: AND wa.warehouse = #{SESSION_WAREHOUSE}~/
- /~wa.disabled: and wa.disabled = {wa.disabled}~/
+ /~wa.disabled: and wa.disabled = {wa.disabled}~/
/~warehouseArea.carrierType.id: and wa.carrierType.id like {warehouseArea.carrierType.id}~/
order by wa.name asc,wa.id asc
]]>
@@ -119,6 +119,9 @@ order by wa.name asc,wa.id asc
editEnabled="false" />
+
+
diff --git a/src/webapp/WEB-INF/classes/config/origen/base/modifyWarehouseAreaPage.xml b/src/webapp/WEB-INF/classes/config/origen/base/modifyWarehouseAreaPage.xml
new file mode 100644
index 0000000..5066342
--- /dev/null
+++ b/src/webapp/WEB-INF/classes/config/origen/base/modifyWarehouseAreaPage.xml
@@ -0,0 +1,50 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/webapp/WEB-INF/classes/config/origen/base/modifyZonePlantPage.xml b/src/webapp/WEB-INF/classes/config/origen/base/modifyZonePlantPage.xml
new file mode 100644
index 0000000..f4ce196
--- /dev/null
+++ b/src/webapp/WEB-INF/classes/config/origen/base/modifyZonePlantPage.xml
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+