Merge branch 'master' of http://121.36.46.135:3000/mes-ljz/mescloud

src/main/java/com/jeesite/modules/mes/api/MesInboundControllerApi.java

@@ -32,15 +32,16 @@ public class MesInboundControllerApi {
     @ResponseBody
     public CommonResp save(@Validated MesInbound mesInbound, HttpServletRequest request, HttpServletResponse response) {
 
-        CommonResp<List<MesProductOrder>> resp = new CommonResp<>();
+        CommonResp<List<MesInbound>> resp = new CommonResp<>();
         //展示所有未结束的订单
         String sn = request.getParameter("sn");//工件码
         String productOrder = request.getParameter("productOrder");//生产订单编号
         String storageLocation = request.getParameter("storageLocation");//库位
-        String linenSn = request.getParameter("linenSn");//产线编号
+        String lineSn = request.getParameter("lineSn");//产线编号
         String remark = request.getParameter("remark");//备注
+        String oprno = request.getParameter("oprno");//工位号
 
-        if (sn.isEmpty()||productOrder.isEmpty()||storageLocation.isEmpty()||linenSn.isEmpty()){
+        if (sn.isEmpty()||productOrder.isEmpty()||storageLocation.isEmpty()||lineSn.isEmpty()||oprno.isEmpty()){
             resp.setResult(Global.FALSE);
             resp.setMessage("参数不能为空！");
             return resp;

src/main/java/com/jeesite/modules/mes/api/MesInspectionControllerApi.java

@@ -2,6 +2,7 @@ package com.jeesite.modules.mes.api;
 
 import com.jeesite.common.config.Global;
 import com.jeesite.modules.erp.entity.MesProductOrder;
+import com.jeesite.modules.mes.entity.MesInbound;
 import com.jeesite.modules.mes.entity.MesInspection;
 import com.jeesite.modules.mes.resp.CommonResp;
 import com.jeesite.modules.mes.service.MesInspectionService;
@@ -38,7 +39,7 @@ public class MesInspectionControllerApi {
         String lineSn = request.getParameter("lineSn");//所属产线产线编号
         String sn = request.getParameter("sn");//所属产线产线编号
         String inspectionSn = request.getParameter("inspectionSn");//所属产线产线编号
-        String oprno = request.getParameter("oprno ");
+        String oprno = request.getParameter("oprno");
         String inspectionContent = request.getParameter("inspectionContent");//检验内容
         String remark = request.getParameter("remark");//备注
         String type = request.getParameter("type");//（0首件、1过程、2末件、3复测）
@@ -83,4 +84,19 @@ public class MesInspectionControllerApi {
         resp.setMessage("操作成功！");
         return resp;
     }
+
+
+
+    //列表
+    @PostMapping(value = "mesInspectionList")
+    @ResponseBody
+    public CommonResp list(@Validated MesInspection mesInspection, HttpServletRequest request, HttpServletResponse response) {
+        CommonResp<List<MesInspection>> resp = new CommonResp<>();
+        List<MesInspection> list = mesInspectionService.findList(mesInspection);
+        resp.setResult(Global.TRUE);
+        resp.setData(list);
+        resp.setMessage("操作成功！");
+        return resp;
+    }
+
 }

src/main/java/com/jeesite/modules/mes/api/MesProductOrderControllerApi.java

@@ -33,7 +33,7 @@ public class MesProductOrderControllerApi {
         CommonResp<List<MesProductOrder> > resp = new CommonResp<>();
         String lineSn = request.getParameter("lineSn");
         //展示所有未结束的订单
-        mesProductOrder.setState("0");//0,表示未结束，1，表示结束,2，表示作废
+        mesProductOrder.setState("1");//0=草稿 1=下发 2=完成
         mesProductOrder.setLineSn(lineSn);
         List<MesProductOrder> list = mesProductOrderService.findList(mesProductOrder);
         resp.setData(list);

src/main/java/com/jeesite/modules/mes/web/MesInspectionController.java

@@ -166,7 +166,7 @@ public class MesInspectionController extends BaseController {
 	/**
 	 * 保存判定结果
 	 */
-	@RequiresPermissions("mes:mesInspection:edit")
+//	@RequiresPermissions("mes:mesInspection:edit")
 	@PostMapping(value = "judgeSave")
 	@ResponseBody
 	public String judgeSave(MesInspection mesInspection) {

src/main/java/com/jeesite/modules/mes/web/MesLineProcessController.java

@@ -613,4 +613,64 @@ public class MesLineProcessController extends BaseController {
 	}
 
 
+
+//根据产线名称获取全部产线信息
+	@RequestMapping(value = "processListAll")
+	@ResponseBody
+	public CommonResp processListAll(HttpServletRequest req) {
+		CommonResp<Map<String, Object>> resp = new CommonResp<>();
+		String lineSn = req.getParameter("lineSn");
+		MesLine mesLine = new MesLine();
+		mesLine.setSn(lineSn);
+		mesLine = mesLineService.findInfo(mesLine);
+//		User user = UserUtils.getUser();
+//		MesLineProcessUser mesLineProcessUser = new MesLineProcessUser();
+//		mesLineProcessUser.setUserCode(user.getUserCode());
+//		List<MesLineProcessUser> list = mesLineProcessService.findSubListOrder(mesLineProcessUser);
+//		List<String> ids = new ArrayList<>();
+//		for (MesLineProcessUser item:list){
+//			ids.add(item.getId());
+//		}
+//		Map<String, Object> map = MapUtils.newHashMap();
+//		if(!ids.isEmpty()){
+//			MesLineProcess mesLineProcess = new MesLineProcess();
+//			mesLineProcess.getSqlMap().getWhere().and("id", QueryType.IN,ids);
+//			List<MesLineProcess> list1 = mesLineProcessService.findList(mesLineProcess);
+//			map.put("lists", list1);
+//		}else {
+//			List<MesLineProcess> list1 = new ArrayList<>();
+//			map.put("lists", list1);
+//		}
+		Map<String, Object> map = MapUtils.newHashMap();
+		MesLineProcess mesLineProcess = new MesLineProcess();
+		mesLineProcess.setStatus("0");
+		mesLineProcess.setLineId(mesLine.getId());
+		mesLineProcess.getSqlMap().getWhere().and("a.pid",QueryType.IS_NOT_NULL,"");
+		List<MesLineProcess> lists = mesLineProcessService.findList(mesLineProcess);
+
+
+			if(ListUtils.isEmpty(lists)){
+				List<MesLineProcess> list1 = new ArrayList<>();
+				map.put("lists", list1);
+			}else{
+				map.put("lists", lists);
+			}
+			resp.setData(map);
+			resp.setResult(Global.TRUE);
+			return resp;
+
+
+
+//		if(ListUtils.isEmpty(lists)){
+//			List<MesLineProcess> list1 = new ArrayList<>();
+//			map.put("lists", list1);
+//		}else{
+//			map.put("lists", lists);
+//		}
+//		resp.setData(map);
+//		resp.setResult(Global.TRUE);
+//		return resp;
+	}
+
+
 }

src/main/resources/views/modules/mes/mesInspectionJudge.html

@@ -86,7 +86,7 @@
 			<div class="box-footer">
 				<div class="row">
 					<div class="col-sm-offset-2 col-sm-10">
-						<% if (hasPermi('mes:mesInspection:edit')){ %>
+						<% if (hasPermi('mes:mesInspection:judgeForm')){ %>
 							<button type="submit" class="btn btn-sm btn-primary" id="btnSubmit"><i class="fa fa-check"></i> ${text('确认判定')}</button>&nbsp;
 						<% } %>
 						<button type="button" class="btn btn-sm btn-default" id="btnCancel" onclick="js.closeCurrentTabPage()"><i class="fa fa-reply-all"></i> ${text('关 闭')}</button>

src/main/resources/views/modules/mes/mesInspectionUpload.html

@@ -61,7 +61,7 @@
 			<div class="box-footer">
 				<div class="row">
 					<div class="col-sm-offset-2 col-sm-10">
-						<% if (hasPermi('mes:mesInspection:edit')){ %>
+						<% if (hasPermi('mes:mesInspection:uploadForm')){ %>
 							<button type="submit" class="btn btn-sm btn-primary" id="btnSubmit"><i class="fa fa-check"></i> ${text('保 存')}</button>&nbsp;
 						<% } %>
 						<button type="button" class="btn btn-sm btn-default" id="btnCancel" onclick="js.closeCurrentTabPage()"><i class="fa fa-reply-all"></i> ${text('关 闭')}</button>