zy-asrs-master.git

			@@ -22,6 +22,7 @@
			import io.netty.util.internal.StringUtil;
			import lombok.extern.slf4j.Slf4j;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.transaction.annotation.Transactional;
			import org.springframework.web.bind.annotation.*;

			import javax.annotation.Resource;
			@@ -98,6 +99,7 @@
			* 播种墙拍灯，ESS调用
			*/
			@PostMapping("/light/off")
			@Transactional(rollbackFor = Exception.class)
			public R lightOff(@RequestBody Map<String, Object> request) {
			if (Objects.isNull(request)) {
			throw new CoolException("参数不能为空！！");
			@@ -119,7 +121,7 @@

			WaveSeed waveSeed = waveSeedService.getOne(new LambdaQueryWrapper<WaveSeed>()
			.eq(WaveSeed::getExceStatus, 1)
			.eq(WaveSeed::getSiteNo, request.get("tagCode").toString()));
			.eq(WaveSeed::getSiteNo, request.get("tagCode").toString()), false);
			if (Objects.isNull(waveSeed)) {
			throw new CoolException("播种墙地标未绑定！！");
			}

			@@ -331,21 +331,22 @@
			//* 1. 判断当前容器是否还有物料未拣，未拣完闪灯，拣完通知容器流动，并灭灯
			SlapLightControlParam slapParam = new SlapLightControlParam();
			MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();

			Order one = orderService.getOne(new LambdaQueryWrapper<Order>().eq(Order::getOrderNo, orderNo));
			if (Objects.isNull(one)) {
			throw new CoolException("当前订单明细不存在！！");
			}
			//判断当前任务是否还有物料未拣
			if (!checked(orderNo, taskNo)) {
			log.info("未完成闪灯请求地址：{}，请求参数：{}", SystemProperties.SLAP_LIGHT, JSONObject.toJSONString(slapParam));
			//调用三方接口,闪灯不做操作
			// 设置请求参数
			mobileService.sowLightMange(siteNo, one, "LIGHT");
			// throw new CoolException("当前任务未完成，不能执行此操作！！");
			// params.add("params", JSONObject.toJSONString(slapParam));
			} else {
			//调用三方接口,灭灯通知容器流动，传灭灯参数
			//todo 判断当前订单是否完成，完成灭灯，未完成保持拣货状态亮灯
			Order one = orderService.getOne(new LambdaQueryWrapper<Order>().eq(Order::getOrderNo, orderNo));
			if (Objects.isNull(one)) {
			throw new CoolException("当前订单明细不存在！！");
			}

			// //获取播种已完成的订单明细
			// List<OrderDetl> detlList = orderDetls.stream().filter(detl -> {
			// return detl.getPickStatus() == OrderPickStatus.ORDER_PICK_STATUS_DONE.val;

	zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/OutStockController.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WcsApiServiceImpl.java	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史