YiWuProject.git

			@@ -4,8 +4,10 @@
			import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
			import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
			import com.github.yulichang.query.MPJQueryWrapper;
			import com.mes.common.S7object;
			import com.mes.damage.entity.Damage;
			import com.mes.damage.service.DamageService;
			import com.mes.device.PlcParameterObject;
			import com.mes.downglassinfo.entity.DownGlassInfo;
			import com.mes.downglassinfo.mapper.DownGlassInfoMapper;
			import com.mes.downglassinfo.service.DownGlassInfoService;
			@@ -141,7 +143,7 @@


			@Override
			public int updateFlowCardIdAndCount(String flowCardId, int workstationId, int layer) {
			public void updateFlowCardIdAndCount(String flowCardId, int workstationId, int layer) {
			int glassInfoCount = glassInfoService.getGlassInfoCountByFlowCardId(flowCardId, layer);
			QueryWrapper<Damage> queryWrapper = new QueryWrapper<>();
			queryWrapper.eq("process_id", flowCardId);
			@@ -154,8 +156,9 @@
			.set("layer", layer)
			.set("other_number", otherNumber)
			.eq("workstation_id", workstationId);

			this.update(updateWrapper);
			return 1;

			}

			@Override
			@@ -190,4 +193,30 @@
			}


			@Override
			public boolean updateDownWorkstationstate(DownWorkstation downWorkstation) {

			DownWorkstation downWork = baseMapper.selectById(downWorkstation.getId());

			if (downWork != null) {

			downWork.setEnableState(downWorkstation.getEnableState());

			baseMapper.updateById(downWork);

			return true;
			} else {

			return false;
			}
			}

			@Override
			public String closeAlarmSignal() {
			PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
			S7object.getinstance().plccontrol.writeWord(plcParameterObject.getPlcParameter("alarm_signal").getAddress(), 0);
			return "success";
			}


			}