Merge branch 'magang02' of /Users/gizmo/IntellijProjects/WAREWMS-MAGANG02 with conflicts.

warewms-ams/src/main/java/com/ruoyi/ams/agv/ndc/AciService.java

@@ -112,7 +112,7 @@ public class AciService {
                 taskBean.setAciAccept(0);
                 taskBean.setBusinessType(Constant.TASK_BUSINESS_TYPE.TASK_POWER.getValue());
                 taskBean = amsTaskService.selectAmsTaskByModel(taskBean);
-                s = "87CD000800080001007100046301%04X";
+                s = "87CD0008000C000100710008630100010001%04X";
                 if (taskBean != null) {
 
                     s = String.format(s, Integer.parseInt(taskBean.getDeviceName()));