diff --git a/application/index/controller/wms/Wms.php b/application/index/controller/wms/Wms.php index 0ee2960..14dd434 100644 --- a/application/index/controller/wms/Wms.php +++ b/application/index/controller/wms/Wms.php @@ -9973,6 +9973,10 @@ class Wms extends Frontend $data = []; $lockKey = null; $message = null; + $exitCarnum = null; //出口车牌号,用于推送 WMS + $entryCarnum = null; //进场车牌号,用于推送 WMS + $entryAllow = false; //进场是否已放行(临时通行/白名单) + $entryReason = ''; //进场放行缘由 / 未放行原因 try { $requestData = $this->request->getContent(); $requestData_json = json_decode($requestData,true); @@ -9982,6 +9986,7 @@ class Wms extends Frontend case "出口": $message = "车辆{$carnum}离场"; $lockKey = "plateresult_exit_lock_{$WAREHOUSEID}_{$carnum}"; + $exitCarnum = $carnum; //标记出口事件,用于推送 WMS $data = [ "Response_AlarmInfoPlate"=> [ @@ -10004,6 +10009,7 @@ class Wms extends Frontend $info = $this->redis->get("{$WAREHOUSEID}_{$carnum}"); $lockKey = "plateresult_exit_lock_{$WAREHOUSEID}_{$carnum}"; + $entryCarnum = $carnum; //标记进场事件,用于推送 WMS if($info){ //判断是否临时车辆,临时车辆删除进入许可 $carinfo = json_decode($info,true); @@ -10012,6 +10018,8 @@ class Wms extends Frontend "tihuo"=>"提货" ]; $message = "{$date} 临时车辆{$carnum}入场\n放行群:{$carinfo['roomName']}\n放行人:{$carinfo['UserName']}\n放行缘由:{$types[$carinfo['type']]}"; + $entryAllow = true; + $entryReason = "临时车辆-".(isset($types[$carinfo['type']]) ? $types[$carinfo['type']] : $carinfo['type']); $this->redis->del("{$WAREHOUSEID}_{$carnum}"); $data = [ @@ -10036,6 +10044,8 @@ class Wms extends Frontend //白名单有信息,加载到缓存 if($car){ $message = "{$date} {$carnum}({$car['remask']})入场"; + $entryAllow = true; + $entryReason = "白名单"; $data = [ "Response_AlarmInfoPlate"=>["info"=>"ok","channelNum"=>0,"delay"=>1000, "playserver_json_request"=> @@ -10049,6 +10059,7 @@ class Wms extends Frontend ]; }else{ $message = "{$date} {$carnum}无访问权限,等待人工开门"; + $entryReason = "无访问权限"; $data = null; } } @@ -10060,6 +10071,22 @@ class Wms extends Frontend //发送消息 Log::error("开门信息".json_encode($message)); + + //事件防重锁:车牌识别设备可能在 20 秒内重复上报同一次进出 + $locked = $lockKey ? $this->redis->set($lockKey, 1, ['nx', 'ex' => 20]) : true; + Log::error("防重锁: key={$lockKey} locked=".($locked ? 1 : 0)); + + //出口/进场事件:伪造一条 wx 系统消息推送到 WMS(群ID=system / 群名=系统 / 内容={车牌}离场|进场 / 来源=system) + if($exitCarnum && $locked){ + $this->pushVehicleToWms($WAREHOUSEID, $exitCarnum, 'exit'); + } + if($entryCarnum && $locked){ + $this->pushVehicleToWms($WAREHOUSEID, $entryCarnum, 'entry', [ + 'allow' => $entryAllow ? 1 : 0, //是否已放行(临时通行/白名单) + 'reason' => $entryReason, //临时车辆-到货 / 白名单 / 无访问权限 + ]); + } + if($message){ $roomsModel = new \app\common\model\qiwe\Rooms(); $room = $roomsModel->where(["WAREHOUSEID"=>$WAREHOUSEID,"type"=>2,"sub_type"=>"door"])->find(); @@ -10071,10 +10098,8 @@ class Wms extends Frontend if($room){ $msg = $this->toMsg($room["room_id"],$message); - if($lockKey){ - if ($this->redis->set($lockKey, 1, ['nx', 'ex' => 20])) { - $this->toMsgCache($msg); - } + if($lockKey && $locked){ + $this->toMsgCache($msg); } } } @@ -10084,6 +10109,55 @@ class Wms extends Frontend return "0"; } } + /** + * 车辆进出场 → 伪造一条 wx 系统消息推送到 WMS 站内信(inbox.push) + * + * 群ID=system、群名=系统、内容={车牌}离场 / {车牌}进场、来源=system + * (inbox.push 的 sourceType 与 extData.source 都传 system)。 + * 推送失败只记日志,不影响道闸放行响应。 + * + * @param {int|string} $WAREHOUSEID 仓库ID + * @param {string} $carnum 车牌号 + * @param {string} $event exit 离场 / entry 进场 + * @param {array} $extra 追加到 extData 的额外字段(如进场的 allow / reason) + * @return {array|null} WMS 返回结果,失败返回 null + */ + private function pushVehicleToWms($WAREHOUSEID, $carnum, $event, $extra = []){ + try{ + if (empty(config('wms.app_key')) || empty(config('wms.app_secret'))) { + Log::error("车辆推送WMS跳过: wms 配置未就绪"); + return null; + } + $textMap = ['exit'=>"离场", 'entry'=>"进场"]; + $content = $carnum.(isset($textMap[$event]) ? $textMap[$event] : $event); + $inbox = new \app\index\library\new_wms\func\Inbox(); + $result = $inbox->push([ + 'requestId' => "{$event}:{$WAREHOUSEID}:{$carnum}:" . date('YmdHis'), //幂等去重,同一次进出由上面的防重锁兜底 + 'content' => $content, + 'groupId' => 'system', + 'groupName' => '系统', + 'userId' => 'system', + 'userName' => '系统', + 'parentId' => 0, + 'sourceType' => 'system', + 'targetType' => 'im', + 'extData' => array_merge([ + 'source' => 'system', //wx / qiwe / system + 'type' => 1, + 'event' => $event, + 'WAREHOUSEID' => $WAREHOUSEID, + 'carnum' => $carnum, + 'time' => date('Y-m-d H:i:s'), + ], $extra), + 'flags' => new \stdClass(), + ]); + Log::error("车辆推送WMS: event={$event} content={$content} result=".json_encode($result, JSON_UNESCAPED_UNICODE)); + return $result; + } catch (\Exception $e) { + Log::error("车辆推送WMS异常: " . $e->getMessage()); + return null; + } + } private function doorVoidText($text){ $result = ''; for ($i = 0; $i < mb_strlen($text, 'UTF-8'); $i++) {