Quellcode durchsuchen

【工单批量审核】

wuyx vor 6 Jahren
Ursprung
Commit
ed535dc21d

+ 2 - 1
WebContent/resource/i18n/messages_zh_CN.js

@@ -687,7 +687,8 @@ var $I18N = {
                 erpExportScanLoginButton:'导出人员二维码信息',
                 erpBomDetailPanelImpButton:'BOM板面位号匹配',
                 erpGetMPBarcodeButton:'获取料卷号',
-                erpVastCheckAOIButton: '批量核对'
+                erpVastCheckAOIButton: '批量核对',
+                erpVastMakeAuditButton: '批量审核'
 			},
 			status: {
 				

+ 12 - 0
src/com/uas/mes/pm/controller/MakeBaseController.java

@@ -671,4 +671,16 @@ public class MakeBaseController extends BaseController {
 		modelMap.put("success", true);
 		return modelMap;
 	}
+
+	/**
+	 * 制造单批量审核
+	 */
+	@RequestMapping("/pm/make/vastMakeAudie.action")
+	@ResponseBody
+	public Map<String, Object> vastMakeAudie(String caller, String data) {
+		Map<String, Object> modelMap = new HashMap<String, Object>();
+		makeBaseService.vastMakeAudie(data, caller);
+		modelMap.put("success", true);
+		return modelMap;
+	}
 }

+ 2 - 0
src/com/uas/mes/pm/service/MakeBaseService.java

@@ -115,4 +115,6 @@ public interface MakeBaseService {
 	void vastResMakeStop(String data, String caller);
 	
 	void cleanMaterial(int id);
+
+    void vastMakeAudie(String data, String caller);
 }

+ 25 - 0
src/com/uas/mes/pm/service/impl/MakeBaseServiceImpl.java

@@ -1839,5 +1839,30 @@ public class MakeBaseServiceImpl implements MakeBaseService {
 		// 执行删除后的其它逻辑
 		handlerService.afterDel("Make!Base", id);
 	}
+
+	@Override
+	public void vastMakeAudie(String data, String caller) {
+		List<Map<Object, Object>> list = BaseUtil.parseGridStoreToMaps(data);
+		int id = 0;
+		Object maCode = "";
+		StringBuffer str = new StringBuffer();
+		for (Map<Object, Object> m : list) {
+			id = Integer.parseInt(m.get("ma_id").toString());
+			maCode = m.get("ma_code");
+			try{
+				submitMakeBase(id, "Make!Base");
+				auditMakeBase(id, "Make!Base");
+			}catch(Exception e){
+				if(e.getMessage().contains("工单")){
+					str.append("工单:"+maCode+","+e.getMessage().split(",")[0]).append("</br>");
+				}else {
+					BaseUtil.showError(e.getMessage());
+				}
+			}
+		}
+		if(str.length()>0){
+			BaseUtil.showError(str.toString());
+		}
+	}
 }