Youchain
/
ZhongWei_Old2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

main
暴炳林 2024-12-27 10:39:44 +08:00
parent 3eff067888
commit 47ce939aed
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/dev/swms/server/service/picking/allocate/NewDefaultAutoAllocator.java → src/main/java/com/dev/swms/server/service/picking/allocate/DefaultNewAutoAllocator.java
View File

@ -90,7 +90,7 @@ import org.apache.log4j.Logger;
* @author dev * @author dev
* *
*/ */
public class NewDefaultAutoAllocator extends DefaultBaseManager implements NewAutoAllocator { public class DefaultNewAutoAllocator extends DefaultBaseManager implements NewAutoAllocator {
protected final ItemManager itemManager; protected final ItemManager itemManager;
protected final InventoryManager inventoryManager; protected final InventoryManager inventoryManager;
protected final BussinessCodeManager bussinessCodeManager; protected final BussinessCodeManager bussinessCodeManager;
@ -103,7 +103,7 @@ public class NewDefaultAutoAllocator extends DefaultBaseManager implements NewAu
private static Logger logger = Logger.getLogger(DefaultAutoAllocator.class); 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, BussinessCodeManager manager2, PutawayAllocator allocator,InterfaceManager interfaceManager2,JdbcManager jdbcManager2,AgvTaskManager agvTaskManager,
InterfaceReqManager interfaceReqManager) { InterfaceReqManager interfaceReqManager) {
itemManager = manager; itemManager = manager;

4
src/main/java/com/dev/swms/server/service/shipping/pojo/NewDefaultWaveDocManager.java → src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultNewWaveDocManager.java
View File

@ -32,7 +32,7 @@ import com.dev.swms.server.service.shipping.PickTicketManager;
import com.dev.swms.server.utils.TimeNumberUtils; import com.dev.swms.server.utils.TimeNumberUtils;
public class NewDefaultWaveDocManager extends DefaultBaseManager implements public class DefaultNewWaveDocManager extends DefaultBaseManager implements
NewWaveDocManager { NewWaveDocManager {
private static Logger logger = Logger.getLogger(DefaultWaveDocManager.class); private static Logger logger = Logger.getLogger(DefaultWaveDocManager.class);
@ -44,7 +44,7 @@ public class NewDefaultWaveDocManager extends DefaultBaseManager implements
protected final JdbcManager jdbcManager; protected final JdbcManager jdbcManager;
protected static Date hotWaveDate=new Date();//波次创建，判断不能同时新建 protected static Date hotWaveDate=new Date();//波次创建，判断不能同时新建
protected static boolean hotWave=true;//波次创建，判断不能同时新建 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) { InventoryManager inventoryManager, ItemManager itemManager,BussinessCodeManager bussinessCodeManager,JdbcManager jdbcManager) {
this.pickTicketManager = pickTicketManager; this.pickTicketManager = pickTicketManager;
this.autoAllocator = autoAllocator; this.autoAllocator = autoAllocator;

4
src/main/java/serviceContext.xml
View File

@ -584,7 +584,7 @@
<bean id="newWaveDocManager" parent="abstractTransactionProxy"> <bean id="newWaveDocManager" parent="abstractTransactionProxy">
<property name="target"> <property name="target">
<bean <bean
class="com.dev.swms.server.service.shipping.pojo.NewDefaultWaveDocManager" class="com.dev.swms.server.service.shipping.pojo.DefaultNewWaveDocManager"
parent="baseManager"> parent="baseManager">
<constructor-arg index="0"> <constructor-arg index="0">
<ref local="pickTicketManager" /> <ref local="pickTicketManager" />
@ -759,7 +759,7 @@
<bean id="newAutoAllocator" parent="abstractTransactionProxy"> <bean id="newAutoAllocator" parent="abstractTransactionProxy">
<property name="target"> <property name="target">
<bean <bean
class="com.dev.swms.server.service.picking.allocate.NewDefaultAutoAllocator" class="com.dev.swms.server.service.picking.allocate.DefaultNewAutoAllocator"
parent="baseManager"> parent="baseManager">
<constructor-arg index="0"> <constructor-arg index="0">
<ref local="itemManager" /> <ref local="itemManager" />

2
src/webapp/WEB-INF/classes/config/origen/shipping/newEditbkcbPage.xml → src/webapp/WEB-INF/classes/config/origen/shipping/editNewbkcbPage.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<pages> <pages>
<editPage id="newEditbkcbPage" title="创建波次" onClose="refreshParent" width="600" height="360"> <editPage id="editNewbkcbPage" title="创建波次" onClose="refreshParent" width="600" height="360">
<inputUIs> <inputUIs>
<date id="date1" title="开始日期" row="1" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false"/> <date id="date1" title="开始日期" row="1" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false"/>
<textArea id="pickCode" title="工单选择" row="1" col="2" span="4" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" rows="5" cols="30" /> <textArea id="pickCode" title="工单选择" row="1" col="2" span="4" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" rows="5" cols="30" />

4
src/webapp/WEB-INF/classes/config/origen/shipping/newMaintainWaveDocPage.xml → src/webapp/WEB-INF/classes/config/origen/shipping/maintainNewWaveDocPage.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<pages> <pages>
<maintainPage id="newMaintainWaveDocPage" title="波次管理" autoQuery="false"> <maintainPage id="maintainNewWaveDocPage" title="波次管理" autoQuery="false">
<search> <search>
<inputUIs> <inputUIs>
<text id="waveDoc.code" title="waveDoc.code" row="1" col="1" <text id="waveDoc.code" title="waveDoc.code" row="1" col="1"
@ -74,7 +74,7 @@
<column id="waveDoc.updateTime2" title="完成时间" visible="true" horizonAlign="center" verticalAlign="middle" format="dateTiemFormatter"/> <column id="waveDoc.updateTime2" title="完成时间" visible="true" horizonAlign="center" verticalAlign="middle" format="dateTiemFormatter"/>
</columns> </columns>
<buttons> <buttons>
<popup id="bkcb" title="创建波次" enableType="none" invisible="false" containId="false" pageId="newEditbkcbPage" /> <popup id="bkcb" title="创建波次" enableType="none" invisible="false" containId="false" pageId="editNewbkcbPage" />
<popup id="issuedAgvTask" title="下发工作站任务" enableType="single" invisible="false" <popup id="issuedAgvTask" title="下发工作站任务" enableType="single" invisible="false"
containId="true" pageId="modifyIssuedAgvTaskPage1" /> containId="true" pageId="modifyIssuedAgvTaskPage1" />
<commit id="allocate21" title="下发AGV" <commit id="allocate21" title="下发AGV"