fix: 注释修改2

This commit is contained in:
2023-12-07 18:11:29 +08:00
parent 346214e11e
commit 936d17a437
28 changed files with 376 additions and 144 deletions

View File

@@ -45,18 +45,30 @@ public class ItemProtocol {
* 任务号 * 任务号
*/ */
public static String item_task = "task"; public static String item_task = "task";
//出数字托盘号 /**
* 出数字托盘号
*/
public static String item_container_no = "container_no"; public static String item_container_no = "container_no";
//下发命令 /**
* 下发命令
*/
public static String item_to_command = "to_command"; public static String item_to_command = "to_command";
//下发托盘类型 /**
* 下发托盘类型
*/
public static String item_to_container_type = "to_container_type"; public static String item_to_container_type = "to_container_type";
//下发接纯数字托盘号 /**
* 下发接纯数字托盘号
*/
public static String item_to_container_no = "to_container_no"; public static String item_to_container_no = "to_container_no";
//下发任务号 /**
* 下发任务号
*/
public static String item_to_task = "to_task"; public static String item_to_task = "to_task";
//下发目标站 /**
* 下发目标站
*/
public static String item_to_target = "to_target"; public static String item_to_target = "to_target";

View File

@@ -28,7 +28,9 @@ public class ItemProtocol {
* 动作信号 * 动作信号
*/ */
public static String item_action = "action"; public static String item_action = "action";
//行走列 /**
* 行走列
*/
public static String item_walk_y = "walk_y"; public static String item_walk_y = "walk_y";
/** /**
* 报警 * 报警

View File

@@ -18,7 +18,9 @@ public class ItemProtocol {
public static String item_error = "error"; public static String item_error = "error";
public static String item_door = "door"; public static String item_door = "door";
public static String item_temperature = "temperature"; public static String item_temperature = "temperature";
//恒温倒计时 /**
* 恒温倒计时
*/
public static String item_countdown_house = "countdown_house"; public static String item_countdown_house = "countdown_house";
public static String item_countdown_min = "countdown_min"; public static String item_countdown_min = "countdown_min";
public static String item_countdown_sec = "countdown_sec"; public static String item_countdown_sec = "countdown_sec";

View File

@@ -89,7 +89,11 @@ public class ItemProtocol {
return this.getOpcIntegerValue(item_to_task); return this.getOpcIntegerValue(item_to_task);
} }
//是否有货 /**
* 是否有货
* @param move
* @return
*/
public int hasGoods(int move) { public int hasGoods(int move) {
return move; return move;
} }

View File

@@ -91,15 +91,23 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
int branchProtocol = 0; int branchProtocol = 0;
//当前指令 /**
* 当前指令
*/
Instruction inst = null; Instruction inst = null;
//上次指令 /**
* 上次指令
*/
Instruction last_inst = null; Instruction last_inst = null;
//触摸屏手动触发任务 /**
* 触摸屏手动触发任务
*/
private Boolean is_has_task = false; private Boolean is_has_task = false;
//暂定 0就绪 1请求取货 2取货完成 3请求放货 4放货完成 5取货完成离开 6放货完成离开 7请求进入区域 8请求离开区域 /**
* 暂定 0就绪 1请求取货 2取货完成 3请求放货 4放货完成 5取货完成离开 6放货完成离开 7请求进入区域 8请求离开区域
*/
int flag; int flag;
String message; String message;

View File

@@ -28,7 +28,9 @@ public class ItemProtocol {
* 动作信号 * 动作信号
*/ */
public static String item_action = "action"; public static String item_action = "action";
//行走列 /**
* 行走列
*/
public static String item_walk_y = "walk_y"; public static String item_walk_y = "walk_y";
/** /**
* 报警 * 报警
@@ -39,13 +41,19 @@ public class ItemProtocol {
*/ */
public static String item_task = "task"; public static String item_task = "task";
//下发命令 /**
* 行走列
*/
public static String item_to_command = "to_command"; public static String item_to_command = "to_command";
//下发起始站 //下发起始站
public static String item_to_onset = "to_onset"; public static String item_to_onset = "to_onset";
//下发目标站 /**
* 下发目标站
*/
public static String item_to_target = "to_target"; public static String item_to_target = "to_target";
//下发任务号 /**
* 下发任务号
*/
public static String item_to_task = "to_task"; public static String item_to_task = "to_task";

View File

@@ -74,7 +74,9 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
*/ */
int action = 0; int action = 0;
int last_action = 0; int last_action = 0;
//行走列 /**
* 行走列
*/
int walk_y = 0; int walk_y = 0;
int last_walk_y = 0; int last_walk_y = 0;
/** /**

View File

@@ -11,41 +11,73 @@ import java.util.List;
@Data @Data
public class ItemProtocol { public class ItemProtocol {
//1/0 手动/自动 /**
* 1/0 手动/自动
*/
public static String item_mode = "mode"; public static String item_mode = "mode";
//0/1 半自动/全自动 /**
* 0/1 半自动/全自动
*/
public static String item_action = "action"; public static String item_action = "action";
//0/1 远程/本地控制 /**
* 0/1 远程/本地控制
*/
public static String item_control = "control"; public static String item_control = "control";
//2 运行中 /**
//1 急停/故障 * 2 运行中
//0 待机中 * 1 急停/故障
* 0 待机中
*/
public static String item_status = "status"; public static String item_status = "status";
//1 机头上有轴 /**
* 1 机头上有轴
*/
public static String item_move = "move"; public static String item_move = "move";
//1/0 穿轴中/穿轴完成 /**
* 1/0 穿轴中/穿轴完成
*/
public static String item_plug_finish = "plug_finish"; public static String item_plug_finish = "plug_finish";
//1/0 把轴中/拔轴完成 /**
* 1/0 把轴中/拔轴完成
*/
public static String item_pull_finish = "pull_finish"; public static String item_pull_finish = "pull_finish";
//3寸轴穿轴次数 /**
* 3寸轴穿轴次数
*/
public static String item_3plug_times = "3plug_times"; public static String item_3plug_times = "3plug_times";
//6寸轴穿轴次数 /**
* 6寸轴穿轴次数
*/
public static String item_6plug_times = "6plug_times"; public static String item_6plug_times = "6plug_times";
//3寸轴拔轴次数 /**
* 3寸轴拔轴次数
*/
public static String item_3pull_times = "3pull_times"; public static String item_3pull_times = "3pull_times";
//6寸轴拔轴次数 /**
* 6寸轴拔轴次数
*/
public static String item_6pull_times = "6pull_times"; public static String item_6pull_times = "6pull_times";
//穿轴总次数 /**
* 穿轴总次数
*/
public static String item_plug_alltimes = "plug_alltimes"; public static String item_plug_alltimes = "plug_alltimes";
//拔轴总次数 /**
* 拔轴总次数
*/
public static String item_pull_alltimes = "pull_alltimes"; public static String item_pull_alltimes = "pull_alltimes";
//1 全自动启动 /**
* 1 全自动启动
*/
public static String item_to_command = "to_command"; public static String item_to_command = "to_command";
//0/1 穿轴/拔轴 /**
* 0/1 穿轴/拔轴
*/
public static String item_to_type = "to_type"; public static String item_to_type = "to_type";
//3/6 轴尺寸 /**
* 3/6 轴尺寸
*/
public static String item_to_size = "to_size"; public static String item_to_size = "to_size";

View File

@@ -37,21 +37,37 @@ public class ItemProtocol {
*/ */
public static String item_task = "task"; public static String item_task = "task";
//下发命令 /**
* 行走列
*/
public static String item_to_command = "to_command"; public static String item_to_command = "to_command";
//下发目标站 /**
* 下发目标站
*/
public static String item_to_target = "to_target"; public static String item_to_target = "to_target";
//下发托盘类型 /**
* 下发托盘类型
*/
public static String item_to_container_type = "to_container_type"; public static String item_to_container_type = "to_container_type";
//下发任务号 /**
* 下发任务号
*/
public static String item_to_task = "to_task"; public static String item_to_task = "to_task";
//困扎次数 /**
* 困扎次数
*/
public static String item_to_strap_times = "to_strap_times"; public static String item_to_strap_times = "to_strap_times";
//木箱长度 /**
*木箱长度
*/
public static String item_to_length = "to_length"; public static String item_to_length = "to_length";
//木箱宽度 /**
*木箱宽度
*/
public static String item_to_weight = "to_weight"; public static String item_to_weight = "to_weight";
//木箱高度 /**
*木箱高度
*/
public static String item_to_height = "to_height"; public static String item_to_height = "to_height";

View File

@@ -37,21 +37,37 @@ public class ItemProtocol {
*/ */
public static String item_task = "task"; public static String item_task = "task";
//下发命令 /**
* 行走列
*/
public static String item_to_command = "to_command"; public static String item_to_command = "to_command";
//下发目标站 /**
* 下发目标站
*/
public static String item_to_target = "to_target"; public static String item_to_target = "to_target";
//下发托盘类型 /**
* 下发托盘类型
*/
public static String item_to_container_type = "to_container_type"; public static String item_to_container_type = "to_container_type";
//下发任务号 /**
* 下发任务号
*/
public static String item_to_task = "to_task"; public static String item_to_task = "to_task";
//困扎次数 /**
* 困扎次数
*/
public static String item_to_strap_times = "to_strap_times"; public static String item_to_strap_times = "to_strap_times";
//木箱长度 /**
*木箱长度
*/
public static String item_to_length = "to_length"; public static String item_to_length = "to_length";
//木箱宽度 /**
*木箱宽度
*/
public static String item_to_weight = "to_weight"; public static String item_to_weight = "to_weight";
//木箱高度 /**
*木箱高度
*/
public static String item_to_height = "to_height"; public static String item_to_height = "to_height";

View File

@@ -36,24 +36,42 @@ public class ItemProtocol {
* 任务号 * 任务号
*/ */
public static String item_task = "task"; public static String item_task = "task";
//重量 /**
*重量
*/
public static String item_weight = "weight"; public static String item_weight = "weight";
//下发命令 /**
* 行走列
*/
public static String item_to_command = "to_command"; public static String item_to_command = "to_command";
//下发目标站 /**
* 下发目标站
*/
public static String item_to_target = "to_target"; public static String item_to_target = "to_target";
//下发托盘类型 /**
* 下发托盘类型
*/
public static String item_to_container_type = "to_container_type"; public static String item_to_container_type = "to_container_type";
//下发任务号 /**
* 下发任务号
*/
public static String item_to_task = "to_task"; public static String item_to_task = "to_task";
//困扎次数 /**
* 困扎次数
*/
public static String item_to_strap_times = "to_strap_times"; public static String item_to_strap_times = "to_strap_times";
//木箱长度 /**
*木箱长度
*/
public static String item_to_length = "to_length"; public static String item_to_length = "to_length";
//木箱宽度 /**
*木箱宽度
*/
public static String item_to_weight = "to_weight"; public static String item_to_weight = "to_weight";
//木箱高度 /**
*木箱高度
*/
public static String item_to_height = "to_height"; public static String item_to_height = "to_height";

View File

@@ -30,7 +30,9 @@ public class ItemProtocol {
public static String item_action1 = "action1"; public static String item_action1 = "action1";
//后工位动作信号 //后工位动作信号
public static String item_action2 = "action2"; public static String item_action2 = "action2";
//行走列 /**
* 行走列
*/
public static String item_walk_y = "walk_y"; public static String item_walk_y = "walk_y";
/** /**
* 报警 * 报警
@@ -119,7 +121,9 @@ public class ItemProtocol {
} }
//是否有货 /**
*是否有货
*/
public int hasGoods(int move) { public int hasGoods(int move) {
return move; return move;
} }

View File

@@ -85,7 +85,9 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl
*/ */
int error = 0; int error = 0;
int last_error = 0; int last_error = 0;
//行走列 /**
* 行走列
*/
int walk_y = 0; int walk_y = 0;
int last_walk_y = 0; int last_walk_y = 0;
//任务类型 //任务类型

View File

@@ -74,7 +74,9 @@ public class ItemProtocol {
} }
//是否有货 /**
*是否有货
*/
public int hasGoods(int move) { public int hasGoods(int move) {
return move; return move;
} }

View File

@@ -91,7 +91,9 @@ public class ItemProtocol {
return this.getOpcIntegerValue(item_to_task); return this.getOpcIntegerValue(item_to_task);
} }
//是否有货 /**
*是否有货
*/
public int hasGoods(int move) { public int hasGoods(int move) {
return move; return move;
} }

View File

@@ -36,27 +36,47 @@ public class ItemProtocol {
* 任务号 * 任务号
*/ */
public static String item_task = "task"; public static String item_task = "task";
//条码长度 /**
* 条码长度
*/
public static String item_barcode_length = "barcode_length"; public static String item_barcode_length = "barcode_length";
//条码 /**
* 条码
*/
public static String item_barcode = "barcode"; public static String item_barcode = "barcode";
//下发命令 /**
* 行走列
*/
public static String item_to_command = "to_command"; public static String item_to_command = "to_command";
//下发目标站 /**
* 下发目标站
*/
public static String item_to_target = "to_target"; public static String item_to_target = "to_target";
//下发托盘类型 /**
* 下发托盘类型
*/
public static String item_to_container_type = "to_container_type"; public static String item_to_container_type = "to_container_type";
//下发任务号 /**
* 下发任务号
*/
public static String item_to_task = "to_task"; public static String item_to_task = "to_task";
//困扎次数 /**
* 困扎次数
*/
public static String item_to_strap_times = "to_strap_times"; public static String item_to_strap_times = "to_strap_times";
//木箱长度 /**
*木箱长度
*/
public static String item_to_length = "to_length"; public static String item_to_length = "to_length";
//木箱宽度 /**
*木箱宽度
*/
public static String item_to_weight = "to_weight"; public static String item_to_weight = "to_weight";
//木箱高度 /**
*木箱高度
*/
public static String item_to_height = "to_height"; public static String item_to_height = "to_height";

View File

@@ -70,7 +70,9 @@ public class ItemProtocol {
return this.getOpcIntegerValue(item_to_task); return this.getOpcIntegerValue(item_to_task);
} }
//是否有货 /**
*是否有货
*/
public int hasGoods(int move) { public int hasGoods(int move) {
return move; return move;
} }

View File

@@ -26,7 +26,9 @@ public class ItemProtocol {
*/ */
public static String item_mode = "mode"; public static String item_mode = "mode";
//作业状态 /**
*作业状态
*/
public static String item_command = "command"; public static String item_command = "command";
/** /**
@@ -34,16 +36,24 @@ public class ItemProtocol {
*/ */
public static String item_task = "task"; public static String item_task = "task";
//y轴报警(载货台) /**
* y轴报警(载货台)
*/
public static String item_error = "error"; public static String item_error = "error";
//行走排号 /**
* 行走排号
*/
public static String item_z = "z"; public static String item_z = "z";
//行走列号 /**
* 行走列
*/
public static String item_x = "x"; public static String item_x = "x";
//行走层号 /**
* 行走层号
*/
public static String item_y = "y"; public static String item_y = "y";
/** /**
@@ -51,7 +61,9 @@ public class ItemProtocol {
*/ */
public static String item_move = "move"; public static String item_move = "move";
//载货台开关信号 /**
* 载货台开关信号
*/
public static String item_cargoMove = "cargoMove"; public static String item_cargoMove = "cargoMove";
/** /**
@@ -64,19 +76,29 @@ public class ItemProtocol {
*/ */
public static String item_distancex = "distancex"; public static String item_distancex = "distancex";
//起升激光数值 /**
* 起升激光数值
*/
public static String item_distancey = "distancey"; public static String item_distancey = "distancey";
//载货台超限信号 /**
*载货台超限信号
*/
public static String item_cargoError = "cargoError"; public static String item_cargoError = "cargoError";
//货叉探货信号 /**
*货叉探货信号
*/
public static String item_forkCargo = "forkCargo"; public static String item_forkCargo = "forkCargo";
//货叉位置信号 /**
*货叉位置信号
*/
public static String item_forkLocation = "forkLocation"; public static String item_forkLocation = "forkLocation";
//货叉动作信号 /**
*货叉动作信号
*/
public static String item_forkAction = "forkAction"; public static String item_forkAction = "forkAction";
/** /**
* 特殊开关量1 * 特殊开关量1
@@ -86,7 +108,9 @@ public class ItemProtocol {
* 特殊开关量2 * 特殊开关量2
*/ */
public static String item_special2 = "special2"; public static String item_special2 = "special2";
//托盘条码 /**
*托盘条码
*/
public static String item_trayCode = "trayCode"; public static String item_trayCode = "trayCode";
/** /**
* 水箱和消防缓存位有无货 * 水箱和消防缓存位有无货
@@ -109,22 +133,38 @@ public class ItemProtocol {
* 轴工作时间(小时) * 轴工作时间(小时)
*/ */
public static String item_stacker_workingHours = "stacker_workingHours"; public static String item_stacker_workingHours = "stacker_workingHours";
//载货台速度(转/分钟) /**
*载货台速度(转/分钟)
*/
public static String item_cargo_rpm = "cargo_rpm"; public static String item_cargo_rpm = "cargo_rpm";
//载货台电流 /**
*载货台电流
*/
public static String item_cargo_electric_Current = "cargo_electric Current"; public static String item_cargo_electric_Current = "cargo_electric Current";
//载货台轴工作小时数 /**
*载货台轴工作小时数
*/
public static String item_cargo_workingHours = "cargo_workingHours"; public static String item_cargo_workingHours = "cargo_workingHours";
//载货台轴运行次数 /**
*载货台轴运行次数
*/
public static String item_cargo_runingTimes = "cargo_runingTimes"; public static String item_cargo_runingTimes = "cargo_runingTimes";
//货叉速度(转/分钟) /**
*货叉速度(转/分钟
*/
public static String item_fork_rpm = "fork_rpm"; public static String item_fork_rpm = "fork_rpm";
//货叉电流 /**
*货叉电流
*/
public static String item_fork_electric_Current = "fork_electric Current"; public static String item_fork_electric_Current = "fork_electric Current";
//货叉轴工作时间(小时) /**
*货叉轴工作时间(小时
*/
public static String item_fork_workingHours = "fork_workingHours"; public static String item_fork_workingHours = "fork_workingHours";
//货叉轴运行次数 /**
*货叉轴运行次数
*/
public static String item_fork_runingTimes = "fork_runingTimes"; public static String item_fork_runingTimes = "fork_runingTimes";
/** /**
@@ -144,13 +184,21 @@ public class ItemProtocol {
* 任务号 * 任务号
*/ */
public static String item_to_task = "to_task"; public static String item_to_task = "to_task";
//作业排 /**
*作业排
*/
public static String item_to_z = "to_z"; public static String item_to_z = "to_z";
//作业列 /**
* 作业列
*/
public static String item_to_x = "to_x"; public static String item_to_x = "to_x";
//作业层 /**
* 作业层
*/
public static String item_to_y = "to_y"; public static String item_to_y = "to_y";
//托盘号 /**
* 托盘号
*/
public static String item_to_trayCode = "to_trayCode"; public static String item_to_trayCode = "to_trayCode";

View File

@@ -81,7 +81,9 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
*/ */
Integer mode = 0; Integer mode = 0;
Integer last_mode = 0; Integer last_mode = 0;
//作业状态 /**
*作业状态
*/
Integer command = 0; Integer command = 0;
Integer last_command = 0; Integer last_command = 0;
/** /**
@@ -95,7 +97,9 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
//行走排号 //行走排号
Integer z = 0; Integer z = 0;
Integer last_z = 0; Integer last_z = 0;
//行走列号 /**
* 行走列
*/
Integer x = null; Integer x = null;
Integer last_x = null; Integer last_x = null;
//行走层号 //行走层号
@@ -122,16 +126,24 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
//起升激光数值 //起升激光数值
Integer distancey = 0; Integer distancey = 0;
Integer last_distancey = 0; Integer last_distancey = 0;
//载货台超限信号 /**
*载货台超限信号
*/
Float cargoError = 0F; Float cargoError = 0F;
Float last_cargoError = 0F; Float last_cargoError = 0F;
//货叉探货信号 /**
*货叉探货信号
*/
Float forkCargo = 0F; Float forkCargo = 0F;
Float last_forkCargo = 0F; Float last_forkCargo = 0F;
//货叉位置信号 /**
*货叉位置信号
*/
Float forkLocation = 0F; Float forkLocation = 0F;
Float last_forkLocation = 0F; Float last_forkLocation = 0F;
//货叉动作信号 /**
*货叉动作信号
*/
Float forkAction = 0F; Float forkAction = 0F;
Float last_forkAction = 0F; Float last_forkAction = 0F;
/** /**
@@ -144,7 +156,9 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
*/ */
Float special2 = 0F; Float special2 = 0F;
Float last_special2 = 0F; Float last_special2 = 0F;
//托盘条码 /**
*托盘条码
*/
int[] trayCode; int[] trayCode;
int[] last_trayCode; int[] last_trayCode;
/** /**
@@ -172,28 +186,44 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
*/ */
Integer stacker_workingHours = 0; Integer stacker_workingHours = 0;
Integer last_stacker_workingHours = 0; Integer last_stacker_workingHours = 0;
//载货台速度(转/分钟) /**
*载货台速度(转/分钟)
*/
Integer cargo_rpm = 0; Integer cargo_rpm = 0;
Integer last_cargo_rpm = 0; Integer last_cargo_rpm = 0;
//载货台电流 /**
*载货台电流
*/
Integer cargo_electric_Current = 0; Integer cargo_electric_Current = 0;
Integer last_cargo_electric_Current = 0; Integer last_cargo_electric_Current = 0;
//载货台轴工作小时数 /**
*载货台轴工作小时数
*/
Integer cargo_workingHour = 0; Integer cargo_workingHour = 0;
Integer last_cargo_workingHour = 0; Integer last_cargo_workingHour = 0;
//载货台轴运行次数 /**
*载货台轴运行次数
*/
Integer cargo_runingTimes = 0; Integer cargo_runingTimes = 0;
Integer last_cargo_runingTimes = 0; Integer last_cargo_runingTimes = 0;
//货叉速度(转/分钟) /**
*货叉速度(转/分钟
*/
Integer fork_rpm = 0; Integer fork_rpm = 0;
Integer last_fork_rpm = 0; Integer last_fork_rpm = 0;
//货叉电流 /**
*货叉电流
*/
Integer fork_electric_Current = 0; Integer fork_electric_Current = 0;
Integer last_fork_electric_Current = 0; Integer last_fork_electric_Current = 0;
//货叉轴工作时间(小时) /**
*货叉轴工作时间(小时
*/
Integer fork_workingHours = 0; Integer fork_workingHours = 0;
Integer last_fork_workingHours = 0; Integer last_fork_workingHours = 0;
//货叉轴运行次数 /**
*货叉轴运行次数
*/
Integer fork_runingTimes = 0; Integer fork_runingTimes = 0;
Integer last_fork_runingTimes = 0;*/ Integer last_fork_runingTimes = 0;*/

View File

@@ -31,9 +31,13 @@ public class LampThreecolorDeviceDriver extends AbstractOpcDeviceDriver implemen
String container_type_desc; String container_type_desc;
String last_container_type_desc; String last_container_type_desc;
String last_container; String last_container;
//放货准备锁 /**
* 放货准备锁
*/
String putReadyLock = null; String putReadyLock = null;
//有货标记 /**
* 有货标记
*/
protected boolean has_goods_tag = false; protected boolean has_goods_tag = false;
String devicecode; String devicecode;
int mode = 0; int mode = 0;

View File

@@ -57,7 +57,12 @@ public class LiKuToAcsServiceImpl implements LiKuToAcsService {
private String log_file_type = "log_file_type"; private String log_file_type = "log_file_type";
private String log_type = "立库请求ACS"; private String log_type = "立库请求ACS";
//入库任务状态反馈 /**
* 入库任务状态反馈
* @param requestParam
* @return
* @throws Exception
*/
@Override @Override
public Resp<InStoreReportResponse> inStoreReport(InStoreReportRequest requestParam) throws Exception { public Resp<InStoreReportResponse> inStoreReport(InStoreReportRequest requestParam) throws Exception {
@@ -194,7 +199,12 @@ public class LiKuToAcsServiceImpl implements LiKuToAcsService {
} }
//移库任务上报 /**
* 移库任务上报
* @param requestParam
* @return
* @throws Exception
*/
@Override @Override
public Resp<MoveStoreReportResponse> moveStoreReport(MoveStoreReportRequest requestParam) throws Exception { public Resp<MoveStoreReportResponse> moveStoreReport(MoveStoreReportRequest requestParam) throws Exception {
try { try {
@@ -261,7 +271,12 @@ public class LiKuToAcsServiceImpl implements LiKuToAcsService {
} }
//请求放空盘 /**
* 请求放空盘
* @param requestParam
* @return
* @throws Exception
*/
@Override @Override
public Resp<DeviceStatusResponse> putEmptyPallet(putEmptyPalletRequest requestParam) throws Exception { public Resp<DeviceStatusResponse> putEmptyPallet(putEmptyPalletRequest requestParam) throws Exception {
try { try {

View File

@@ -36,7 +36,6 @@ public class LabelingTemplateController {
@GetMapping @GetMapping
@Log("查询贴标模板基本信息") @Log("查询贴标模板基本信息")
@ApiOperation("查询贴标模板基本信息") @ApiOperation("查询贴标模板基本信息")
//@PreAuthorize("@el.check('labelingTemplate:list')")
public ResponseEntity query(LabelingTemplateQueryParam query, Pageable pageable) { public ResponseEntity query(LabelingTemplateQueryParam query, Pageable pageable) {
return new ResponseEntity<>(labelingTemplateService.queryAll(query, pageable), HttpStatus.OK); return new ResponseEntity<>(labelingTemplateService.queryAll(query, pageable), HttpStatus.OK);
} }
@@ -49,7 +48,6 @@ public class LabelingTemplateController {
@PostMapping @PostMapping
@Log("新增贴标模板基本信息") @Log("新增贴标模板基本信息")
@ApiOperation("新增贴标模板基本信息") @ApiOperation("新增贴标模板基本信息")
//@PreAuthorize("@el.check('labelingTemplate:add')")
public ResponseEntity create(@Validated @RequestBody LabelingTemplateDto resources) { public ResponseEntity create(@Validated @RequestBody LabelingTemplateDto resources) {
return new ResponseEntity<>(labelingTemplateService.insert(resources), HttpStatus.CREATED); return new ResponseEntity<>(labelingTemplateService.insert(resources), HttpStatus.CREATED);
} }
@@ -62,7 +60,6 @@ public class LabelingTemplateController {
@PutMapping @PutMapping
@Log("修改贴标模板基本信息") @Log("修改贴标模板基本信息")
@ApiOperation("修改贴标模板基本信息") @ApiOperation("修改贴标模板基本信息")
//@PreAuthorize("@el.check('labelingTemplate:edit')")
public ResponseEntity update(@Validated @RequestBody LabelingTemplateDto resources) { public ResponseEntity update(@Validated @RequestBody LabelingTemplateDto resources) {
labelingTemplateService.updateById(resources); labelingTemplateService.updateById(resources);
return new ResponseEntity<>(HttpStatus.NO_CONTENT); return new ResponseEntity<>(HttpStatus.NO_CONTENT);
@@ -76,7 +73,6 @@ public class LabelingTemplateController {
@DeleteMapping @DeleteMapping
@Log("删除贴标模板基本信息") @Log("删除贴标模板基本信息")
@ApiOperation("删除贴标模板基本信息") @ApiOperation("删除贴标模板基本信息")
//@PreAuthorize("@el.check('labelingTemplate:del')")
public ResponseEntity delete(@RequestBody Set<String> ids) { public ResponseEntity delete(@RequestBody Set<String> ids) {
labelingTemplateService.removeByIds(ids); labelingTemplateService.removeByIds(ids);
return new ResponseEntity<>(HttpStatus.OK); return new ResponseEntity<>(HttpStatus.OK);

View File

@@ -25,7 +25,6 @@ import java.util.*;
*/ */
@Service @Service
@AllArgsConstructor @AllArgsConstructor
// @CacheConfig(cacheNames = LabelingTemplateService.CACHE_KEY)
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
public class LabelingTemplateServiceImpl extends CommonServiceImpl<LabelingTemplateMapper, LabelingTemplate> implements LabelingTemplateService { public class LabelingTemplateServiceImpl extends CommonServiceImpl<LabelingTemplateMapper, LabelingTemplate> implements LabelingTemplateService {

View File

@@ -1,11 +1,6 @@
package org.nl.common.domain.query; package org.nl.common.domain.query;
import java.util.Objects;
/*
* @author ZZQ
* @Date 2022/12/14 8:40 下午
*/
@FunctionalInterface @FunctionalInterface
public interface LConsumer<X,Y,Z> { public interface LConsumer<X,Y,Z> {

View File

@@ -7,10 +7,7 @@ import java.util.Collection;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
/*
* @author ZZQ
* @Date 2022/12/1 3:35 下午
*/
public class CopyUtil { public class CopyUtil {
public static <F, T> List<T> copyList(final Collection<F> sources, final Class<T> clazz) { public static <F, T> List<T> copyList(final Collection<F> sources, final Class<T> clazz) {
if (sources == null) { if (sources == null) {

View File

@@ -5,10 +5,7 @@ import org.nl.config.SpringContextHolder;
import org.springframework.context.MessageSource; import org.springframework.context.MessageSource;
import org.springframework.context.i18n.LocaleContextHolder; import org.springframework.context.i18n.LocaleContextHolder;
/*
* @author ZZQ
* @Date 2023/11/13 09:45
*/
public class LangProcess { public class LangProcess {
public static String msg(String code,String...args){ public static String msg(String code,String...args){

View File

@@ -6,10 +6,7 @@ import org.springframework.stereotype.Component;
import java.util.function.BiFunction; import java.util.function.BiFunction;
/*
* @author ZZQ
* @Date 2022/11/24 3:47 下午
*/
@Component @Component
public class LoginUserHandler implements BiFunction<String, String, Object> { public class LoginUserHandler implements BiFunction<String, String, Object> {
@Override @Override

View File

@@ -32,7 +32,9 @@ import java.io.IOException;
@Slf4j @Slf4j
public class LuceneExecuteLogServiceImpl implements LuceneExecuteLogService { public class LuceneExecuteLogServiceImpl implements LuceneExecuteLogService {
//日志目录 /**
* 日志目录
*/
@Value("${logging.file.path}") @Value("${logging.file.path}")
private String logPath; private String logPath;