生产总订单修改

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

@@ -135,6 +135,7 @@ public class GenOtheroutinAction extends AbstractAction{
 				outvo.setUnitid(issuevo.getUnitid());
 				outvo.setTs(PubEnv.getServerTime());
 				outvo.setBdef1(issuevo.getPk_order_issue());
+				outvo.setBdef6(issuevo.getBdef6());//换算率
 				outvo.setBdef11(issuevo.getBdef11());//楼号楼层
 				outvo.setBdef12(issuevo.getBdef12());//樘数（数量）
 				outvo.setBdef13(issuevo.getBdef13());//框统计
@@ -183,6 +184,7 @@ public class GenOtheroutinAction extends AbstractAction{
 				invo.setUnitid(issuevo.getUnitid());
 				invo.setTs(PubEnv.getServerTime());
 				invo.setBdef1(issuevo.getPk_order_issue());
+				invo.setBdef6(issuevo.getBdef6());//换算率
 				invo.setBdef11(issuevo.getBdef11());//楼号楼层
 				invo.setBdef12(issuevo.getBdef12());//樘数（数量）
 				invo.setBdef13(issuevo.getBdef13());//框统计

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

@@ -3,10 +3,15 @@ package u8c.ui.mmpac.action;
 import java.util.ArrayList;
 import java.util.List;
 
+import nc.bs.framework.common.NCLocator;
+import nc.itf.uap.IUAPQueryBS;
+import nc.jdbc.framework.processor.BeanListProcessor;
 import nc.ui.hr.frame.FrameUI;
 import nc.ui.hr.frame.action.AbstractAction;
 import nc.ui.hr.frame.impl.MainBillMgrPanel;
+import nc.vo.arap.util.StringUtils;
 import nc.vo.hr.tools.pub.HRAggVO;
+import nc.vo.pub.BusinessException;
 import nc.vo.pub.CircularlyAccessibleValueObject;
 import nc.vo.pub.ValidationException;
 import nc.vo.pub.lang.UFDouble;
@@ -46,11 +51,25 @@ public class PushProductAction extends AbstractAction{
 			
 			List<OrderInVO> listOrderInVO = new ArrayList<OrderInVO>();
 			CircularlyAccessibleValueObject[] vos = s.getAllChildrenVO();
-			for (int i = 0; i < vos.length; i++) {
-				if(vos[i] instanceof OrderInVO) {
+			
+			
+			//查询最新的数据
+			String pk_order=headvo.getPk_order();//主表主键
+			IUAPQueryBS iuap=NCLocator.getInstance().lookup(IUAPQueryBS.class);
+			String sql="select * from mmpac_order_in where pk_order='"+pk_order+"' and isnull(dr,0)=0  ";
+			
+			List<OrderInVO> orderinos=null;
+			try {
+				orderinos=(List<OrderInVO>) iuap.executeQuery(sql, new BeanListProcessor(OrderInVO.class));
+			} catch (BusinessException e) {
+				e.printStackTrace();
+			}
+			
+			
+			if(null!=orderinos && orderinos.size()>0) {
+				for(OrderInVO invo:orderinos) {
 					//本次执行数量不填就默认
 					//执行完的表体在生单界面不展示
-					OrderInVO invo = (OrderInVO) vos[i];
 					UFDouble num = invo.getNum() == null ? new UFDouble(0) : invo.getNum();
 					UFDouble execnum = invo.getExecnum() == null ? new UFDouble(0) : invo.getExecnum();
 					if(num.sub(execnum).compareTo(UFDouble.ZERO_DBL)==0) {
@@ -58,8 +77,27 @@ public class PushProductAction extends AbstractAction{
 					}
 					invo.setBdef5(num.sub(execnum).toString());
 					listOrderInVO.add(invo);
+					
+				}
+			}else {
+				
+				for (int i = 0; i < vos.length; i++) {
+					if(vos[i] instanceof OrderInVO) {
+						//本次执行数量不填就默认
+						//执行完的表体在生单界面不展示
+						OrderInVO invo = (OrderInVO) vos[i];
+						UFDouble num = invo.getNum() == null ? new UFDouble(0) : invo.getNum();
+						UFDouble execnum = invo.getExecnum() == null ? new UFDouble(0) : invo.getExecnum();
+						if(num.sub(execnum).compareTo(UFDouble.ZERO_DBL)==0) {
+							continue;
+						}
+						invo.setBdef5(num.sub(execnum).toString());
+						listOrderInVO.add(invo);
+					}
 				}
+				
 			}
+	
 			//弹框勾选数据
 			TOProductOutDialog gxdlg = new TOProductOutDialog(listOrderInVO.toArray(new OrderInVO[listOrderInVO.size()]),headvo);
 			gxdlg.show();

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

@@ -514,6 +514,7 @@ public class TOProductOutDialog extends UIDialog implements ActionListener,BillE
 				}
 				aggvo.setChildrenVO(listGeneralBillItemVO.toArray(new GeneralBillItemVO[listGeneralBillItemVO.size()]));		
 				iorder.insertProduct(new GeneralBillVO[]{aggvo},updatemap);
+				MessageDialog.showHintDlg(mainpanel, "成功", "产成品入库新增成功!");
 				this.closeCancel();
 			}
 			//取消按钮

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

@@ -24,19 +24,16 @@ import nc.hr.utils.PubEnv;
 import nc.itf.uap.IUAPQueryBS;
 import nc.jdbc.framework.processor.BeanListProcessor;
 import nc.jdbc.framework.processor.ColumnProcessor;
-import nc.ui.pub.ButtonObject;
 import nc.ui.pub.ClientEnvironment;
 import nc.ui.pub.beans.MessageDialog;
 import nc.ui.pub.beans.UIButton;
-import nc.ui.pub.beans.UIDesktopPane;
 import nc.ui.pub.beans.UIDialog;
 import nc.ui.pub.beans.UISplitPane;
 import nc.ui.pub.bill.BillCardPanel;
-import nc.ui.pub.bill.BillData;
 import nc.ui.pub.bill.BillEditEvent;
 import nc.ui.pub.bill.BillEditListener;
-import nc.ui.pub.bill.BillItem;
 import nc.ui.querytemplate.QueryConditionDLG;
+import nc.vo.arap.util.StringUtils;
 import nc.vo.bd.invdoc.InvbasdocVO;
 import nc.vo.bd.invdoc.InvmandocVO;
 import nc.vo.hr.tools.pub.HRAggVO;
@@ -80,7 +77,6 @@ public class ToMaterialOutDialog extends UIDialog implements ActionListener,Bill
 	private HRAggVO aggvo;
 	IMaterialOutMaintainAPI imaterapi=(IMaterialOutMaintainAPI) NCLocator.getInstance().lookup(IMaterialOutMaintainAPI.class.getName());
 	IOrderTotalInfo iorder = NCLocator.getInstance().lookup(IOrderTotalInfo.class);
-	
 	public ToMaterialOutDialog(HRAggVO aggvo) {
 		super();
 		initialize(aggvo);
@@ -106,7 +102,6 @@ public class ToMaterialOutDialog extends UIDialog implements ActionListener,Bill
 		this.issueArrays = getIssueVOs(aggvo);
 		getJlcardPanel().getBillModel().setBodyDataVO(issueArrays);
 		
-		
 	}
 	
 
@@ -154,7 +149,14 @@ public class ToMaterialOutDialog extends UIDialog implements ActionListener,Bill
 				if(num.sub(execnum).compareTo(UFDouble.ZERO_DBL)==0){
 					continue;
 				}
-				issuevo.setBdef5(num.sub(execnum).setScale(2, UFDouble.ROUND_HALF_UP).toString());
+				issuevo.setBdef5(num.sub(execnum).setScale(2, UFDouble.ROUND_HALF_UP).toString());//本次执行数量
+				//查询入库颜色，显示入库颜色，生成材料出库以入库颜色为准
+				String rkcolur=issuevo.getBdef4();
+				if(!StringUtils.isEmpty(rkcolur)) {
+					issuevo.setColor(rkcolur);
+				}
+				
+				
 				issuevos.add(issuevo);
 			}
 			
@@ -557,7 +559,8 @@ public class ToMaterialOutDialog extends UIDialog implements ActionListener,Bill
 				GeneralBillVO[] res = imaterapi.insertMaterialOuts(aggvos);
 				GeneralBillVO resvo = res[0];
 				Boolean updateres = iorder.UpdateIssueExecNum(updatemap);
-			//	MessageDialog.showHintDlg(mainpanel, "成功", "材料出库单"+resvo.getVBillCode()+"新增成功");
+//				MessageDialog.showHintDlg(mainpanel, "成功", "材料出库单"+resvo.getVBillCode()+"新增成功!");
+				MessageDialog.showHintDlg(mainpanel, "成功", "材料出库单新增成功!");
 				this.closeCancel();
 			}  catch (Exception e1) {
 				MessageDialog.showErrorDlg(mainpanel, "错误", e1.getMessage());

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

@@ -438,7 +438,7 @@ public class ToSaleOutDialog extends UIDialog implements ActionListener,BillEdit
 				icheadvo.setVnote("来源生产总订单");//备注
 				icheadvo.setCbilltypecode("4C");
 				icheadvo.setBassetcard(UFBoolean.FALSE);
-				icheadvo.setCbiztypeid("1001F810000000000015");//业务流程
+		//		icheadvo.setCbiztypeid("1001V51000000000002V");//业务流程
 		//		String def1 = GetBaseDAOUtil.getJobbasfilDef1("prjcode");
 				String def1 = GetBaseDAOUtil.getJobbasmngDef1(prjcode);
 				icheadvo.setCcustomerid(getpkcumdoc(def1));//客商管理档案