diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTransportPackingServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTransportPackingServiceImpl.java
index f83e293..a1d382f 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTransportPackingServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTransportPackingServiceImpl.java
@@ -20,12 +20,13 @@
 import com.casic.missiles.enums.PrintFileModuleNameEnum;
 import com.casic.missiles.enums.equipment.EquipmentTracePlanStatusEnum;
 import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.equipment.BizEquipmentInfoMapper;
 import com.casic.missiles.mapper.equipment.BizEquipmentTransportPackingMapper;
 import com.casic.missiles.mapper.resource.BizResourceStaffInfoMapper;
+import com.casic.missiles.model.equipment.BizEquipmentInfo;
 import com.casic.missiles.model.equipment.BizEquipmentTracePlanEquipment;
 import com.casic.missiles.model.equipment.BizEquipmentTransportPacking;
 import com.casic.missiles.model.equipment.BizEquipmentTransportPackingThing;
-import com.casic.missiles.model.equipment.BizEquipmentTransportProcessCheck;
 import com.casic.missiles.model.resource.BizResourceStaffInfo;
 import com.casic.missiles.service.equipment.IBizEquipmentTracePlanEquipmentService;
 import com.casic.missiles.service.equipment.IBizEquipmentTransportPackingService;
@@ -42,7 +43,6 @@
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -64,8 +64,10 @@
     private IBizEquipmentTracePlanEquipmentService tracePlanEquipmentService;
     @Autowired
     private PrintFileRegister printFileRegister;
+
     @Resource
-    private BizResourceStaffInfoMapper bizResourceStaffInfoMapper;
+    private BizEquipmentInfoMapper bizEquipmentInfoMapper;
+
 
     @Override
     public Page<BizEquipmentTransportPacking> listPage(Page<BizEquipmentTransportPacking> page, TransportPackingListRequest request) throws Exception {
@@ -196,13 +198,17 @@
             detailDTO.setEquipmentList(pThingList);
             packingThingList.add(detailDTO);
         });
+
         DictCodeUtils.convertDictCodeToName(transportPacking);
         List<TransportPackingThingDetailDoc> detailThingList = new ArrayList<>();
-        List<BizResourceStaffInfo> bizResourceStaffInfoList = bizResourceStaffInfoMapper.selectList(null);
-        Map<String, String> bizResourceStaffMap = bizResourceStaffInfoList
+        List<BizEquipmentInfo> bizEquipmentInfos = bizEquipmentInfoMapper.selectList(null);
+        for (BizEquipmentInfo bizEquipmentInfo : bizEquipmentInfos) {
+            DictCodeUtils.convertDictCodeToName(bizEquipmentInfo);
+        }
+        Map<String, String> bizResourceStaffMap = bizEquipmentInfos
                 .stream()
-                .filter(e->StringUtils.isNotEmpty(e.getMajor())&&StringUtils.isNotEmpty(e.getStaffName()))
-                .collect(Collectors.toMap(BizResourceStaffInfo::getStaffName, BizResourceStaffInfo::getMajor,(e1,e2)->e1));
+                .filter(e -> StringUtils.isNotEmpty(e.getCategoryName()) && StringUtils.isNotEmpty(e.getEquipmentNo()))
+                .collect(Collectors.toMap(BizEquipmentInfo::getEquipmentNo, BizEquipmentInfo::getCategoryName, (e1, e2) -> e1));
         //处理文档对应的包装箱编号
         for (TransportPackingThingDetailDTO packingThingDetailDTO : packingThingList) {
             for (BizEquipmentTransportPackingThing bizEquipmentTransport : packingThingDetailDTO.getEquipmentList()) {
@@ -211,12 +217,12 @@
                         .equipmentNameModel(bizEquipmentTransport.getEquipmentName())
                         .equipmentNo(bizEquipmentTransport.getEquipmentNo())
                         .quantity(bizEquipmentTransport.getQuantity())
-                        .major(StringUtils.isNotEmpty(bizEquipmentTransport.getPackageUser()) ? bizResourceStaffMap.get(bizEquipmentTransport.getPackageUser()) : "")
+                        .major(StringUtils.isNotEmpty(bizEquipmentTransport.getEquipmentNo()) ? bizResourceStaffMap.get(bizEquipmentTransport.getEquipmentNo()) : "")
                         .packageUser(bizEquipmentTransport.getPackageUser())
                         .build());
             }
         }
-        transportPacking.setPackingTime(transportPacking.getPackingTime().substring(0,10));
+        transportPacking.setPackingTime(transportPacking.getPackingTime().substring(0, 10));
         Map<String, Object> map = BeanUtil.beanToMap(transportPacking);
         map.put("detailThingList", detailThingList);
         printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_PACKING, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response);

diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTransportPackingServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTransportPackingServiceImpl.java
index f83e293..a1d382f 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTransportPackingServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTransportPackingServiceImpl.java
@@ -20,12 +20,13 @@
 import com.casic.missiles.enums.PrintFileModuleNameEnum;
 import com.casic.missiles.enums.equipment.EquipmentTracePlanStatusEnum;
 import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.equipment.BizEquipmentInfoMapper;
 import com.casic.missiles.mapper.equipment.BizEquipmentTransportPackingMapper;
 import com.casic.missiles.mapper.resource.BizResourceStaffInfoMapper;
+import com.casic.missiles.model.equipment.BizEquipmentInfo;
 import com.casic.missiles.model.equipment.BizEquipmentTracePlanEquipment;
 import com.casic.missiles.model.equipment.BizEquipmentTransportPacking;
 import com.casic.missiles.model.equipment.BizEquipmentTransportPackingThing;
-import com.casic.missiles.model.equipment.BizEquipmentTransportProcessCheck;
 import com.casic.missiles.model.resource.BizResourceStaffInfo;
 import com.casic.missiles.service.equipment.IBizEquipmentTracePlanEquipmentService;
 import com.casic.missiles.service.equipment.IBizEquipmentTransportPackingService;
@@ -42,7 +43,6 @@
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -64,8 +64,10 @@
     private IBizEquipmentTracePlanEquipmentService tracePlanEquipmentService;
     @Autowired
     private PrintFileRegister printFileRegister;
+
     @Resource
-    private BizResourceStaffInfoMapper bizResourceStaffInfoMapper;
+    private BizEquipmentInfoMapper bizEquipmentInfoMapper;
+
 
     @Override
     public Page<BizEquipmentTransportPacking> listPage(Page<BizEquipmentTransportPacking> page, TransportPackingListRequest request) throws Exception {
@@ -196,13 +198,17 @@
             detailDTO.setEquipmentList(pThingList);
             packingThingList.add(detailDTO);
         });
+
         DictCodeUtils.convertDictCodeToName(transportPacking);
         List<TransportPackingThingDetailDoc> detailThingList = new ArrayList<>();
-        List<BizResourceStaffInfo> bizResourceStaffInfoList = bizResourceStaffInfoMapper.selectList(null);
-        Map<String, String> bizResourceStaffMap = bizResourceStaffInfoList
+        List<BizEquipmentInfo> bizEquipmentInfos = bizEquipmentInfoMapper.selectList(null);
+        for (BizEquipmentInfo bizEquipmentInfo : bizEquipmentInfos) {
+            DictCodeUtils.convertDictCodeToName(bizEquipmentInfo);
+        }
+        Map<String, String> bizResourceStaffMap = bizEquipmentInfos
                 .stream()
-                .filter(e->StringUtils.isNotEmpty(e.getMajor())&&StringUtils.isNotEmpty(e.getStaffName()))
-                .collect(Collectors.toMap(BizResourceStaffInfo::getStaffName, BizResourceStaffInfo::getMajor,(e1,e2)->e1));
+                .filter(e -> StringUtils.isNotEmpty(e.getCategoryName()) && StringUtils.isNotEmpty(e.getEquipmentNo()))
+                .collect(Collectors.toMap(BizEquipmentInfo::getEquipmentNo, BizEquipmentInfo::getCategoryName, (e1, e2) -> e1));
         //处理文档对应的包装箱编号
         for (TransportPackingThingDetailDTO packingThingDetailDTO : packingThingList) {
             for (BizEquipmentTransportPackingThing bizEquipmentTransport : packingThingDetailDTO.getEquipmentList()) {
@@ -211,12 +217,12 @@
                         .equipmentNameModel(bizEquipmentTransport.getEquipmentName())
                         .equipmentNo(bizEquipmentTransport.getEquipmentNo())
                         .quantity(bizEquipmentTransport.getQuantity())
-                        .major(StringUtils.isNotEmpty(bizEquipmentTransport.getPackageUser()) ? bizResourceStaffMap.get(bizEquipmentTransport.getPackageUser()) : "")
+                        .major(StringUtils.isNotEmpty(bizEquipmentTransport.getEquipmentNo()) ? bizResourceStaffMap.get(bizEquipmentTransport.getEquipmentNo()) : "")
                         .packageUser(bizEquipmentTransport.getPackageUser())
                         .build());
             }
         }
-        transportPacking.setPackingTime(transportPacking.getPackingTime().substring(0,10));
+        transportPacking.setPackingTime(transportPacking.getPackingTime().substring(0, 10));
         Map<String, Object> map = BeanUtil.beanToMap(transportPacking);
         map.put("detailThingList", detailThingList);
         printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_PACKING, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java
index 03cbd72..b7624ad 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java
@@ -109,7 +109,7 @@
             //删除无效的文件
             File invalidFile = new File(tempLocalFileDir);
             //删除运行空间下的文件
-//            deleteFile(invalidFile);
+            deleteFile(invalidFile);
         }
         return miniName;
     }