From 47ce939aed07d99a9e65a93f6931bbc73a7cdc82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9A=B4=E7=82=B3=E6=9E=97?= <15237758276@163.com> Date: Fri, 27 Dec 2024 10:39:44 +0800 Subject: [PATCH] no message --- ...DefaultAutoAllocator.java => DefaultNewAutoAllocator.java} | 4 ++-- ...faultWaveDocManager.java => DefaultNewWaveDocManager.java} | 4 ++-- src/main/java/serviceContext.xml | 4 ++-- .../shipping/{newEditbkcbPage.xml => editNewbkcbPage.xml} | 2 +- ...{newMaintainWaveDocPage.xml => maintainNewWaveDocPage.xml} | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) rename src/main/java/com/dev/swms/server/service/picking/allocate/{NewDefaultAutoAllocator.java => DefaultNewAutoAllocator.java} (99%) rename src/main/java/com/dev/swms/server/service/shipping/pojo/{NewDefaultWaveDocManager.java => DefaultNewWaveDocManager.java} (99%) rename src/webapp/WEB-INF/classes/config/origen/shipping/{newEditbkcbPage.xml => editNewbkcbPage.xml} (98%) rename src/webapp/WEB-INF/classes/config/origen/shipping/{newMaintainWaveDocPage.xml => maintainNewWaveDocPage.xml} (98%) diff --git a/src/main/java/com/dev/swms/server/service/picking/allocate/NewDefaultAutoAllocator.java b/src/main/java/com/dev/swms/server/service/picking/allocate/DefaultNewAutoAllocator.java similarity index 99% rename from src/main/java/com/dev/swms/server/service/picking/allocate/NewDefaultAutoAllocator.java rename to src/main/java/com/dev/swms/server/service/picking/allocate/DefaultNewAutoAllocator.java index 9c7a83a..0e563d3 100644 --- a/src/main/java/com/dev/swms/server/service/picking/allocate/NewDefaultAutoAllocator.java +++ b/src/main/java/com/dev/swms/server/service/picking/allocate/DefaultNewAutoAllocator.java @@ -90,7 +90,7 @@ import org.apache.log4j.Logger; * @author dev * */ -public class NewDefaultAutoAllocator extends DefaultBaseManager implements NewAutoAllocator { +public class DefaultNewAutoAllocator extends DefaultBaseManager implements NewAutoAllocator { protected final ItemManager itemManager; protected final InventoryManager inventoryManager; protected final BussinessCodeManager bussinessCodeManager; @@ -103,7 +103,7 @@ public class NewDefaultAutoAllocator extends DefaultBaseManager implements NewAu private static Logger logger = Logger.getLogger(DefaultAutoAllocator.class); - public NewDefaultAutoAllocator(ItemManager manager,InventoryManager manager1, + public DefaultNewAutoAllocator(ItemManager manager,InventoryManager manager1, BussinessCodeManager manager2, PutawayAllocator allocator,InterfaceManager interfaceManager2,JdbcManager jdbcManager2,AgvTaskManager agvTaskManager, InterfaceReqManager interfaceReqManager) { itemManager = manager; diff --git a/src/main/java/com/dev/swms/server/service/shipping/pojo/NewDefaultWaveDocManager.java b/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultNewWaveDocManager.java similarity index 99% rename from src/main/java/com/dev/swms/server/service/shipping/pojo/NewDefaultWaveDocManager.java rename to src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultNewWaveDocManager.java index df1f2d6..82d6bf1 100644 --- a/src/main/java/com/dev/swms/server/service/shipping/pojo/NewDefaultWaveDocManager.java +++ b/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultNewWaveDocManager.java @@ -32,7 +32,7 @@ import com.dev.swms.server.service.shipping.PickTicketManager; import com.dev.swms.server.utils.TimeNumberUtils; -public class NewDefaultWaveDocManager extends DefaultBaseManager implements +public class DefaultNewWaveDocManager extends DefaultBaseManager implements NewWaveDocManager { private static Logger logger = Logger.getLogger(DefaultWaveDocManager.class); @@ -44,7 +44,7 @@ public class NewDefaultWaveDocManager extends DefaultBaseManager implements protected final JdbcManager jdbcManager; protected static Date hotWaveDate=new Date();//波次创建，判断不能同时新建 protected static boolean hotWave=true;//波次创建，判断不能同时新建 - public NewDefaultWaveDocManager(PickTicketManager pickTicketManager, NewAutoAllocator autoAllocator, + public DefaultNewWaveDocManager(PickTicketManager pickTicketManager, NewAutoAllocator autoAllocator, InventoryManager inventoryManager, ItemManager itemManager,BussinessCodeManager bussinessCodeManager,JdbcManager jdbcManager) { this.pickTicketManager = pickTicketManager; this.autoAllocator = autoAllocator; diff --git a/src/main/java/serviceContext.xml b/src/main/java/serviceContext.xml index 06b661d..d49eda8 100644 --- a/src/main/java/serviceContext.xml +++ b/src/main/java/serviceContext.xml @@ -584,7 +584,7 @@ @@ -759,7 +759,7 @@ diff --git a/src/webapp/WEB-INF/classes/config/origen/shipping/newEditbkcbPage.xml b/src/webapp/WEB-INF/classes/config/origen/shipping/editNewbkcbPage.xml similarity index 98% rename from src/webapp/WEB-INF/classes/config/origen/shipping/newEditbkcbPage.xml rename to src/webapp/WEB-INF/classes/config/origen/shipping/editNewbkcbPage.xml index 2c5f1fc..2297d7d 100644 --- a/src/webapp/WEB-INF/classes/config/origen/shipping/newEditbkcbPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/shipping/editNewbkcbPage.xml @@ -1,7 +1,7 @@ - +