diff --git a/libs/encrypt/Encryptor.dll b/libs/encrypt/Encryptor.dll deleted file mode 100644 index edee19a..0000000 Binary files a/libs/encrypt/Encryptor.dll and /dev/null differ diff --git a/yudao-module-logistics/yudao-module-logistics-biz/src/main/java/cn/iocoder/yudao/module/camera/service/plc/PLCServiceImpl.java b/yudao-module-logistics/yudao-module-logistics-biz/src/main/java/cn/iocoder/yudao/module/camera/service/plc/PLCServiceImpl.java index 7c99457..cdae7e2 100644 --- a/yudao-module-logistics/yudao-module-logistics-biz/src/main/java/cn/iocoder/yudao/module/camera/service/plc/PLCServiceImpl.java +++ b/yudao-module-logistics/yudao-module-logistics-biz/src/main/java/cn/iocoder/yudao/module/camera/service/plc/PLCServiceImpl.java @@ -474,6 +474,12 @@ public void checkYx(KsecDataInfo dataInfo){ //ocr识别 AlgorithmDelayTask algorithmDelayTask = new AlgorithmDelayTask(dataInfo.getFromDirection(),street.getPlcId() ,dataInfo.getTaskId(),10000,finalStock.getTrayCode(),"E1",dataInfo.getFromRow(),dataInfo.getFromColumn()); + + String picPath = algorithmDelayTask.getSRMNumber() + "-" + algorithmDelayTask.getCmdName() + "-" + algorithmDelayTask.getDirection() + "-" + "up"; + + + String pathSrc = street.getPlcIp() + ":9007/pic/" + dataInfo.getTaskId() + "_" + picPath + ".JPEG"; + urlResourcesService.save(URLResourcesDo.builder().url(pathSrc).uuid(uuid).type("1").little("拍照").build()); getPhotoDelayExecutor.communicationFactory(algorithmDelayTask); } @@ -716,6 +722,8 @@ public void checkYx(KsecDataInfo dataInfo){ KsecDataInfo ksecDataInfo = KsecDataInfo.toFrom(kescEntity.getData()); stockSave(ksecDataInfo, street, sensorGunCode); getPhotoDelayExecutor.communicationFactory(algorithmDelayTask); + + order.setPics(order.getPics() == null ? "" : order.getPics() + "http://" + street.getPlcIp() + ":9007/pic/" + kescEntity.getData().getTaskId() + "_" + picPath + ".JPEG;"); orderMapper.updateById(order); diff --git a/yudao-module-logistics/yudao-module-logistics-biz/src/main/java/cn/iocoder/yudao/module/camera/service/scan/ScanServiceFactory.java b/yudao-module-logistics/yudao-module-logistics-biz/src/main/java/cn/iocoder/yudao/module/camera/service/scan/ScanServiceFactory.java index 5e44166..354f0af 100644 --- a/yudao-module-logistics/yudao-module-logistics-biz/src/main/java/cn/iocoder/yudao/module/camera/service/scan/ScanServiceFactory.java +++ b/yudao-module-logistics/yudao-module-logistics-biz/src/main/java/cn/iocoder/yudao/module/camera/service/scan/ScanServiceFactory.java @@ -53,4 +53,34 @@ public class ScanServiceFactory { } } + + public String scan(String type, StreetDO streetDO, KsecDataInfo dataInfo, StockDO stockDO, String path) { + ScanData scanData=new ScanData(); + switch (type) { + case "0": + return null; + // 扫码枪扫码 + case "1": + scanData= scanGunScanService.scan(streetDO, dataInfo, stockDO); + // RFID扫码 + case "2": + scanData= rfidScanService.scan(streetDO, dataInfo, stockDO); + // 视觉扫码 + case "3": + scanData= yoloService.scan(streetDO, dataInfo, stockDO); + + // 3D扫码 + case "4": + scanData= pcdService.scan(streetDO, dataInfo, stockDO); + + // opencv扫码 + case "5": + scanData= opencvService.scan(streetDO, dataInfo, stockDO); + + // 默认情况处理 + default: + + } + return scanData.getCode(); + } } diff --git a/yudao-server/yudao-server.jar b/yudao-server/yudao-server.jar deleted file mode 100644 index 404240a..0000000 Binary files a/yudao-server/yudao-server.jar and /dev/null differ