工序报告初始化

ypff/ypff/src/private/nc/bs/yp/impl/OprepAddImpl.java

@@ -21,6 +21,7 @@ import nc.itf.mmsfc.operationrep.IOprepMaintain;
 import nc.jdbc.framework.processor.ColumnProcessor;
 import nc.log.NcLog;
 import nc.md.persist.framework.IMDPersistenceQueryService;
+import nc.mm.mmsfc.task.BatchTaskVO;
 import nc.vo.mmpac.pmo.pac0002.entity.PMOAggVO;
 import nc.vo.mmsfc.operationrep.entity.AggOprepVO;
 import nc.vo.mmsfc.operationrep.entity.OprepItemVO;
@@ -30,6 +31,7 @@ import nc.vo.pub.VOStatus;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 
+
 /**
  * 工序完工报告
  * @author LP
@@ -43,6 +45,7 @@ public class OprepAddImpl extends BaseServlet implements IHttpServletAdaptor {
 	private IMDPersistenceQueryService qryService = NCLocator.getInstance().lookup(IMDPersistenceQueryService.class);
 	private BaseDAO dao = new BaseDAO();
 	private JSONObject p_data = null;
+	private String vbillcodeOprep = "";
 
 	@Override
 	public void doAction(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
@@ -74,14 +77,14 @@ public class OprepAddImpl extends BaseServlet implements IHttpServletAdaptor {
 			
 			addAggOprepVO(aggOprepVO);
 			
-			out.print(formatRSJsonData(TURE, p_data.getString("vbillcode"), "成功"));
-			logObject.accumulate("OutData", formatRSJsonData(TURE, p_data.getString("vbillcode"), "成功").toString());
+			out.print(formatRSJsonData(TURE, vbillcodeOprep, "成功"));
+			logObject.accumulate("OutData", formatRSJsonData(TURE, vbillcodeOprep, "成功").toString());
 			
 		} catch (Exception e) {
 			
 			String error = e.getMessage()==null?e.toString():e.getMessage().toString();
-			out.print(formatRSJsonData(FALSE, vbillcode, error));
-			logObject.accumulate("OutData",formatRSJsonData(FALSE, vbillcode, error).toString());
+			out.print(formatRSJsonData(FALSE, vbillcodeOprep, error));
+			logObject.accumulate("OutData",formatRSJsonData(FALSE, vbillcodeOprep, error).toString());
 			errorMessgae = StackTrace(e);
 			
 		}finally {
@@ -134,7 +137,9 @@ public class OprepAddImpl extends BaseServlet implements IHttpServletAdaptor {
 		
 		//--------------------------保存OperepVO----------------------------
 		
-		NCLocator.getInstance().lookup(IOprepMaintain.class).insertOprep(new AggOprepVO[] {newAggOprepVO});
+		BatchTaskVO<AggOprepVO> insertOprep = NCLocator.getInstance().lookup(IOprepMaintain.class).insertOprep(new AggOprepVO[] {newAggOprepVO});
+		
+		vbillcodeOprep = insertOprep.getBills()[0].getParentVO().getVbillcode();
 		
 	}
 	
@@ -156,6 +161,7 @@ public class OprepAddImpl extends BaseServlet implements IHttpServletAdaptor {
 	private void checkJson() throws Exception {
 		
 		StringBuffer mags = new StringBuffer();
+		Boolean empty = true;
 		
 		String vbillcode = "vbillcode";//生产订单单号
 		String group = "group";//集团编码
@@ -168,11 +174,13 @@ public class OprepAddImpl extends BaseServlet implements IHttpServletAdaptor {
 		for (String as : HeadKey) {
 
 			if (p_data.getString(as).isEmpty()) {
+				empty = false;
 				mags.append("'" + as + "'");
 			}
 		}
 		
 		if (p_data.getJSONArray(body)==null) {
+			empty = false;
 			mags.append(" 'body'表体不存在！ ");
 		}
 		
@@ -196,13 +204,14 @@ public class OprepAddImpl extends BaseServlet implements IHttpServletAdaptor {
 			for (String as : BodyKey) {
 
 				if (oprepJsonObjectB.getString(as).isEmpty()) {
+					empty = false;
 					mags.append("'" + as + "' ");
 				}
 			}
 			mags.append("}");
 		}
 		
-		if (mags.length()!=0) {
+		if (!empty) {
 			throw new Exception("以下字段不可为空："+mags);
 		}
 	}

ypff/ypff/src/private/nc/bs/yp/impl/PomUpdateStatusImpl.java

@@ -124,6 +124,10 @@ public class PomUpdateStatusImpl extends BaseServlet implements IHttpServletAdap
 		
 		if (PmoAggVOs == null || PmoAggVOs.size() == 0) {
 			throw new Exception("根据单据号'"+vbillcode+"'未找到生产订单，请检查！");
+		}else if (PmoAggVOs.get(0).getParentVO().getFbillstatus()==0 && p_data.getString("statusName").equals("取消审批")) {
+			throw new Exception("生产订单'"+vbillcode+"'已是未审批状态，请检查！");
+		}else if (PmoAggVOs.get(0).getParentVO().getFbillstatus()==1 && p_data.getString("statusName").equals("审批")) {
+			throw new Exception("生产订单'"+vbillcode+"'已是审批状态，请检查！");
 		}else {
 			PMOAggVO pmoAggVO = (PMOAggVO) PmoAggVOs.get(0).clone();
 			return pmoAggVO;
@@ -138,9 +142,9 @@ public class PomUpdateStatusImpl extends BaseServlet implements IHttpServletAdap
 		
 		ArrayList<AggPickmVO> PickmAggVOs = (ArrayList<AggPickmVO>) 
 				qryService.queryBillOfVOByCond(AggPickmVO.class,"vfirstmocode = '"+vfirstmocode+"'",true,false);
-		
+
 		AggPickmVO aggPickmVO = (AggPickmVO) PickmAggVOs.get(0).clone();
-			return aggPickmVO;
+		return aggPickmVO;
 	}
 	
 	/*