下标BUG修改

mm/mm/src/client/u8c/ui/mm/action/OperationApproveAction.java

@@ -39,7 +39,12 @@ public class OperationApproveAction extends AbstractAction{
 			headvo.setChecker(PubEnv.getPk_user());
 	//	}
 		((OperationDataModel)this.frameUI.getDataModel()).execApprove(s[0]);
-		getFrameUI().getBtnManager().getCmdByID(AbstractBtnReg.SYSBTN_REFRESH).execute();
+		boolean boo = this.frameUI.getBillCardPanel().isShowing();
+		if(boo) {
+			this.frameUI.getBillCardPanel().setBillValueVO(s[0]);
+		}else {
+			getFrameUI().getBtnManager().getCmdByID(AbstractBtnReg.SYSBTN_REFRESH).execute();
+		}
 		
 	}
 }

mm/mm/src/client/u8c/ui/mm/action/OperationDeleteAction.java

@@ -17,15 +17,25 @@ public class OperationDeleteAction extends DeleteAction {
 
 	public void execute() throws Exception {
 		MainBillMgrPanel mainMgrPanel = (MainBillMgrPanel) getMainPanel();
-		int selectedRow = ((OperationMainPanel) getMainPanel()).getSelectedRow();
-	//	HRAggVO [] s = (HRAggVO[]) mainMgrPanel.getMainBillListPanel().getData();
-		HRAggVO [] s = new HRAggVO[] {this.getSelection(mainMgrPanel)};
-	//	if (null != s && s[selectedRow] != null){
-		OperationMainVO headvo = (OperationMainVO) s[0].getParentVO();
-			if (headvo.getBillstatus()!=IBillStatus.FREE){
-				throw new ValidationException("非自由态单据不允许删除");
-		    }
-	//	}
+//		int selectedRow = ((OperationMainPanel) getMainPanel()).getSelectedRow();
+//		HRAggVO [] s = (HRAggVO[]) mainMgrPanel.getMainBillListPanel().getData();
+//		HRAggVO [] s = new HRAggVO[] {this.getSelection(mainMgrPanel)};
+//		if (null != s && s[selectedRow] != null){
+//		OperationMainVO headvo = (OperationMainVO) s[0].getParentVO();
+//			if (headvo.getBillstatus()!=IBillStatus.FREE){
+//				throw new ValidationException("非自由态单据不允许删除");
+//		    }
+//		}
+			
+		HRAggVO [] s = (HRAggVO[]) mainMgrPanel.getMainBillListPanel().getDeleteData();
+		if(s != null) {
+			for (int i = 0; i < s.length; i++) {
+				OperationMainVO headvo = (OperationMainVO) s[i].getParentVO();
+				if (headvo.getBillstatus()!=IBillStatus.FREE){
+					throw new ValidationException("非自由态单据不允许删除");
+			    }
+			}
+		}	
 		super.execute();
 	}
 }

mm/mm/src/client/u8c/ui/mm/action/OperationReturnFromCardToListAction.java

@@ -0,0 +1,18 @@
+package u8c.ui.mm.action;
+import nc.ui.hr.frame.FrameUI;
+import nc.ui.hr.frame.action.AddAction;
+import nc.ui.hr.frame.button.AbstractBtnReg;
+
+public class OperationReturnFromCardToListAction  extends AddAction{
+
+	public OperationReturnFromCardToListAction(FrameUI frameUI) {
+		super(frameUI);
+		// TODO Auto-generated constructor stub
+	}
+	
+	public void execute() throws Exception{
+		super.execute();
+		getFrameUI().getBtnManager().getCmdByID(AbstractBtnReg.SYSBTN_REFRESH).execute();
+	}
+
+}

mm/mm/src/client/u8c/ui/mm/action/OperationUnApproveAction.java

@@ -39,6 +39,11 @@ public class OperationUnApproveAction extends AbstractAction {
 			headvo.setChecker("");
 //		}
 		((OperationDataModel)this.frameUI.getDataModel()).execApprove(s[0]);
-		getFrameUI().getBtnManager().getCmdByID(AbstractBtnReg.SYSBTN_REFRESH).execute();
+		boolean boo = this.frameUI.getBillCardPanel().isShowing();
+		if(boo) {
+			this.frameUI.getBillCardPanel().setBillValueVO(s[0]);
+		}else {
+			getFrameUI().getBtnManager().getCmdByID(AbstractBtnReg.SYSBTN_REFRESH).execute();
+		}
 	}
 }

