Jcdm042-Mes-Module-One.git

			@@ -6,6 +6,7 @@
			import java.util.concurrent.CompletableFuture;
			import javax.servlet.http.HttpServletResponse;

			import cn.hutool.core.collection.CollUtil;
			import cn.hutool.core.util.ObjectUtil;
			import cn.hutool.json.JSONObject;
			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			@@ -128,9 +129,27 @@
			if (ObjectUtil.isNull(productTypeObjcet)) {
			return AjaxResult.error("接单失败,PLC未传输生产类型，请联系管理员!");
			}

			String productType = productTypeObjcet.toString();//产品类型
			String materialCode = Constants.materialMap.get(productType);


			//先查询表中是否有剩余工单
			List<OmProductionOrdeInfo> orderList = omProductionOrdeInfoService.list(new LambdaQueryWrapper<OmProductionOrdeInfo>()
			.eq(OmProductionOrdeInfo::getOrderStatus, Constants.ONE)
			.eq(OmProductionOrdeInfo::getStationCode,paramOrder.getLineCode())//工位
			.eq(OmProductionOrdeInfo::getProductCode,materialCode));//产品类型
			if (CollUtil.isNotEmpty(orderList)){
			Long id = orderList.get(0).getId();
			String productNum = orderList.get(0).getProductNum();//模组码
			String orderNum = orderList.get(0).getWorkOrderNo();

			paramProductNum = productNum;
			//下发产品模组码
			miloService.writeToOpcUa(ReadWriteEntity.builder().identifier("MOZU1." + paramOrder.getLineCode() + ".WorkOrderNumber").value(orderNum).build());
			miloService.writeToOpcUa(ReadWriteEntity.builder().identifier("MOZU1." + paramOrder.getLineCode() + ".ModuleCode").value(productNum).build());

			}else{
			OmProductionOrdeInfo lastOrder = omProductionOrdeInfoService.getLastOrder();
			String orderJsonString = RestfulService.getProductionWorkOrderRequest(lastOrder.getProductNum(), "M1OP100",materialCode);
			JSONObject jsonObject = new JSONObject(orderJsonString);
			@@ -147,7 +166,7 @@
			OmProductionOrdeInfo omProductionOrdeInfo = new OmProductionOrdeInfo();
			omProductionOrdeInfo.setWorkOrderNo(dataObject.getStr("productionOrderNum"));
			omProductionOrdeInfo.setProductNum(dataObject.getStr("productNum"));
			omProductionOrdeInfo.setStationCode(dataObject.getStr("stationCode"));
			omProductionOrdeInfo.setStationCode(paramOrder.getLineCode());//工位
			omProductionOrdeInfo.setProductCode(dataObject.getStr("materialCode"));
			omProductionOrdeInfo.setPlanQty(Long.valueOf(dataObject.getStr("plannedQuantity")));
			omProductionOrdeInfo.setOnlineCompletionMark("0");
			@@ -157,6 +176,7 @@
			omProductionOrdeInfo.setCreateUser("工厂MES");
			omProductionOrdeInfoService.save(omProductionOrdeInfo);

			paramProductNum = dataObject.getStr("productNum");
			//写PLC
			miloService.writeToOpcUa(ReadWriteEntity.builder().identifier("MOZU1." + paramOrder.getLineCode() + ".WorkOrderNumber").value(dataObject.getStr("productionOrderNum")).build());
			miloService.writeToOpcUa(ReadWriteEntity.builder().identifier("MOZU1." + paramOrder.getLineCode() + ".ModuleCode").value(dataObject.getStr("productNum")).build());
			@@ -169,7 +189,9 @@
			}else {
			return AjaxResult.error("接单失败,请联系管理员");
			}
			return AjaxResult.success(dataObject.getStr("productNum"));
			}

			return AjaxResult.success(paramProductNum);
			}

			@GetMapping(value = "/jieBang/{id}")