单据审核问题

src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java

@@ -657,7 +657,6 @@ public class IoOrderReviewController extends BaseController {
 
     }
 
-
     /**
      * PDA获取需要复制单据
      */
@@ -676,7 +675,6 @@ public class IoOrderReviewController extends BaseController {
 
     }
 
-
     /**
      * PDA获取待核对单据-单据详情
      */
@@ -689,7 +687,6 @@ public class IoOrderReviewController extends BaseController {
         return ResultVOUtils.success(orderDetailResultResponses);
     }
 
-
     /**
      * PDA获取待核对单据-单据条码明细
      */

src/main/java/com/glxp/api/service/sync/HeartService.java

@@ -15,6 +15,7 @@ import com.glxp.api.res.inv.InnerOrderPrintResponse;
 import com.glxp.api.service.collect.RelCodeBatchService;
 import com.glxp.api.service.collect.RelCodeDetailService;
 import com.glxp.api.service.dev.*;
+import com.glxp.api.service.inout.impl.IoCodeService;
 import org.junit.Test;
 import org.springframework.beans.BeanUtils;
 import cn.hutool.core.collection.CollUtil;
@@ -1120,7 +1121,6 @@ public class HeartService {
     }
 
 
-
     @Resource
     DeviceInspectTaskService deviceInspectTaskService;
     @Resource
@@ -1184,6 +1184,7 @@ public class HeartService {
         }
         return dataResponse;
     }
+
     /**
      * @param info
      * @param taskId
@@ -1766,7 +1767,8 @@ public class HeartService {
         }
         Date startTime = new Date();
 
-        String data = spGetHttp.pullData(exportType);;
+        String data = spGetHttp.pullData(exportType);
+        ;
         cn.hutool.json.JSONObject obj = JSONUtil.parseObj(data);
         Integer code = obj.getInt("code");
         if (!code.equals(20000)) {
@@ -2002,6 +2004,7 @@ public class HeartService {
 
     @Resource
     DeviceInfoMapper deviceInfoMapper;
+
     /**
      * 批量插入设备基础数据
      * insertDeviceInfoData
@@ -2090,6 +2093,7 @@ public class HeartService {
 
     /**
      * 批量 插入 || 更新 报修管理
+     *
      * @param content
      */
     @Transactional(propagation = Propagation.NESTED)
@@ -2140,6 +2144,7 @@ public class HeartService {
 
     /**
      * 批量 插入 || 更新 报修管理
+     *
      * @param content
      */
     @Transactional(propagation = Propagation.NESTED)
@@ -2180,6 +2185,7 @@ public class HeartService {
      */
     @Resource
     ThrManufacturerMapper thrManufacturerMapper;
+
     @Transactional(propagation = Propagation.NESTED)
     public void insertProBusinessData(String content) {
         cn.hutool.json.JSONObject jsonObject = JSONUtil.parseObj(content);
@@ -2346,20 +2352,36 @@ public class HeartService {
 //        }
     }
 
+    @Resource
+    IoCodeService codeService;
+
     public void insetOrderDb(SpsSyncOrderResponse syncDataResponse, IoOrderEntity orderEntity) {
         //更新码详情
+//        if (CollUtil.isNotEmpty(syncDataResponse.getOrderDetailCodeEntities())) {
+//            List<IoCodeEntity> warehouseEntityList = syncDataResponse.getCodeEntities();
+//            for (IoCodeEntity warehouseEntity : warehouseEntityList) {
+//                if (warehouseEntity.getOrderId().equals(orderEntity.getBillNo())) {
+//                    IoCodeTempEntity codeTempEntity = new IoCodeTempEntity();
+//                    BeanUtils.copyProperties(warehouseEntity, codeTempEntity);
+//                    codeTempEntity.setId(null);
+//                    codeTempService.insert(codeTempEntity);
+//                }
+//            }
+//        }
+
         if (CollUtil.isNotEmpty(syncDataResponse.getOrderDetailCodeEntities())) {
             List<IoCodeEntity> warehouseEntityList = syncDataResponse.getCodeEntities();
             for (IoCodeEntity warehouseEntity : warehouseEntityList) {
                 if (warehouseEntity.getOrderId().equals(orderEntity.getBillNo())) {
-                    IoCodeTempEntity codeTempEntity = new IoCodeTempEntity();
+                    IoCodeEntity codeTempEntity = new IoCodeEntity();
                     BeanUtils.copyProperties(warehouseEntity, codeTempEntity);
                     codeTempEntity.setId(null);
-                    codeTempService.insert(codeTempEntity);
+                    codeService.insert(codeTempEntity);
                 }
             }
         }
 
+
         //更新业务详情
         if (CollUtil.isNotEmpty(syncDataResponse.getOrderDetailBizEntities())) {
             List<IoOrderDetailBizEntity> orderDetailBizEntities = syncDataResponse.getOrderDetailBizEntities();
@@ -2942,8 +2964,6 @@ public class HeartService {
     }
 
 
-
-
 //    public SpsSyncDeviceDataResponse getDeviceCheckData(SyncDataSetEntity info, String taskId, Date now, Date syncTime){
 //        SpsSyncDeviceDataResponse dataResponse = null;
 //        Map<String, Object> syncTimeMap = new WeakHashMap<>(3);
@@ -3109,6 +3129,7 @@ public class HeartService {
 
     @Resource
     ThrManufacturerService thrManufacturerService;
+
     //生产企业
     public SpsSyncProBusinessDataResponse getProBusinessData(SyncDataSetEntity info, String taskId, Date now, Date syncTime) {
         SpsSyncProBusinessDataResponse dataResponse = null;