mm/mm/src/client/u8c/ui/mm/action/YsAction.java

@@ -46,7 +46,6 @@ import nc.vo.pub.lang.UFDate;
 import nc.vo.pub.lang.UFDouble;
 import nc.vo.pubapp.pattern.pub.SqlBuilder;
 import u8c.ui.mm.panel.OperationTestUI;
-import u8c.vo.ExAggOrderMainVO;
 
 /**
  * MRP运算清单-运算按钮

mm/mm/src/client/u8c/ui/mm/panel/OperationTestUI.java

@@ -19,6 +19,7 @@ import u8c.ui.mm.action.OperationDeleteAction;
 import u8c.ui.mm.action.OperationEditAction;
 import u8c.ui.mm.action.OperationExportAction;
 import u8c.ui.mm.action.OperationQueryAction;
+import u8c.ui.mm.action.OperationReturnFromCardToListAction;
 import u8c.ui.mm.action.OperationSaveAction;
 import u8c.ui.mm.action.OperationUnApproveAction;
 import u8c.ui.mm.action.YsAction;
@@ -61,7 +62,7 @@ public class OperationTestUI extends FrameUI{
 		getBtnManager().regCmd(AbstractBtnReg.SYSBTN_ADD_LINE, new AddLineAction(this));
 		getBtnManager().regCmd(AbstractBtnReg.SYSBTN_EDIT_LINE, new EditLineAction(this));		
 		getBtnManager().regCmd(AbstractBtnReg.SYSBTN_DEL_LINE, new DeleteLineAction(this));
-		getBtnManager().regCmd(AbstractBtnReg.SYSBTN_RETURN, new ReturnFromCardToListAction(this));
+		getBtnManager().regCmd(AbstractBtnReg.SYSBTN_RETURN, new OperationReturnFromCardToListAction(this));
 		getBtnManager().regCmd(AbstractBtnReg.SYSBTN_EXAMINE, new OperationApproveAction(this));
 		getBtnManager().regCmd(AbstractBtnReg.SYSBTN_CANCELEXAMINE, new OperationUnApproveAction(this));
 		getBtnManager().regCmd(AbstractBtnReg.SYSBTN_EXPORT, new OperationExportAction(this));

mmpac/mmpac/src/client/u8c/ui/mmpac/action/OrderApproveAction.java

@@ -43,6 +43,11 @@ public class OrderApproveAction extends AbstractAction{
 		//}
 		//((OrderDataModel)this.frameUI.getDataModel()).execApprove(s[selectedRow]);
 		((OrderDataModel)this.frameUI.getDataModel()).execApprove(s[0]);
-		getFrameUI().getBtnManager().getCmdByID(AbstractBtnReg.SYSBTN_REFRESH).execute();
+		boolean boo = this.frameUI.getBillCardPanel().isShowing();
+		if(boo) {
+			this.frameUI.getBillCardPanel().setBillValueVO(s[0]);
+		}else {
+			getFrameUI().getBtnManager().getCmdByID(AbstractBtnReg.SYSBTN_REFRESH).execute();
+		}
 	}
 }

mmpac/mmpac/src/client/u8c/ui/mmpac/action/OrderReturnFromCardToListAction.java

@@ -0,0 +1,18 @@
+package u8c.ui.mmpac.action;
+import nc.ui.hr.frame.FrameUI;
+import nc.ui.hr.frame.action.AddAction;
+import nc.ui.hr.frame.button.AbstractBtnReg;
+
+public class OrderReturnFromCardToListAction  extends AddAction{
+
+	public OrderReturnFromCardToListAction(FrameUI frameUI) {
+		super(frameUI);
+		// TODO Auto-generated constructor stub
+	}
+	
+	public void execute() throws Exception{
+		super.execute();
+		getFrameUI().getBtnManager().getCmdByID(AbstractBtnReg.SYSBTN_REFRESH).execute();
+	}
+
+}

mmpac/mmpac/src/client/u8c/ui/mmpac/action/OrderSaveAction.java

@@ -58,7 +58,5 @@ public class OrderSaveAction extends SaveAction{
 		
 		super.execute();
 		frameUI.getDataModel().setCurrentState(StateRegister.STATE_NOTEDIT); 
-		
-		getFrameUI().getBtnManager().getCmdByID(AbstractBtnReg.SYSBTN_REFRESH).execute();
 	}
 }

mmpac/mmpac/src/client/u8c/ui/mmpac/action/OrderUnApproveAction.java

@@ -41,6 +41,13 @@ public class OrderUnApproveAction extends AbstractAction {
 		}
 		//((OrderDataModel)this.frameUI.getDataModel()).execApprove(s[selectedRow]);
 		((OrderDataModel)this.frameUI.getDataModel()).execApprove(s[0]);
-		getFrameUI().getBtnManager().getCmdByID(AbstractBtnReg.SYSBTN_REFRESH).execute();
+		boolean boo = this.frameUI.getBillCardPanel().isShowing();
+		if(boo) {
+			this.frameUI.getBillCardPanel().setBillValueVO(s[0]);
+		}else {
+			getFrameUI().getBtnManager().getCmdByID(AbstractBtnReg.SYSBTN_REFRESH).execute();
+		}
+		
+		
 	}
 }

mmpac/mmpac/src/client/u8c/ui/mmpac/panel/OrderTestUI.java

@@ -8,7 +8,6 @@ import nc.ui.hr.frame.action.CancelAction;
 import nc.ui.hr.frame.action.DeleteLineAction;
 import nc.ui.hr.frame.action.EditLineAction;
 import nc.ui.hr.frame.action.RefreshAction;
-import nc.ui.hr.frame.action.ReturnFromCardToListAction;
 import nc.ui.hr.frame.bill.manage.ManageDataModel;
 import nc.ui.hr.frame.button.AbstractBtnReg;
 import nc.ui.hr.frame.button.BtnStateReg;
@@ -21,6 +20,7 @@ import u8c.ui.mmpac.action.OrderEditAction;
 import u8c.ui.mmpac.action.OrderExportAction;
 import u8c.ui.mmpac.action.OrderImportAction;
 import u8c.ui.mmpac.action.OrderQueryAction;
+import u8c.ui.mmpac.action.OrderReturnFromCardToListAction;
 import u8c.ui.mmpac.action.OrderSaveAction;
 import u8c.ui.mmpac.action.OrderUnApproveAction;
 import u8c.ui.mmpac.action.PushMaterialAction;
@@ -82,7 +82,7 @@ public class OrderTestUI extends FrameUI{
 		getBtnManager().regCmd(AbstractBtnReg.SYSBTN_ADD_LINE, new AddLineAction(this));
 		getBtnManager().regCmd(AbstractBtnReg.SYSBTN_EDIT_LINE, new EditLineAction(this));		
 		getBtnManager().regCmd(AbstractBtnReg.SYSBTN_DEL_LINE, new DeleteLineAction(this));
-		getBtnManager().regCmd(AbstractBtnReg.SYSBTN_RETURN, new ReturnFromCardToListAction(this));
+		getBtnManager().regCmd(AbstractBtnReg.SYSBTN_RETURN, new OrderReturnFromCardToListAction(this));
 		getBtnManager().regCmd(AbstractBtnReg.SYSBTN_EXAMINE, new OrderApproveAction(this));
 		getBtnManager().regCmd(AbstractBtnReg.SYSBTN_CANCELEXAMINE, new OrderUnApproveAction(this));
 		getBtnManager().regCmd(AbstractBtnReg.USERBTN_GENOUTIN, new GenOtheroutinAction(this));

xc/cg/src/client/u8c/ui/mytest/action/DemandApproveAction.java

@@ -40,7 +40,12 @@ public class DemandApproveAction extends AbstractAction{
 			headvo.setApprove(PubEnv.getPk_user());
 		//}
 		((DemandDataModel)this.frameUI.getDataModel()).execApprove(s[0]);
-		getFrameUI().getBtnManager().getCmdByID(AbstractBtnReg.SYSBTN_REFRESH).execute();
+		boolean boo = this.frameUI.getBillCardPanel().isShowing();
+		if(boo) {
+			this.frameUI.getBillCardPanel().setBillValueVO(s[0]);
+		}else {
+			getFrameUI().getBtnManager().getCmdByID(AbstractBtnReg.SYSBTN_REFRESH).execute();
+		}
 		
 	}
 

xc/cg/src/client/u8c/ui/mytest/action/DemandCloseAction.java

@@ -38,7 +38,12 @@ public class DemandCloseAction extends AbstractAction{
 			ivo.updateVO(headvo);
 		}
 		
-		getFrameUI().getBtnManager().getCmdByID(AbstractBtnReg.SYSBTN_REFRESH).execute();
+		boolean boo = this.frameUI.getBillCardPanel().isShowing();
+		if(boo) {
+			this.frameUI.getBillCardPanel().setBillValueVO(s[0]);
+		}else {
+			getFrameUI().getBtnManager().getCmdByID(AbstractBtnReg.SYSBTN_REFRESH).execute();
+		}
 	}
 
 }

xc/cg/src/client/u8c/ui/mytest/action/DemandReturnFromCardToListAction.java

@@ -0,0 +1,18 @@
+package u8c.ui.mytest.action;
+import nc.ui.hr.frame.FrameUI;
+import nc.ui.hr.frame.action.AddAction;
+import nc.ui.hr.frame.button.AbstractBtnReg;
+
+public class DemandReturnFromCardToListAction  extends AddAction{
+
+	public DemandReturnFromCardToListAction(FrameUI frameUI) {
+		super(frameUI);
+		// TODO Auto-generated constructor stub
+	}
+	
+	public void execute() throws Exception{
+		super.execute();
+		getFrameUI().getBtnManager().getCmdByID(AbstractBtnReg.SYSBTN_REFRESH).execute();
+	}
+
+}

xc/cg/src/client/u8c/ui/mytest/action/DemandUnApproveAction.java

@@ -39,7 +39,12 @@ public class DemandUnApproveAction extends AbstractAction{
 			headvo.setApprove("");
 		//}
 		((DemandDataModel)this.frameUI.getDataModel()).execApprove(s[0]);
-		getFrameUI().getBtnManager().getCmdByID(AbstractBtnReg.SYSBTN_REFRESH).execute();
+		boolean boo = this.frameUI.getBillCardPanel().isShowing();
+		if(boo) {
+			this.frameUI.getBillCardPanel().setBillValueVO(s[0]);
+		}else {
+			getFrameUI().getBtnManager().getCmdByID(AbstractBtnReg.SYSBTN_REFRESH).execute();
+		}
 	}
 
 }

xc/cg/src/client/u8c/ui/mytest/panel/DemandTestUI.java

@@ -22,6 +22,7 @@ import u8c.ui.mytest.action.DemandEditAction;
 import u8c.ui.mytest.action.DemandExportAction;
 import u8c.ui.mytest.action.DemandImportAction;
 import u8c.ui.mytest.action.DemandQueryAction;
+import u8c.ui.mytest.action.DemandReturnFromCardToListAction;
 import u8c.ui.mytest.action.DemandSaveAction;
 import u8c.ui.mytest.action.DemandUnApproveAction;
 import u8c.ui.mytest.button.DemandBtnStateReg;
@@ -35,7 +36,7 @@ public class DemandTestUI extends FrameUI{
 
 	@Override
 	protected void initButtons() {
-		// ��ʼ����ť
+		// 锟斤拷始锟斤拷锟斤拷钮
 		getBtnManager().addButtonByID(AbstractBtnReg.SYSBTN_ADD);
 		getBtnManager().addButtonByID(AbstractBtnReg.SYSBTN_EDIT);
 		getBtnManager().addButtonByID(AbstractBtnReg.SYSBTN_DELETE);
@@ -52,12 +53,12 @@ public class DemandTestUI extends FrameUI{
 //		getBtnManager().addButtonByID(AbstractBtnReg.SYSBTN_EXPORT);
 //		getBtnManager().addButtonByID(AbstractBtnReg.SYSBTN_IMPORT);
 //		getBtnManager().addButtonByID(AbstractBtnReg.USERBTN_ADDPRAYBILL);
-		getBtnManager().addButtonByID(AbstractBtnReg.USERBTN_boExportImport); //����/����
+		getBtnManager().addButtonByID(AbstractBtnReg.USERBTN_boExportImport); //锟斤拷锟斤拷/锟斤拷锟斤拷
 		getBtnManager().addChildButtonsByIDs(AbstractBtnReg.USERBTN_boExportImport , 
 				new int []{AbstractBtnReg.SYSBTN_EXPORT,AbstractBtnReg.SYSBTN_IMPORT});
 		getBtnManager().addButtonByID(AbstractBtnReg.USERBTN_ClOSE);
 
-		// ���ð�ť������
+		// 锟斤拷锟矫帮拷钮锟斤拷锟斤拷锟斤拷
 		getBtnManager().regCmd(AbstractBtnReg.SYSBTN_ADD, new DemandAddAction(this));
 		getBtnManager().regCmd(AbstractBtnReg.SYSBTN_EDIT, new DemandEditAction(this));
 		getBtnManager().regCmd(AbstractBtnReg.SYSBTN_DELETE, new DemandDeleteAction(this));
@@ -68,7 +69,7 @@ public class DemandTestUI extends FrameUI{
 		getBtnManager().regCmd(AbstractBtnReg.SYSBTN_ADD_LINE, new AddLineAction(this));
 		getBtnManager().regCmd(AbstractBtnReg.SYSBTN_EDIT_LINE, new EditLineAction(this));		
 		getBtnManager().regCmd(AbstractBtnReg.SYSBTN_DEL_LINE, new DeleteLineAction(this));
-		getBtnManager().regCmd(AbstractBtnReg.SYSBTN_RETURN, new ReturnFromCardToListAction(this));
+		getBtnManager().regCmd(AbstractBtnReg.SYSBTN_RETURN, new DemandReturnFromCardToListAction(this));
 		getBtnManager().regCmd(AbstractBtnReg.SYSBTN_EXAMINE, new DemandApproveAction(this));
 		getBtnManager().regCmd(AbstractBtnReg.SYSBTN_CANCELEXAMINE, new DemandUnApproveAction(this));
 		getBtnManager().regCmd(AbstractBtnReg.SYSBTN_EXPORT, new DemandExportAction(this));
@@ -78,7 +79,7 @@ public class DemandTestUI extends FrameUI{
 
 		
 
-		// ��ť����
+		// 锟斤拷钮锟斤拷锟斤拷
 		getBtnManager().adjustButtonOrder(new int[] {
 				AbstractBtnReg.SYSBTN_ADD,
 				AbstractBtnReg.SYSBTN_EDIT,
@@ -102,44 +103,44 @@ public class DemandTestUI extends FrameUI{
 	}
 	
 	@Override
-	protected MainPanel createMainPanel() { // ������
+	protected MainPanel createMainPanel() { // 锟斤拷锟斤拷锟斤拷
 		ManageDataModel model = (ManageDataModel) getDataModel();
 		return new DemandMainPanel(this,  model.getBillTempletCode(), model.getBillTempletBusiType());
 	}
 
 	@Override
-	protected TopPanel createTopPanel() { //�������
+	protected TopPanel createTopPanel() { //锟斤拷锟斤拷锟斤拷锟�
 		return new DemandTopPanel(this);
 	}
 	
 	@Override
-	protected BtnStateReg createButtonStateRegister() { // ��ť״̬ע����
+	protected BtnStateReg createButtonStateRegister() { // 锟斤拷钮状态注锟斤拷锟斤拷
 		return  new DemandBtnStateReg(getDataModel().getState());
 	}
 	
 	@Override
-	protected DemandDataModel createDataModel() { // ������ģ����
+	protected DemandDataModel createDataModel() { // 锟斤拷锟斤拷锟斤拷模锟斤拷锟斤拷
 		return new DemandDataModel();
 	}
 
 	@Override
-	public boolean needLeftPanel() { // ����Ҫ��˵���
+	public boolean needLeftPanel() { // 锟斤拷锟斤拷要锟斤拷说锟斤拷锟�
 		return false;
 	}
 
 	@Override
-	public boolean needTopPanel() { //��Ҫ�������
+	public boolean needTopPanel() { //锟斤拷要锟斤拷锟斤拷锟斤拷锟�
 		return true;
 	}
 	
 	@Override
-	public String getQueryNodeKey() { // �ڡ����ܽڵ�Ĭ��ģ�����á��в�ѯģ��Ľڵ��ʶ
-		// (����������ò��ԣ������ѯ��ťʱ�ͻᱨ��ǰ�û�û�п��õIJ�ѯģ��)
+	public String getQueryNodeKey() { // 锟节★拷锟斤拷锟杰节碉拷默锟斤拷模锟斤拷锟斤拷锟矫★拷锟叫诧拷询模锟斤拷慕诘锟斤拷识
+		// (锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷貌锟斤拷裕锟斤拷锟斤拷锟斤拷询锟斤拷钮时锟酵会报锟斤拷前锟矫伙拷没锟叫匡拷锟矫的诧拷询模锟斤拷)
 		return "400303";
 	}
 	
 	@Override
-	public String getModuleCode() { // �ڵ����
+	public String getModuleCode() { // 锟节碉拷锟斤拷锟�
 		return "400303";
 	}