zy-asrs-master.git

			@@ -1,6 +1,7 @@
			package com.zy.asrs.wms.apis.wcs.controller;


			import com.alibaba.fastjson.JSONObject;
			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.zy.asrs.framework.common.R;
			import com.zy.asrs.framework.exception.CoolException;
			@@ -21,6 +22,7 @@
			import org.springframework.web.bind.annotation.*;

			import javax.annotation.Resource;
			import java.util.HashMap;
			import java.util.Map;
			import java.util.Objects;

			@@ -84,6 +86,7 @@
			}

			/**
			* ESS 播种墙拍灯回调
			* 播种墙拍灯，ESS调用
			*/
			@PostMapping("/light/off")
			@@ -98,16 +101,24 @@
			throw new CoolException("事件名称不能为空！！");
			}

			log.info("播种墙拍灯，请求参数：{}", JSONObject.toJSONString(request));

			// 根据站点编码查播种站点信息
			CacheSite cacheSite = cacheSiteService.getOne(new LambdaQueryWrapper<CacheSite>().eq(CacheSite::getSiteNo, request.get("tagCode")));
			if (Objects.isNull(cacheSite)) {
			throw new CoolException("当前站点不存在！！");
			}
			// 根据播种站点信息条码，查任务
			Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, cacheSite.getBarcode()));
			if (Objects.isNull(task)) {
			throw new CoolException("当前站点任务不存在！！");
			}

			request.clear();
			request.put("taskNo", task.getTaskNo());
			request.put("orderNo",cacheSite.getOrderNo());
			Map<String, Object> param = new HashMap<>();
			param.put("taskNo", task.getTaskNo());
			param.put("orderNo",cacheSite.getOrderNo());

			wcsApiService.slapLightLogic(request);
			wcsApiService.slapLightLogic(param);

			return R.ok();
			}
			@@ -121,7 +132,7 @@
			* @return
			*/
			@GetMapping("/container/converyor/{code}")
			public R containerConveyor(@PathVariable String code) {
			public R containerConveyor(@PathVariable String code) throws Exception {
			if (StringUtil.isNullOrEmpty(code)) {
			return R.error("容器编码不能为空！！！");
			}
			@@ -150,9 +161,7 @@
			throw new CoolException("当前任务订单号不能为空！！");
			}

			wcsApiService.slapLightLogic(request);

			return R.ok();
			return wcsApiService.slapLightLogic(request);
			}