diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/utils/InterationUtil.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/utils/InterationUtil.java
index d3b07a6f..f016c68c 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/utils/InterationUtil.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/utils/InterationUtil.java
@@ -45,7 +45,7 @@ public class InterationUtil {
             if (execute.getStatus() != 200){
                 throw new BadRequestException("acs申请失败："+response.getString("message"));
             }
-            if (!response.getString("code").equals("200")){
+            if (!"200".equals(response.getString("code"))){
                 String error = "";
                 if (response.get("data")!=null){
                     JSONArray data = response.getJSONArray("data");
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/PalletInStorageTask.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/PalletInStorageTask.java
index 058c0dae..c865e1a9 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/PalletInStorageTask.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/PalletInStorageTask.java
@@ -17,8 +17,6 @@ import org.nl.wms.dispatch_manage.task.handler.AbstractTask;
 import org.nl.wms.dispatch_manage.task.service.ISchBaseTaskService;
 import org.nl.wms.dispatch_manage.task.service.dao.SchBaseTask;
 import org.nl.wms.flow_manage.flow.service.execution.IActRuExecutionService;
-import org.nl.wms.flow_manage.flow.service.execution.dao.ActRuExecution;
-import org.nl.wms.flow_manage.monitor.event.FlowContinueEvent;
 import org.nl.wms.flow_manage.monitor.event.FlowStartEvent;
 import org.nl.wms.md_manage.group_dick.service.IMdGruopDickService;
 import org.nl.wms.md_manage.group_dick.service.dao.MdGruopDick;
@@ -105,14 +103,17 @@ public  class PalletInStorageTask extends AbstractTask {
         }else {
             String groupId = vehicleMaterVo.getGroup_id();
             MdGruopDick mst = iMdGruopDickService.getById(groupId);
+            if (mst == null) {
+                throw new BadRequestException("申请任务失败，载具没有组盘信息！");
+            }
             SchBaseTask schBaseTask = iSchBaseTaskService.getOne(new QueryWrapper<SchBaseTask>()
                     .eq("vehicle_code", vehicle_code).select("task_code")
-                    .lt("status",StatusEnum.FORM_STATUS.code("完成")));
-            if (schBaseTask!=null){
-                throw new BadRequestException("申请任务失败:载具"+vehicle_code+"已经存任务"+schBaseTask.getTask_code());
+                    .lt("status", StatusEnum.FORM_STATUS.code("完成")));
+            if (schBaseTask != null) {
+                throw new BadRequestException("申请任务失败:载具" + vehicle_code + "已经存任务" + schBaseTask.getTask_code());
             }
             iBmVehicleInfoService.update(new UpdateWrapper<BmVehicleInfo>()
-                    .set("h",Integer.valueOf(h))
+                    .set("h", Integer.valueOf(h))
                     .set("update_time", DateUtil.now())
                     .set("update_name", "ACS托盘入库申请")
                     .eq("vehicle_code",vehicle_code));
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/cockpit/service/impl/CockpitServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/cockpit/service/impl/CockpitServiceImpl.java
index 279f19c8..26569fb0 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/cockpit/service/impl/CockpitServiceImpl.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/cockpit/service/impl/CockpitServiceImpl.java
@@ -316,28 +316,32 @@ public class CockpitServiceImpl implements CockpitService {
                     r.setProduct_area(pointInfo.getProduct_area());
                 }
             }
-            InteracteDto<Object> dto = InteracteDto.builder()
-                    .service("wmsToAcsService")
-                    .trace_id(MDC.get("trace_id"))
-                    .type("getWeight")
-                    .data(new JSONObject().fluentPut("device_code", code)) // 使用 fluentPut 提高代码简洁性
-                    .build();
-            //查询称重重量
-            TableDataInfo result = InterationUtil.notifyExt("/api/wmsToAcs/apply", (JSONObject) JSON.toJSON(dto));
             BigDecimal theoryQty = BigDecimal.ZERO;
             BigDecimal actual_weight = BigDecimal.ZERO;
-            if ("200".equals(result.getCode())) {
-                Object dataObj = result.getData();
-                if (dataObj != null) {
-                    JSONObject data = JSONObject.parseObject(dataObj.toString());
-                    if (data != null && data.containsKey("weight")) {
-                        String weightStr = data.getString("weight");
-                        if (ObjectUtil.isNotEmpty(weightStr)) {
-                            // 转换为 BigDecimal
-                            actual_weight = new BigDecimal(weightStr.trim());
+            try {
+                InteracteDto<Object> dto = InteracteDto.builder()
+                        .service("wmsToAcsService")
+                        .trace_id(MDC.get("trace_id"))
+                        .type("getWeight")
+                        .data(new JSONObject().fluentPut("device_code", code))
+                        .build();
+                //查询称重重量
+                TableDataInfo result = InterationUtil.notifyExt("/api/wmsToAcs/apply", (JSONObject) JSON.toJSON(dto));
+                if ("200".equals(result.getCode())) {
+                    Object dataObj = result.getData();
+                    if (dataObj != null) {
+                        JSONObject data = JSONObject.parseObject(dataObj.toString());
+                        if (data != null && data.containsKey("weight")) {
+                            String weightStr = data.getString("weight");
+                            if (ObjectUtil.isNotEmpty(weightStr)) {
+                                // 转换为 BigDecimal
+                                actual_weight = new BigDecimal(weightStr.trim());
+                            }
                         }
                     }
                 }
+            } catch (Exception ex) {
+                log.error(ex.getMessage());
             }
             r.setActual_weight(actual_weight);
             //根据称重信息计算理论数量
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/PdaOutController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/PdaOutController.java
index 6c66de9a..e6402d30 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/PdaOutController.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/PdaOutController.java
@@ -52,6 +52,7 @@ public class PdaOutController {
     @GetMapping("order")
     @Log("出库单据列表")
     @SaIgnore
+
     public ResponseEntity<List<Map>> orderType() {
         List<Map> result = new ArrayList<>();
         List<BmFormStruc> list = iBmFormStrucService.list(new QueryWrapper<BmFormStruc>()