同步功能修改

api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java

@@ -445,10 +445,8 @@ public class DlBasicService {
                                     orderEntity.setFromType(ConstantStatus.FROM_UDISP);
                                     orderEntity.setReceiveStatus(0);
                                     orderEntity.setErpFk(null);
-                                    String value = systemParamConfigService.selectValueByParamKey("syns_out_change");
-                                    if (value.equals("1")) {
-                                        orderEntity.setOutChangeEnable(true);
-                                    } else
+//                                    String value = systemParamConfigService.selectValueByParamKey("syns_out_change");
+                                    if (!orderEntity.isSyncOutChange())
                                         orderEntity.setOutChangeEnable(false);
                                     orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESS);
                                     OrderEntity temp = orderService.findById(orderEntity.getId());
@@ -471,7 +469,15 @@ public class DlBasicService {
 
                                 }
                                 batchSession.commit();
-                                remark.append("单据：").append(syncDataResponse.getOrderEntities().size()).append("条\n");
+
+                                String logs = "";
+                                if (CollUtil.isNotEmpty(syncDataResponse.getOrderEntities()))
+                                    logs = logs + "单据：" + syncDataResponse.getOrderEntities().size() + "条\n";
+                                if (CollUtil.isNotEmpty(syncDataResponse.getOrderDetailEntityList()))
+                                    logs = logs + "单据详情：" + syncDataResponse.getOrderDetailEntityList().size() + "条\n";
+                                if (CollUtil.isNotEmpty(syncDataResponse.getWarehouseEntityList()))
+                                    logs = logs + "UDI码信息：" + syncDataResponse.getWarehouseEntityList().size() + "条\n";
+                                remark.append(logs);
                             } catch (Exception e) {
                             }
                         }

api-admin/src/main/java/com/glxp/api/admin/thread/HeartService.java

@@ -85,7 +85,7 @@ public class HeartService {
         if (CollUtil.isNotEmpty(spsSyncOrderResponse.getOrderDetailEntityList()))
             logs = logs + "单据详情：" + spsSyncOrderResponse.getOrderDetailEntityList().size() + "条\n";
         if (CollUtil.isNotEmpty(spsSyncOrderResponse.getWarehouseEntityList()))
-            logs = logs + "条码信息：" + spsSyncOrderResponse.getWarehouseEntityList().size() + "条\n";
+            logs = logs + "UDI码信息：" + spsSyncOrderResponse.getWarehouseEntityList().size() + "条\n";
         basicExportStatusEntity1.setRemark(logs);
         basicExportStatusEntity1.setUpdateTime(new Date());
         basicExportService.updateExportStatus(basicExportStatusEntity1);